summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-04-27 07:01:38 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-04-27 07:01:38 +0200
commit883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c (patch)
tree1f6366122193b376ae045a520f4e05610ac0a7b1 /lib
parent1aff8dc4074013e0018bb749fd82b771c41ea839 (diff)
parent3f46165af3f74df4eed27418377733cf237a33a0 (diff)
downloadnixpkgs-883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c.tar
nixpkgs-883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c.tar.gz
nixpkgs-883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c.tar.bz2
nixpkgs-883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c.tar.lz
nixpkgs-883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c.tar.xz
nixpkgs-883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c.tar.zst
nixpkgs-883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c.zip
Merge master into staging-next
Diffstat (limited to 'lib')
-rw-r--r--lib/licenses.nix6
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";