From cc476f04b8e2f59f6beaeebd80942b587e83a5e5 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 20:47:54 +0100
Subject: [PATCH 01/13] imlib: add license + description

---
 pkgs/development/libraries/imlib/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix
index 2b95742c44c..eec68015c25 100644
--- a/pkgs/development/libraries/imlib/default.nix
+++ b/pkgs/development/libraries/imlib/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation {
 
   buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng];
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "An image loading and rendering library for X11";
+    platforms = platforms.unix;
+    license = with licenses; [ gpl2 lgpl2 ];
   };
 }

From ba9d6b673ab47913f592a60d20949e123830e991 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 20:52:49 +0100
Subject: [PATCH 02/13] incrtcl: add license

---
 pkgs/development/libraries/incrtcl/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix
index b9781ba9aa0..a4a009c6658 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "incrtcl-${version}";
   version = "4.0.4";
-  
+
   src = fetchurl {
     url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl4.0.4.tar.gz;
     sha256 = "1ppc9b13cvmc6rp77k7dl2zb26xk0z30vxygmr4h1xr2r8w091k3";
@@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
     libPrefix = "itcl3.4";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://incrtcl.sourceforge.net/;
     description = "Object Oriented Enhancements for Tcl/Tk";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.tcltk;
   };
 }

From 6afad9b00e83edf28313adda9fe17896e934a0ed Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 20:55:38 +0100
Subject: [PATCH 03/13] jama: add license

---
 pkgs/development/libraries/jama/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix
index 36eedadc4c2..29fabdbb3b6 100644
--- a/pkgs/development/libraries/jama/default.nix
+++ b/pkgs/development/libraries/jama/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "jama-${version}";
   version = "1.2.5";
-  
+
   src = fetchurl {
     url = https://math.nist.gov/tnt/jama125.zip;
     sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl";
@@ -21,9 +21,10 @@ stdenv.mkDerivation rec {
       cp *.h $out/include
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://math.nist.gov/tnt/;
     description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.publicDomain;
   };
 }

From b13ab27360d022262ac0e3d04f48d5b5e672a15b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 20:58:40 +0100
Subject: [PATCH 04/13] jasper: add license

---
 lib/licenses.nix                              | 4 ++++
 pkgs/development/libraries/jasper/default.nix | 1 +
 2 files changed, 5 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 940baf53b7c..092cbbbdb25 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -400,6 +400,10 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     free = false;
   };
 
+  jasper = spdx {
+    spdxId = "JasPer-2.0";
+    fullName = "JasPer License";
+  };
 
   lgpl2 = spdx {
     spdxId = "LGPL-2.0";
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index de4848c7dda..eb928227432 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
     homepage = https://www.ece.uvic.ca/~frodo/jasper/;
     description = "JPEG2000 Library";
     platforms = platforms.unix;
+    license = licenses.jasper;
     maintainers = with maintainers; [ pSub ];
   };
 }

From 08f4d756af15a815996d3bed96e32534bd9d5fca Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:01:54 +0100
Subject: [PATCH 05/13] dbus-java: add license

---
 pkgs/development/libraries/java/dbus-java/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix
index daee9adb1fd..5ec10cc7e0d 100644
--- a/pkgs/development/libraries/java/dbus-java/default.nix
+++ b/pkgs/development/libraries/java/dbus-java/default.nix
@@ -18,8 +18,9 @@ stdenv.mkDerivation {
            -e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile
   '';
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.sander ];
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.sander ];
+    license = licenses.afl21;
   };
 }

From eea19467087b9f33db2cca433e98a286e02353c7 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:04:02 +0100
Subject: [PATCH 06/13] gwt-dnd: add license

---
 pkgs/development/libraries/java/gwt-dragdrop/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/pkgs/development/libraries/java/gwt-dragdrop/default.nix
index b9d66fdc971..e34699d7740 100644
--- a/pkgs/development/libraries/java/gwt-dragdrop/default.nix
+++ b/pkgs/development/libraries/java/gwt-dragdrop/default.nix
@@ -3,13 +3,14 @@
 stdenv.mkDerivation {
   name = "gwt-dnd-2.6.5";
   builder = ./builder.sh;
-  
+
   src = fetchurl {
     url = http://gwt-dnd.googlecode.com/files/gwt-dnd-2.6.5.jar;
     sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw";
-  };  
+  };
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    platforms = platforms.unix;
+    license = licenses.asl20;
   };
 }

From a923a5aa2d3bd21bc0f644aae1683cb805dc8610 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:08:14 +0100
Subject: [PATCH 07/13] gwt-widgets: add licenses

---
 pkgs/development/libraries/java/gwt-widgets/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/java/gwt-widgets/default.nix b/pkgs/development/libraries/java/gwt-widgets/default.nix
index b182964f657..ec407076906 100644
--- a/pkgs/development/libraries/java/gwt-widgets/default.nix
+++ b/pkgs/development/libraries/java/gwt-widgets/default.nix
@@ -3,13 +3,14 @@
 stdenv.mkDerivation {
   name = "gwt-widgets-0.2.0";
   builder = ./builder.sh;
-  
+
   src = fetchurl {
     url = mirror://sourceforge/gwt-widget/gwt-widgets-0.2.0-bin.tar.gz;
     sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb";
-  };  
+  };
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    platforms = platforms.unix;
+    license = with licenses; [ afl21 lgpl2 ];
   };
 }

From fe326f87942b3e65172bc68b0f18fad343dbf815 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:12:48 +0100
Subject: [PATCH 08/13] hsqldb: add license

---
 pkgs/development/libraries/java/hsqldb/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix
index 97ffcb647d6..a478ab0fc50 100644
--- a/pkgs/development/libraries/java/hsqldb/default.nix
+++ b/pkgs/development/libraries/java/hsqldb/default.nix
@@ -12,8 +12,9 @@ stdenv.mkDerivation {
 
   buildInputs = [ unzip
   ];
-  
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+
+  meta = with stdenv.lib; {
+    platforms = platforms.unix;
+    license = licenses.bsd3;
   };
 }

From d356808b2f40f431007e00f7d4c8e35c27430774 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:20:31 +0100
Subject: [PATCH 09/13] httpunit: add license + homepage

---
 pkgs/development/libraries/java/httpunit/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix
index 221a2e93e4f..500c575f73a 100644
--- a/pkgs/development/libraries/java/httpunit/default.nix
+++ b/pkgs/development/libraries/java/httpunit/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation {
 
   inherit unzip;
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    homepage = http://httpunit.sourceforge.net;
+    platforms = platforms.unix;
+    license = licenses.mit;
   };
 }

From 0d140370cbb6ef92e6ba70ba0631e3bfd637a19d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:25:38 +0100
Subject: [PATCH 10/13] jdom: add meta data

---
 pkgs/development/libraries/java/jdom/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix
index 99d213a01da..16755471acd 100644
--- a/pkgs/development/libraries/java/jdom/default.nix
+++ b/pkgs/development/libraries/java/jdom/default.nix
@@ -9,7 +9,10 @@ stdenv.mkDerivation {
     sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf";
   };
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code";
+    homepage = http://www.jdom.org;
+    platforms = platforms.unix;
+    license = licenses.bsdOriginal;
   };
 }

From 4598cf4f3feb8b511975532479b816bb226ea35a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:27:44 +0100
Subject: [PATCH 11/13] libmatthew-java: add license

---
 .../development/libraries/java/libmatthew-java/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix
index ad5192f94ce..98291a7763c 100644
--- a/pkgs/development/libraries/java/libmatthew-java/default.nix
+++ b/pkgs/development/libraries/java/libmatthew-java/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation {
   PREFIX=''''${out}'';
   buildInputs = [ jdk ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.sander ];
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.sander ];
+    license = licenses.mit;
   };
 }

From 5fabd1b3c62e71523641af49c2fd1067647ea70b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:29:42 +0100
Subject: [PATCH 12/13] lucene: add license + description

---
 pkgs/development/libraries/java/lucene/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix
index 6f6534cee3e..691b9905b04 100644
--- a/pkgs/development/libraries/java/lucene/default.nix
+++ b/pkgs/development/libraries/java/lucene/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh";
   };
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Java full-text search engine";
+    platforms = platforms.unix;
+    license = licenses.asl20;
   };
 }

From 645b5a0e82434297d196f3ecf6f2c101faa576e2 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:34:18 +0100
Subject: [PATCH 13/13] mockobjects: add license + description

---
 pkgs/development/libraries/java/mockobjects/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix
index 551375d33bd..ae93765ff98 100644
--- a/pkgs/development/libraries/java/mockobjects/default.nix
+++ b/pkgs/development/libraries/java/mockobjects/default.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation {
     sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz";
   };
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Generic unit testing framework and methodology for testing any kind of code";
+    platforms = platforms.unix;
+    license = licenses.asl20;
   };
 }