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

(into staging)
2019-01-05 22:20:20 +01:00
parent 138720f2f1 d37b48d1e4
commit 3456ad586b
2 changed files with 11 additions and 6 deletions
--- 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";