diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-28 20:52:49 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-28 20:52:49 +0200 |
commit | 34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852 (patch) | |
tree | d3e3546a41a812d151d1980cb8ee6808a8b8c7c6 /pkgs/development/libraries/zimg/default.nix | |
parent | ad17db3562766979371f0ae9cc0d2428f44a9d58 (diff) | |
parent | f1dd205c4e5ac28931ae8cdcde9d3c9a8ed2a0f5 (diff) | |
download | nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.gz nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.bz2 nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.lz nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.xz nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.zst nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.zip |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix
Diffstat (limited to 'pkgs/development/libraries/zimg/default.nix')
-rw-r--r-- | pkgs/development/libraries/zimg/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 00973350e185..f67964748dca 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec{ name = "zimg-${version}"; - version = "2.7"; + version = "2.7.4"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "1jvx3a523mzkc54rrjab9kz66kc6q1snry9ymwmsx7rrd3kv3j6m"; + sha256 = "1gpmf6algpl1g1z891jfnsici84scg2cq1kj4v90glgik9z99mci"; }; nativeBuildInputs = [ autoreconfHook ]; |