diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-26 18:02:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 18:02:28 +0000 |
| commit | a5e3dc56f349fe6119daaa9b423483a13720d050 (patch) | |
| tree | a1d43eed392238553aeaaf8ba556871c3638dbed | |
| parent | Merge pull request #131231 from NixOS/backport-130547-to-staging-21.05 (diff) | |
| parent | Merge pull request #131586 from svanderburg/backport-eduke32 (diff) | |
| download | nixpkgs-a5e3dc56f349fe6119daaa9b423483a13720d050.tar.gz | |
Merge release-21.05 into staging-next-21.05
| -rw-r--r-- | pkgs/applications/graphics/feh/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/eduke32/default.nix | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 139f29c31506..cd7b6e95d03d 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -7,11 +7,11 @@ with lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.7"; + version = "3.7.1"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "0hdvlrlpjxvmhnjvr32nxgpsw0366higg0gh9h37fxrvdh3v3k87"; + sha256 = "sha256-V6scph9XyWWVh4Bp9VDTb1GFMPiPoxt0zDnNc5+SWLY="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index a5796f697ef1..04a48a6dc951 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -3,10 +3,6 @@ , SDL2, SDL2_mixer }: let - version = "20200907"; - rev = "9257"; - revExtra = "93f62bbad"; - desktopItem = makeDesktopItem { name = "eduke32"; exec = "@out@/bin/${wrapper}"; @@ -18,13 +14,15 @@ let wrapper = "eduke32-wrapper"; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { pname = "eduke32"; - inherit version; + version = "20210722"; + rev = "9484"; + revExtra = "f3fea8c15"; src = fetchurl { - url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; - sha256 = "972630059be61ef9564a241b84ef2ee4f69fc85c19ee36ce46052ff2f1ce3bf9"; + url = "http://dukeworld.duke4.net/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; + sha256 = "0fdl2i465cl5x7129772ksx97lvim98m9009q5cfmf6scagj9pvz"; }; buildInputs = [ alsaLib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; |