From 6f986c8bdc92fe84856dd9b28db698ca30929d1b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 3 Dec 2018 06:18:31 -0600 Subject: [PATCH 1/2] libpng: 1.6.35 -> 1.6.36, license v2 --- lib/licenses.nix | 5 +++++ pkgs/development/libraries/libpng/default.nix | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index fc9cb42621d..58c1b6ee611 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -451,6 +451,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "libpng License"; }; + libpng2 = { + fullName = "libpng License v2"; # 1.6.36+ + inherit (libpng) url; + }; + libtiff = spdx { spdxId = "libtiff"; fullName = "libtiff License"; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 9c1ed80e51e..9fc7d771202 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,20 +3,20 @@ assert zlib != null; let - patchVersion = "1.6.35"; + patchVersion = "1.6.36"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - sha256 = "011fq5wgyz07pfrqs9albixbiksx3agx5nkcf3535gbvhlwv5khq"; + sha256 = "03ywdwaq1k3pfslvbs2b33z3pdmazz6yp8g56mzafacvfgd367wc"; }; whenPatched = stdenv.lib.optionalString apngSupport; in stdenv.mkDerivation rec { name = "libpng" + whenPatched "-apng" + "-${version}"; - version = "1.6.35"; + version = "1.6.36"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; - sha256 = "1mxwjf5cdzk7g0y51gl9w3f0j5ypcls05i89kgnifjaqr742x493"; + sha256 = "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc"; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; @@ -25,14 +25,14 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = true; passthru = { inherit zlib; }; 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 = licenses.libpng; + license = licenses.libpng2; platforms = platforms.all; maintainers = [ maintainers.vcunat maintainers.fuuzetsu ]; }; From d37b48d1e4b77aafcfcaad1139690ea4a19944ab Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 29 Dec 2018 14:21:47 -0600 Subject: [PATCH 2/2] libpng2: link to license, SPDX seems geared to old version See https://github.com/NixOS/nixpkgs/pull/51447 for some discussion. --- lib/licenses.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 58c1b6ee611..b022d8bc11b 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -453,7 +453,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { libpng2 = { fullName = "libpng License v2"; # 1.6.36+ - inherit (libpng) url; + url = "http://www.libpng.org/pub/png/src/libpng-LICENSE.txt"; }; libtiff = spdx {