diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:30:18 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:30:18 +0000 |
| commit | ef93931efff0323fd13c4270415b578c73b5ef35 (patch) | |
| tree | e5b089306c481ce3237027bfb46c940fed1e2114 /nixpkgs/lib/licenses.nix | |
| parent | c5571a126859eb658ffd7340cb580f7d91f12bb6 (diff) | |
| parent | a1dd419c1ffacea87eba066a2bb332e03cb68f66 (diff) | |
| download | nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.gz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.bz2 nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.lz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.xz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.zst nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.zip | |
Merge commit 'a1dd419c1ffacea87eba066a2bb332e03cb68f66'
Diffstat (limited to 'nixpkgs/lib/licenses.nix')
| -rw-r--r-- | nixpkgs/lib/licenses.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/lib/licenses.nix b/nixpkgs/lib/licenses.nix index 3b9d7f1986fc..c964060d2a5c 100644 --- a/nixpkgs/lib/licenses.nix +++ b/nixpkgs/lib/licenses.nix @@ -457,9 +457,9 @@ 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"; + libpng2 = spdx { + spdxId = "libpng-2.0"; # Used since libpng 1.6.36. + fullName = "PNG Reference Library version 2"; }; libtiff = spdx { |