diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:00:58 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:22:20 +0200 |
commit | bf414c9d4f892fd4e392a5f42016b57e84402a8b (patch) | |
tree | 08c000d609ed8e608ca542fa78360e4217f3fc36 /pkgs/development/libraries/libpng | |
parent | 29901451700a7382f3f9d5a0a23cd55b187e5585 (diff) | |
parent | 9de9669496a05f64ea436c01f9b66c057cd74f90 (diff) | |
download | nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.gz nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.bz2 nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.lz nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.xz nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.zst nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.zip |
Merge 'staging' into closure-size
- there were many easy merge conflicts - cc-wrapper needed nontrivial changes Many other problems might've been created by interaction of the branches, but stdenv and a few other packages build fine now.
Diffstat (limited to 'pkgs/development/libraries/libpng')
-rw-r--r-- | pkgs/development/libraries/libpng/12.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libpng/15.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/libpng/default.nix | 10 |
3 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index ff04c7181df5..fae6f9ba5564 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "The official reference implementation for the PNG file format"; homepage = http://www.libpng.org/pub/png/libpng.html; - license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt + license = stdenv.lib.licenses.libpng; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + branch = "1.2"; }; } diff --git a/pkgs/development/libraries/libpng/15.nix b/pkgs/development/libraries/libpng/15.nix index 153517986334..177c534ffafb 100644 --- a/pkgs/development/libraries/libpng/15.nix +++ b/pkgs/development/libraries/libpng/15.nix @@ -3,11 +3,11 @@ assert zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.5.18"; + name = "libpng-1.5.19"; src = fetchurl { url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "119m71p60iq3yn2n8ckl4j4cxvbpddj6sgdpa6g05jzyg7vw54y0"; + sha256 = "1s990cdsdlbb78aq4sj2vq2849p2nbbbnbk5p8f9w45rn0v5q98y"; }; propagatedBuildInputs = [ zlib ]; @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "The official reference implementation for the PNG file format"; homepage = http://www.libpng.org/pub/png/libpng.html; - license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt + license = stdenv.lib.licenses.libpng; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + branch = "1.5"; }; } diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index fa5c64eb9119..7a233b6715c3 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,11 +3,11 @@ assert zlib != null; let - version = "1.6.13"; - sha256 = "09g631h1f1xvrdiy36mh1034r9w46damp9jcg7nm507wlmacxj6r"; + version = "1.6.16"; + sha256 = "0q5ygy15jkpqbj5701ywrjzqp4nl5yz3r4g58h2p0kiycggm9xs2"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; - sha256 = "017pnxp3zhhlh6mg2yqn5xrb6dcxc5p3dp1kr46p8xx052i0hzqb"; + sha256 = "1sf27a5gvwvcm4wsf2pyq87d3g4l2fym8cirq9sli54bi753ikbh"; }; whenPatched = stdenv.lib.optionalString apngSupport; @@ -35,8 +35,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; homepage = http://www.libpng.org/pub/png/libpng.html; - license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt + license = licenses.libpng; platforms = platforms.all; - maintainers = [ maintainers.vcunat ]; + maintainers = [ maintainers.vcunat maintainers.fuuzetsu ]; }; } |