diff options
author | William A. Kennington III <william@wkennington.com> | 2015-11-18 02:36:33 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-11-18 02:36:33 -0800 |
commit | baf30718ca5415dcd44767c3046a30d500a7ceb5 (patch) | |
tree | ac411f5ff6b161cb44d7c66c29ca88f908317639 /pkgs/development/libraries/libpng | |
parent | b52f2f64013dcc206cac1986f7bc9f9b1badc798 (diff) | |
parent | f9f3b47c726d8715a5440f113b4a8b5e9f978002 (diff) | |
download | nixlib-baf30718ca5415dcd44767c3046a30d500a7ceb5.tar nixlib-baf30718ca5415dcd44767c3046a30d500a7ceb5.tar.gz nixlib-baf30718ca5415dcd44767c3046a30d500a7ceb5.tar.bz2 nixlib-baf30718ca5415dcd44767c3046a30d500a7ceb5.tar.lz nixlib-baf30718ca5415dcd44767c3046a30d500a7ceb5.tar.xz nixlib-baf30718ca5415dcd44767c3046a30d500a7ceb5.tar.zst nixlib-baf30718ca5415dcd44767c3046a30d500a7ceb5.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/libraries/libpng')
-rw-r--r-- | pkgs/development/libraries/libpng/12.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index 3071aa3fdfca..d2fa6b184d64 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -3,11 +3,11 @@ assert !(stdenv ? cross) -> zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.2.53"; + name = "libpng-1.2.54"; src = fetchurl { url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "02jwfqk1ahqfvbs9gdyb5v0123by9ws6m7jnfvainig7i7v4jpml"; + sha256 = "0wnjy7gqn0f24qrlggs7kl0ij59by413j1xmqp12n3vqh9j531fg"; }; propagatedBuildInputs = [ zlib ]; @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { configureFlags = "--enable-static"; - meta = { + meta = with stdenv.lib; { 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 ]; + license = licenses.libpng; + maintainers = [ maintainers.fuuzetsu ]; branch = "1.2"; }; } |