public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-26 18:03:01 +00:00 committed by GitHub
commit 89c0dff795
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/feh/default.nix
View File

@ -7,11 +7,11 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "feh"; pname = "feh";
version = "3.7"; version = "3.7.1";
src = fetchurl { src = fetchurl {
url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
sha256 = "0hdvlrlpjxvmhnjvr32nxgpsw0366higg0gh9h37fxrvdh3v3k87"; sha256 = "sha256-V6scph9XyWWVh4Bp9VDTb1GFMPiPoxt0zDnNc5+SWLY=";
}; };
outputs = [ "out" "man" "doc" ]; outputs = [ "out" "man" "doc" ];

14
pkgs/games/eduke32/default.nix
View File

@ -3,10 +3,6 @@
, SDL2, SDL2_mixer }: , SDL2, SDL2_mixer }:
let let
version = "20200907";
rev = "9257";
revExtra = "93f62bbad";
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "eduke32"; name = "eduke32";
exec = "@out@/bin/${wrapper}"; exec = "@out@/bin/${wrapper}";
@ -18,13 +14,15 @@ let
wrapper = "eduke32-wrapper"; wrapper = "eduke32-wrapper";
in stdenv.mkDerivation { in stdenv.mkDerivation rec {
pname = "eduke32"; pname = "eduke32";
inherit version; version = "20210722";
rev = "9484";
revExtra = "f3fea8c15";
src = fetchurl { src = fetchurl {
url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; url = "http://dukeworld.duke4.net/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz";
sha256 = "972630059be61ef9564a241b84ef2ee4f69fc85c19ee36ce46052ff2f1ce3bf9"; sha256 = "0fdl2i465cl5x7129772ksx97lvim98m9009q5cfmf6scagj9pvz";
}; };
buildInputs = [ alsaLib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; buildInputs = [ alsaLib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ];