diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
| commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
| tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /nixpkgs/lib/licenses.nix | |
| parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
| parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
| download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip | |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/lib/licenses.nix')
| -rw-r--r-- | nixpkgs/lib/licenses.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/nixpkgs/lib/licenses.nix b/nixpkgs/lib/licenses.nix index b9310ef6c5b8..2928d11d8b22 100644 --- a/nixpkgs/lib/licenses.nix +++ b/nixpkgs/lib/licenses.nix @@ -389,6 +389,11 @@ in mkLicense lset) ({ free = false; }; + generaluser = { + fullName = "GeneralUser GS License v2.0"; + url = "http://www.schristiancollins.com/generaluser.php"; # license included in sources + }; + gpl1Only = { spdxId = "GPL-1.0-only"; fullName = "GNU General Public License v1.0 only"; @@ -607,6 +612,11 @@ in mkLicense lset) ({ fullName = "Enlightenment License (e16)"; }; + mit0 = { + spdxId = "MIT-0"; + fullName = "MIT No Attribution"; + }; + mpl10 = { spdxId = "MPL-1.0"; fullName = "Mozilla Public License 1.0"; |