From 01e2ed000b5f17aa5cfc5e9b085cd28f71f2fc41 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Wed, 25 Jun 2014 22:28:34 +0200
Subject: [PATCH 1/4] numexpr: Define license

---
 pkgs/top-level/python-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d93e4f33c514..7038838eb754 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4732,6 +4732,7 @@ rec {
     meta = {
       description = "Fast numerical array expression evaluator for NumPy";
       homepage = "https://github.com/pydata/numexpr";
+      license = licenses.mit;
     };
   };
 

From ddfdd85171a2b35f2c80151839733ce123260980 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Wed, 25 Jun 2014 22:32:54 +0200
Subject: [PATCH 2/4] tables: Define license

---
 pkgs/development/python-modules/tables/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix
index d3edf54788ab..7c897e9531fb 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -52,5 +52,6 @@ buildPythonPackage rec {
   meta = {
     description = "Hierarchical datasets for Python";
     homepage = "http://www.pytables.org/";
+    license = stdenv.lib.licenses.bsd2;
   };
 }

From 0e1eac04bb4644b6287908ce70d53a138fafa797 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Sat, 5 Jul 2014 21:05:23 +0200
Subject: [PATCH 3/4] szip: Indentation

---
 pkgs/development/libraries/szip/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix
index 159b8e6e8386..6ac36054a10b 100644
--- a/pkgs/development/libraries/szip/default.nix
+++ b/pkgs/development/libraries/szip/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl }:
     
 stdenv.mkDerivation {
-    name = "szip-2.1";
-    src = fetchurl {
-        url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz;
-        sha256 = "1vym7r4by02m0yqj10023xyps5b21ryymnxb4nb2gs32arfxj5m8";
-    };
+  name = "szip-2.1";
+  src = fetchurl {
+    url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz;
+    sha256 = "1vym7r4by02m0yqj10023xyps5b21ryymnxb4nb2gs32arfxj5m8";
+  };
 }

From af8ec93e6a7f279c64569d3c04ca0ad03f41b365 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Sat, 5 Jul 2014 21:24:42 +0200
Subject: [PATCH 4/4] szip: Provide meta-data

The license is set to "unfree" as commercial use is not permitted by the
license [1].

[1]: http://www.hdfgroup.org/doc_resource/SZIP/Commercial_szip.html
---
 pkgs/development/libraries/szip/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix
index 6ac36054a10b..17f9c973fd0b 100644
--- a/pkgs/development/libraries/szip/default.nix
+++ b/pkgs/development/libraries/szip/default.nix
@@ -6,4 +6,12 @@ stdenv.mkDerivation {
     url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz;
     sha256 = "1vym7r4by02m0yqj10023xyps5b21ryymnxb4nb2gs32arfxj5m8";
   };
+
+  meta = {
+    description = "
+      Szip is a compression library that can be used with the hdf5 library.
+    ";
+    homepage = http://www.hdfgroup.org/doc_resource/SZIP/;
+    license = stdenv.lib.licenses.unfree;
+  };
 }