From 4e7a5aca2b7dcbc2e3fd1698568da1c4c911d298 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Nov 2014 15:33:11 +0100
Subject: [PATCH] Provide more SPDX IDs

---
 lib/licenses.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index eccdc69a43d2..46fa783b4bdd 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -209,9 +209,9 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "libpng License";
   };
 
-  libtiff = {
-    fullName = "libtiff license";
-    url = https://fedoraproject.org/wiki/Licensing/libtiff;
+  libtiff = spdx {
+    spdxId = "libtiff";
+    fullName = "libtiff License";
   };
 
   llgpl21 = {
@@ -278,12 +278,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
 
   sleepycat = spdx {
     spdxId = "Sleepycat";
-    fullName  = "Sleepycat License";
+    fullName = "Sleepycat License";
   };
 
-  tcltk = {
-    fullName = "Tcl/Tk license";
-    url = http://www.tcl.tk/software/tcltk/license.html;
+  tcltk = spdx {
+    spdxId = "TCL";
+    fullName = "TCL/TK License";
   };
 
   unfree = {
@@ -302,9 +302,9 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     # channel and NixOS images.
   };
 
-  unlicense = {
-    fullName = "Unlicense";
-    url = http://unlicense.org/;
+  unlicense = spdx {
+    spdxId = "Unlicense";
+    fullName = "The Unlicense";
   };
 
   wadalab = {