public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #51447: libpng: 1.6.35 -> 1.6.36, license v2

Browse Source 
(into staging)
This commit is contained in:
Vladimír Čunát 2019-01-05 22:20:20 +01:00
commit 3456ad586b
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/licenses.nix
View File

@ -451,6 +451,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "libpng License"; fullName = "libpng License";
}; };
libpng2 = {
fullName = "libpng License v2"; # 1.6.36+
url = "http://www.libpng.org/pub/png/src/libpng-LICENSE.txt";
};
libtiff = spdx { libtiff = spdx {
spdxId = "libtiff"; spdxId = "libtiff";
fullName = "libtiff License"; fullName = "libtiff License";

12
pkgs/development/libraries/libpng/default.nix
View File

@ -3,20 +3,20 @@
assert zlib != null; assert zlib != null;
let let
patchVersion = "1.6.35"; patchVersion = "1.6.36";
patch_src = fetchurl { patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
sha256 = "011fq5wgyz07pfrqs9albixbiksx3agx5nkcf3535gbvhlwv5khq"; sha256 = "03ywdwaq1k3pfslvbs2b33z3pdmazz6yp8g56mzafacvfgd367wc";
}; };
whenPatched = stdenv.lib.optionalString apngSupport; whenPatched = stdenv.lib.optionalString apngSupport;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "libpng" + whenPatched "-apng" + "-${version}"; name = "libpng" + whenPatched "-apng" + "-${version}";
version = "1.6.35"; version = "1.6.36";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
sha256 = "1mxwjf5cdzk7g0y51gl9w3f0j5ypcls05i89kgnifjaqr742x493"; sha256 = "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc";
}; };
postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
@ -25,14 +25,14 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ zlib ]; propagatedBuildInputs = [ zlib ];
doCheck = stdenv.hostPlatform == stdenv.buildPlatform; doCheck = true;
passthru = { inherit zlib; }; passthru = { inherit zlib; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch";
homepage = http://www.libpng.org/pub/png/libpng.html; homepage = http://www.libpng.org/pub/png/libpng.html;
license = licenses.libpng; license = licenses.libpng2;
platforms = platforms.all; platforms = platforms.all;
maintainers = [ maintainers.vcunat maintainers.fuuzetsu ]; maintainers = [ maintainers.vcunat maintainers.fuuzetsu ];
}; };