diff options
| author | volth <volth@webmaster.ms> | 2018-12-18 17:13:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 17:13:27 +0000 |
| commit | fed7914539d6afaae6bb6f18197d060a74944173 (patch) | |
| tree | 7923f6246d22e9a93365debb4b9d3bea6b6349ec /pkgs/applications/graphics | |
| parent | bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d (diff) | |
| parent | 1148ce1b601fd0e64088458014cecd08bc2b8e1e (diff) | |
| download | nixlib-fed7914539d6afaae6bb6f18197d060a74944173.tar nixlib-fed7914539d6afaae6bb6f18197d060a74944173.tar.gz nixlib-fed7914539d6afaae6bb6f18197d060a74944173.tar.bz2 nixlib-fed7914539d6afaae6bb6f18197d060a74944173.tar.lz nixlib-fed7914539d6afaae6bb6f18197d060a74944173.tar.xz nixlib-fed7914539d6afaae6bb6f18197d060a74944173.tar.zst nixlib-fed7914539d6afaae6bb6f18197d060a74944173.zip | |
Merge branch 'staging' into make-perl-pathd
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/feh/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/graphics/renderdoc/default.nix | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 0c0b699f431e..a1ef5fcb4b6f 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "3.0"; + version = "3.1.1"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "00fwf8yz7k8vzd30ly5ndlj6ax9w85dkjzjnlk95vd0zdrf4wyxn"; + sha256 = "1sy8z6rv5sy1bhk3846hgfdy96wdi874yr2fnxfprks46qp29l31"; }; outputs = [ "out" "man" "doc" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { install -D -m 644 man/*.1 $out/share/man/man1 ''; - checkInputs = [ perlPackages.TestCommand perlPackages.TestHarness ]; + checkInputs = [ perlPackages.TestCommand ]; preCheck = '' export PERL5LIB="${perlPackages.TestCommand}/${perlPackages.perl.libPrefix}" ''; diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 99e250e9e4d7..3990d0989062 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -7,19 +7,19 @@ let custom_swig = fetchFromGitHub { owner = "baldurk"; repo = "swig"; - rev = "renderdoc-modified-5"; - sha256 = "0ihrxbx56p5wn589fbbsns93fp91sypqdzfxdy7l7v9sf69a41mw"; + rev = "renderdoc-modified-6"; + sha256 = "00ykqlzx1k9iwqjlc54kfch7cnzsj53hxn7ql70dj3rxqzrnadc0"; }; in stdenv.mkDerivation rec { - version = "1.1"; + version = "1.2"; name = "renderdoc-${version}"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "0kb9m1dm0mnglqyh1srvl0f1bgjghxzbqarn0xfqw49wphqwhmcd"; + sha256 = "0s1q5d58x18yz3nf94pv5i1qd2hc0a4gdj4qkpcn8s6ms2x05pz4"; }; buildInputs = [ |