diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:15:11 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:15:33 +0200 |
commit | 153a19df05133657dd3025812a544f8961c41b12 (patch) | |
tree | 9974b86334e11ffa884610dd0999a62b78e0ee96 /lib | |
parent | ae2cf7c00877a3dd778b3e3cabfec682503303d5 (diff) | |
parent | 6755ab8b3442d6149e4bae5e142d516a506f6e45 (diff) | |
download | nixpkgs-153a19df05133657dd3025812a544f8961c41b12.tar nixpkgs-153a19df05133657dd3025812a544f8961c41b12.tar.gz nixpkgs-153a19df05133657dd3025812a544f8961c41b12.tar.bz2 nixpkgs-153a19df05133657dd3025812a544f8961c41b12.tar.lz nixpkgs-153a19df05133657dd3025812a544f8961c41b12.tar.xz nixpkgs-153a19df05133657dd3025812a544f8961c41b12.tar.zst nixpkgs-153a19df05133657dd3025812a544f8961c41b12.zip |
Merge branch 'master' into staging-next
Hydra: ?compare=1474536
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 a5f1fc0f0f2..c442d74c857 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -654,6 +654,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "wxWindows Library Licence, Version 3.1"; }; + xfig = { + fullName = "xfig"; + url = "http://mcj.sourceforge.net/authors.html#xfig"; + }; + zlib = spdx { spdxId = "Zlib"; fullName = "zlib License"; |