diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 13:33:13 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 13:33:37 +0200 |
commit | 5227fb1dd53fcb5918b9342dff4868f4ad68427e (patch) | |
tree | d6cd521e3f67944031216a27f740f28f22b73b41 /pkgs/development/libraries/libpng | |
parent | d6dd3b8bd1eaeeb21dfdb5051cd4732c748ce5d7 (diff) | |
parent | 33373d939a19f465228ddede6d38ce9032b5916b (diff) |
Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
Diffstat (limited to 'pkgs/development/libraries/libpng')
-rw-r--r-- | pkgs/development/libraries/libpng/12.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/libpng/15.nix | 26 | ||||
-rw-r--r-- | pkgs/development/libraries/libpng/default.nix | 8 |
3 files changed, 7 insertions, 35 deletions
diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index fae6f9ba55648..3071aa3fdfca2 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchurl, zlib, xz }: +{ stdenv, fetchurl, zlib }: assert !(stdenv ? cross) -> zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.2.51"; + name = "libpng-1.2.53"; src = fetchurl { url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "0jkdlmnvn72jwm94dp98pznm9fy7alvcr2zpfh2dgbr2n09vimy7"; + sha256 = "02jwfqk1ahqfvbs9gdyb5v0123by9ws6m7jnfvainig7i7v4jpml"; }; propagatedBuildInputs = [ zlib ]; - nativeBuildInputs = [ xz ]; - passthru = { inherit zlib; }; crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") { diff --git a/pkgs/development/libraries/libpng/15.nix b/pkgs/development/libraries/libpng/15.nix deleted file mode 100644 index 177c534ffafb2..0000000000000 --- a/pkgs/development/libraries/libpng/15.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, zlib }: - -assert zlib != null; - -stdenv.mkDerivation rec { - name = "libpng-1.5.19"; - - src = fetchurl { - url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "1s990cdsdlbb78aq4sj2vq2849p2nbbbnbk5p8f9w45rn0v5q98y"; - }; - - propagatedBuildInputs = [ zlib ]; - - doCheck = true; - - passthru = { inherit zlib; }; - - meta = { - description = "The official reference implementation for the PNG file format"; - homepage = http://www.libpng.org/pub/png/libpng.html; - 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 7a233b6715c32..67be2ec8611c7 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, zlib, apngSupport ? false }: +{ stdenv, fetchurl, zlib, apngSupport ? true }: assert zlib != null; let - version = "1.6.16"; - sha256 = "0q5ygy15jkpqbj5701ywrjzqp4nl5yz3r4g58h2p0kiycggm9xs2"; + version = "1.6.18"; + sha256 = "0qq96rf31483kxz32h6l6921hy6p2v2pfqfvc74km229g4xw241f"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; - sha256 = "1sf27a5gvwvcm4wsf2pyq87d3g4l2fym8cirq9sli54bi753ikbh"; + sha256 = "0g2ljh2vhclas1hacys1c4gk6l6hyy6sngb2yvdsnjz50nyq16kv"; }; whenPatched = stdenv.lib.optionalString apngSupport; |