diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-05 22:20:20 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-19 10:56:57 +0100 |
| commit | 3456ad586bd9cb78073c858ea7c65310dfde928f (patch) | |
| tree | 30ffa0f2b2f5865f32ac3bb175c29f56996796e6 /lib | |
| parent | 138720f2f1169384f5958b27b7f0745bef15e7a1 (diff) | |
| parent | d37b48d1e4b77aafcfcaad1139690ea4a19944ab (diff) | |
| download | nixpkgs-3456ad586bd9cb78073c858ea7c65310dfde928f.tar nixpkgs-3456ad586bd9cb78073c858ea7c65310dfde928f.tar.gz nixpkgs-3456ad586bd9cb78073c858ea7c65310dfde928f.tar.bz2 nixpkgs-3456ad586bd9cb78073c858ea7c65310dfde928f.tar.lz nixpkgs-3456ad586bd9cb78073c858ea7c65310dfde928f.tar.xz nixpkgs-3456ad586bd9cb78073c858ea7c65310dfde928f.tar.zst nixpkgs-3456ad586bd9cb78073c858ea7c65310dfde928f.zip | |
Merge #51447: libpng: 1.6.35 -> 1.6.36, license v2
(into staging)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/licenses.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index fc9cb42621d..b022d8bc11b 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+ + url = "http://www.libpng.org/pub/png/src/libpng-LICENSE.txt"; + }; + libtiff = spdx { spdxId = "libtiff"; fullName = "libtiff License"; |