Fixed some licenses

8 files changed, 28 insertions, 28 deletions

diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix
index c1114232ea8f..17a50506fa92 100644
--- a/pkgs/servers/felix/default.nix
+++ b/pkgs/servers/felix/default.nix
@@ -13,10 +13,10 @@ stdenv.mkDerivation {
     mkdir -p $out
     cp -av * $out
   '';
-  meta = {
+  meta = with stdenv.lib; {
     description = "An OSGi gateway";
     homepage = http://felix.apache.org;
-    license = "ASF";
-    maintainers = [ stdenv.lib.maintainers.sander ];
+    license = licenses.asl20;
+    maintainers = [ maintainers.sander ];
   };
 }
diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix
index 86d371898872..d0d336ad08e6 100644
--- a/pkgs/servers/http/jboss/default.nix
+++ b/pkgs/servers/http/jboss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, jdk, lib }:
+{ stdenv, fetchurl, unzip, jdk }:
 
 stdenv.mkDerivation {
   name = "jboss-as-7.1.1.Final";
@@ -16,10 +16,10 @@ stdenv.mkDerivation {
     find $out/bin -name \*.sh -print0 | xargs -0 sed -i -e '/#!\/bin\/sh/aJAVA_HOME=${jdk}'
   '';
   
-  meta = {
-    homepage = "http://www.jboss.org/";
+  meta = with stdenv.lib; {
+    homepage = http://www.jboss.org/;
     description = "Open Source J2EE application server";
-    license = "GPL/LGPL";
-    maintainers = [ lib.maintainers.sander ];
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.sander ];
   };
 }
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index 74033be8cf86..294cb003ab43 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [cyrus_sasl libevent];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A distributed memory object caching system";
     repositories.git = https://github.com/memcached/memcached.git;
     homepage = http://memcached.org/;
-    license = "bsd";
-    maintainers = [ stdenv.lib.maintainers.coconnor ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.coconnor ];
+    platforms = platforms.linux;
   };
 }
 
diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix
index 9ce027409fdf..0aa32a66f0a5 100644
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@@ -78,13 +78,13 @@ in
 
     configureFlags = "--enable-agent";
 
-    meta = {
+    meta = with stdenv.lib; {
       inherit branch;
       description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
       homepage = http://www.zabbix.com/;
-      license = "GPL";
-      maintainers = [ stdenv.lib.maintainers.eelco ];
-      platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+      license = licenses.gpl2;
+      maintainers = [ maintainers.eelco ];
+      platforms = platforms.linux ++ platforms.darwin;
     };
   };
 
diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix
index 1e8d03ec2b66..139786ba59d0 100644
--- a/pkgs/servers/monitoring/zabbix/2.2.nix
+++ b/pkgs/servers/monitoring/zabbix/2.2.nix
@@ -90,13 +90,13 @@ in
 
     configureFlags = "--enable-agent";
 
-    meta = {
+    meta = with stdenv.lib; {
       inherit branch;
       description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
       homepage = http://www.zabbix.com/;
-      license = "GPL";
-      maintainers = [ stdenv.lib.maintainers.eelco ];
-      platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+      license = licenses.gpl2;
+      maintainers = [ maintainers.eelco ];
+      platforms = platforms.linux ++ platforms.darwin;
     };
   };
 
diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix
index 5d8541ab870e..0aa74599c3a4 100644
--- a/pkgs/servers/monitoring/zabbix/default.nix
+++ b/pkgs/servers/monitoring/zabbix/default.nix
@@ -57,12 +57,12 @@ in
 
     configureFlags = "--enable-agent";
 
-    meta = {
+    meta = with stdenv.lib; {
       description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
       homepage = http://www.zabbix.com/;
-      license = "GPL";
-      maintainers = [ stdenv.lib.maintainers.eelco ];
-      platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+      license = licenses.gpl2;
+      maintainers = [ maintainers.eelco ];
+      platforms = platforms.linux ++ platforms.darwin;
     };
   };
 
diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix
index 61b12164f245..ba5a9ead698f 100644
--- a/pkgs/servers/sql/postgresql/jdbc/default.nix
+++ b/pkgs/servers/sql/postgresql/jdbc/default.nix
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
       cp jars/*.jar $out/share/java
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://jdbc.postgresql.org/;
     description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database";
-    license = "bsd";
+    license = licenses.bsd3;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/servers/sql/postgresql/psqlodbc/default.nix
index ce57c2141834..72221c0eec01 100644
--- a/pkgs/servers/sql/postgresql/psqlodbc/default.nix
+++ b/pkgs/servers/sql/postgresql/psqlodbc/default.nix
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-iodbc=${libiodbc}";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://psqlodbc.projects.postgresql.org/;
     description = "ODBC driver for PostgreSQL";
-    license = "LGPL";
+    license = licenses.lgpl2;
   };
 }