diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-04-26 16:35:54 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-04-26 16:35:54 +0200 |
commit | 89a150355b7e54979347d7c0094fda014d272032 (patch) | |
tree | 97c651a8e0bee838f366790fdf74ca1025265223 /lib | |
parent | c890a3dd0f80f6fa0b86a4d83b2b0e3d31fc9178 (diff) | |
parent | b63c99659e6b18771c734be0d320008d4b548929 (diff) | |
download | nixpkgs-89a150355b7e54979347d7c0094fda014d272032.tar nixpkgs-89a150355b7e54979347d7c0094fda014d272032.tar.gz nixpkgs-89a150355b7e54979347d7c0094fda014d272032.tar.bz2 nixpkgs-89a150355b7e54979347d7c0094fda014d272032.tar.lz nixpkgs-89a150355b7e54979347d7c0094fda014d272032.tar.xz nixpkgs-89a150355b7e54979347d7c0094fda014d272032.tar.zst nixpkgs-89a150355b7e54979347d7c0094fda014d272032.zip |
Merge branch 'master' into staging
Diffstat (limited to 'lib')
-rw-r--r-- | lib/licenses.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index d285ba2ea0a..53a84999bc8 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -145,6 +145,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { free = false; }; + cc-by-nc-30 = spdx { + spdxId = "CC-BY-NC-3.0"; + fullName = "Creative Commons Attribution Non Commercial 3.0 Unported"; + free = false; + }; + cc-by-nc-40 = spdx { spdxId = "CC-BY-NC-4.0"; fullName = "Creative Commons Attribution Non Commercial 4.0 International"; |