alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Revert "lib/licenses.nix: allow choosing license by its shortName"

Browse source 
There's no consensus to adopt that (yet).
This reverts commit 229e5c41df.
This commit is contained in:
Vladimír Čunát 2014-08-12 19:05:54 +02:00
parent 5cc2a142b0
commit 905b163b49
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/licenses.nix
View file

@ -4,7 +4,7 @@ let
}; };
in in
let licenses = rec { rec {
/* License identifiers from spdx.org where possible. /* License identifiers from spdx.org where possible.
* If you cannot find your license here, then look for a similar license or * If you cannot find your license here, then look for a similar license or
* add it to this list. The URL mentioned above is a good source for inspiration. * add it to this list. The URL mentioned above is a good source for inspiration.
@ -87,7 +87,7 @@ let licenses = rec {
fullName = "Eclipse Public License 1.0"; fullName = "Eclipse Public License 1.0";
}; };
free.shortName = "free"; free = "free";
gpl2 = spdx { gpl2 = spdx {
shortName = "GPL-2.0"; shortName = "GPL-2.0";
@ -237,11 +237,11 @@ let licenses = rec {
url = http://www.tcl.tk/software/tcltk/license.html; url = http://www.tcl.tk/software/tcltk/license.html;
}; };
unfree.shortName = "unfree"; unfree = "unfree";
unfreeRedistributable.shortName = "unfree-redistributable"; unfreeRedistributable = "unfree-redistributable";
unfreeRedistributableFirmware.shortName = "unfree-redistributable-firmware"; unfreeRedistributableFirmware = "unfree-redistributable-firmware";
wadalab = { wadalab = {
shortName = "wadalab"; shortName = "wadalab";
@ -264,8 +264,5 @@ let licenses = rec {
fullName = "Zope Public License 2.1"; fullName = "Zope Public License 2.1";
}; };
}; in }
# add the same attrmaps, but named by their shortNames (creating e.g. licenses."GPL-2.0+")
with { inherit (import ./attrsets.nix) mapAttrs' nameValuePair; };
licenses // (mapAttrs' (_: value: nameValuePair value.shortName value) licenses)