From 059681bc5de74289ce8720a24008ee03f0035f5a Mon Sep 17 00:00:00 2001
From: Baptist BENOIST <baptist.benoist@hydrocean.fr>
Date: Tue, 14 Oct 2014 18:00:57 +0200
Subject: qtcreator: Update from 3.2.0 to 3.2.1

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

(limited to 'pkgs')

diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index f7ca5f2ec9387..47564a112ee45 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -4,7 +4,7 @@ with stdenv.lib;
 
 let
   baseVersion = "3.2";
-  revision = "0";
+  revision = "1";
   version = "${baseVersion}.${revision}";
 in
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz";
-    sha256 = "0giilb0sl71w2p0vlaj4f9qjyaa4llbflp4m1dfdal30facbwizd";
+    sha256 = "0kp7czn9mzncdpq8bx15s3sy13g4xlcdz7y7zy0s9350g4ijs8fx";
   };
 
   # This property can be used in a nix development environment to refer to the Qt package
-- 
cgit 1.4.1


From e0b75ea5e7381a75ee538252a85100ae2b2085a0 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Tue, 4 Nov 2014 23:50:23 +0100
Subject: termite: v8 -> v9

---
 pkgs/applications/misc/termite/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index 25b3677b49891..7c1fe5fc5cbd3 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "termite-${version}";
-  version = "v8";
+  version = "9";
 
   src = fetchgit {
     url = "https://github.com/thestinger/termite";
-    rev = "7f03ded7308ad0e26b72b150080e4f3e70401815";
-    sha256 = "1yj4jvjwv73a02p8a0yip8q39znlhfc9zdr19zm1zik2k4h62c2l";
+    rev = "refs/tags/v${version}";
+    sha256 = "0bnzfjk5yl5i96v5jnlvrz0d1jcp5lal6ppl7y8wx13166i6sdnh";
   };
 
   makeFlags = "VERSION=v${version}";
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
 
   installFlags = "PREFIX=$(out)";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A simple VTE-based terminal";
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = licenses.lgpl2Plus;
     homepage = https://github.com/thestinger/termite/;
-    maintainers = with stdenv.lib.maintainers; [koral];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ maintainers.koral ];
+    platforms = platforms.all;
   };
 }
-- 
cgit 1.4.1


From cf665e9fefe136f00ce57127b0db1927e935c45c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 5 Nov 2014 02:47:54 +0300
Subject: Use Firefox instead of Xulrunner for icedtea7_web: reduces builds on
 realistic NixPkgs use

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

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08a51a9275be7..d4515b8694e78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3304,6 +3304,7 @@ let
 
   icedtea7_web = callPackage ../development/compilers/icedtea-web {
     jdk = "${icedtea7_jdk}/lib/icedtea";
+    xulrunner = firefox;
   };
 
   ikarus = callPackage ../development/compilers/ikarus { };
-- 
cgit 1.4.1


From f0c3c54712cb7f4caf5334fbf926723a6af5d0cc Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Wed, 5 Nov 2014 10:23:39 +0900
Subject: Create wrapper package for fcitx with plugins.

This creates a wrapper package for fcitx so that plugins can be enabled
by the user.  This is based on the wrapper package for
pidgin-with-plugins.

By using this wrapper instead of the fcitx package itself, it will be
possible for the user to enable/disable plugins.
---
 pkgs/tools/inputmethods/fcitx/default.nix |  3 ++-
 pkgs/tools/inputmethods/fcitx/wrapper.nix | 35 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  4 ++++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/inputmethods/fcitx/wrapper.nix

(limited to 'pkgs')

diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix
index 28f6c97949b52..a8b3089c58aca 100644
--- a/pkgs/tools/inputmethods/fcitx/default.nix
+++ b/pkgs/tools/inputmethods/fcitx/default.nix
@@ -5,7 +5,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-4.2.8.5";
+  name = "fcitx-${version}";
+  version = "4.2.8.5";
 
   src = fetchurl {
     url = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz";
diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix
new file mode 100644
index 0000000000000..d4efb3326969b
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix
@@ -0,0 +1,35 @@
+{ stdenv, buildEnv, fcitx, makeWrapper, plugins }:
+
+# This is based on the pidgin-with-plugins package.
+# Users should be able to configure what plugins are used
+# by putting the following in their /etc/nixos/configuration.nix:
+# environment.systemPackages = with pkgs; [
+#     (fcitx-with-plugins.override { plugins = [ fcitx-anthy ]; })
+# ]
+# Or, a normal user could use it by putting the following in his
+# ~/.nixpkgs/config.nix:
+# packageOverrides = pkgs: with pkgs; rec {
+#     (fcitx-with-plugins.override { plugins = [ fcitx-anthy ]; })
+# }
+
+let
+drv = buildEnv {
+  name = "fcitx-with-plugins-" + (builtins.parseDrvName fcitx.name).version;
+
+  paths = [ fcitx ] ++ plugins;
+
+  postBuild = ''
+    # TODO: This could be avoided if buildEnv could be forced to create all directories
+    if [ -L $out/bin ]; then
+      rm $out/bin
+      mkdir $out/bin
+      for i in ${fcitx}/bin/*; do
+        ln -s $i $out/bin
+      done
+    fi
+    wrapProgram $out/bin/fcitx \
+      --set FCITXDIR "$out/"
+  '';
+  };
+in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4515b8694e78..85ea0f6522873 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1117,6 +1117,10 @@ let
 
   fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { };
 
+  fcitx-with-plugins = callPackage ../tools/inputmethods/fcitx/wrapper.nix {
+    plugins = [ ];
+  };
+
   fcron = callPackage ../tools/system/fcron { };
 
   fdm = callPackage ../tools/networking/fdm {};
-- 
cgit 1.4.1


From d74e07fd9ea4837fa7f828206fddfb7c811acbb9 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 5 Nov 2014 04:52:04 +0000
Subject: snd: update from 15.0 to 15.1

---
 pkgs/applications/audio/snd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 1b878deb316ac..17596e24a3bac 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "snd-15.0";
+  name = "snd-15.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/${name}.tar.gz";
-    sha256 = "1s1mswgxhvi0wjw0qscwh2jajihvgz86xffgbwl7qjkymqbh8gyj";
+    sha256 = "01xrgxmkibadm3zva2n7qv00dz8yy9wlkpwv7vancqfb8x44x1ji";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
cgit 1.4.1


From eca021ccc5d55211426774815a3ef5a949092b32 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 5 Nov 2014 09:23:18 +0300
Subject: Fix NILFS-utils source

---
 pkgs/tools/filesystems/nilfs-utils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix
index 93f15675bd76a..3eee59d458d36 100644
--- a/pkgs/tools/filesystems/nilfs-utils/default.nix
+++ b/pkgs/tools/filesystems/nilfs-utils/default.nix
@@ -2,7 +2,7 @@
 let 
   sourceInfo = rec {
     version = "2.2.2";
-    url = "http://www.nilfs.org/download/nilfs-utils-${version}.tar.bz2";
+    url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2";
     sha256 = "1w2i5wy290y03hg72lhkrnmfhap04ki0kkv5m8q60a2frbv6ydql";
     baseName = "nilfs-utils";
     name = "${baseName}-${version}";
-- 
cgit 1.4.1


From 895debb20fd04ac5a8db0deb6a7e845b8321f37d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 5 Nov 2014 10:46:26 +0300
Subject: Update IPMIutil

---
 pkgs/tools/system/ipmiutil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index 46c36926c3668..c19b6007f0183 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "2.9.4";
+  version = "2.9.5";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "1pmpmpc0wymnw8i2rxnyq3v2y7p8930b2rb8nw5w60x2vf15wlaa";
+    sha256 = "1rnv72qfrijcm0kiy2lsbdckjxnxdma8sf8y6y6iypp75rcg007b";
   };
 
   buildInputs = [ openssl ];
-- 
cgit 1.4.1


From 56e9b2c953b2f6680750779eedf769f60e570c7d Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Wed, 5 Nov 2014 06:01:24 -0200
Subject: Youtube-dl: upgrade to 2014.11.04

---
 pkgs/tools/misc/youtube-dl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 57f002d42b6f1..8d03cfae260b6 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.11.02.1";
+  version = "2014.11.04";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "17k0vcggb75nyl8ikamvz0i8q1hqm84qii7fidvnzdcf2v6fakif";
+    sha256 = "073qnbl0lbv1pacqsdvccawlzgxs3kbayw3inlyqhr6xn3471jgk";
   };
 
   buildInputs = [ python ];
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.unlicense;
 
     platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons phreedom ];
+    maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons phreedom AndersonTorres ];
   };
 }
-- 
cgit 1.4.1


From 167115f1a26644d00b8d942166c964ac6dc4b1e9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 5 Nov 2014 10:53:59 +0300
Subject: Update siege HTTP load-tester

---
 pkgs/tools/networking/siege/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix
index c88557262b25b..48e2fc5ef7879 100644
--- a/pkgs/tools/networking/siege/default.nix
+++ b/pkgs/tools/networking/siege/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "siege-3.0.6";
+  name = "siege-3.0.8";
 
   src = fetchurl {
-    url = "http://www.joedog.org/pub/siege/${name}.tar.gz";
-    sha256 = "0nwcj2s804z7yd20pa0cl010m0qgf22a02305i9jwxynwdj9kdvq";
+    url = "http://download.joedog.org/siege/${name}.tar.gz";
+    sha256 = "15xj0cl64mzf89i0jknqg37rkrcaqmgs4755l74b4nmp4bky7ddq";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
-- 
cgit 1.4.1


From bc5f55cc91e70896c99fb55d4b299c286a6a935b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 5 Nov 2014 11:12:35 +0300
Subject: Adopt a few packages

---
 pkgs/data/fonts/clearlyU/default.nix      |   1 +
 pkgs/data/fonts/ucs-fonts/default.nix     |   1 +
 pkgs/games/fsg/default.nix                |   3 +-
 pkgs/games/xsokoban/default.nix           |   2 +
 pkgs/tools/X11/xlaunch/default.nix        | 108 ++++++++++++++++--------------
 pkgs/tools/archivers/p7zip/default.nix    |   1 +
 pkgs/tools/archivers/xarchive/default.nix |   2 +-
 7 files changed, 64 insertions(+), 54 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix
index 2761ed6f3e691..b4750c90faad1 100644
--- a/pkgs/data/fonts/clearlyU/default.nix
+++ b/pkgs/data/fonts/clearlyU/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A Unicode font";
+    maintainers = [stdenv.lib.maintainers.raskin];
   };
 }
diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix
index 1d2aa5e62d3b7..bcba395710980 100644
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@@ -34,5 +34,6 @@ wrapFonts (stdenv.mkDerivation {
 
   meta = {
     description = "Unicode bitmap fonts";
+    maintainers = [stdenv.lib.maintainers.raskin];
   };
 })
diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix
index a4579ad2ae366..12182b8712c5a 100644
--- a/pkgs/games/fsg/default.nix
+++ b/pkgs/games/fsg/default.nix
@@ -45,6 +45,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand";
+    description = "Cellular automata engine tuned towards the likes of Falling Sand";
+    maintainers = [stdenv.lib.maintainers.raskin];
   };
 }
diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix
index b8c6096b756f2..3a2cdb44d5536 100644
--- a/pkgs/games/xsokoban/default.nix
+++ b/pkgs/games/xsokoban/default.nix
@@ -45,5 +45,7 @@ rec {
   name = "xsokoban-" + version;
   meta = {
     description = "X sokoban";
+    license = a.stdemv.lib.licenses.publicDomain;
+    maintainers = [ a.stdenv.lib.maintainers.raskin ];
   };
 }
diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix
index b97c9def8227a..06dfd28b7399c 100644
--- a/pkgs/tools/X11/xlaunch/default.nix
+++ b/pkgs/tools/X11/xlaunch/default.nix
@@ -3,57 +3,61 @@
 # !!! What does this package do, and does it belong in Nixpkgs?
 
 stdenv.mkDerivation {
-	name = "xlaunch";
-	inherit xorgserver;
-	buildCommand = "
-		cat << EOF > realizeuid.c
-		#include <sys/types.h>
-		#include <unistd.h>
-		#include <stdio.h>
-		int main(int argc, char ** argv, char ** envp)
-		{
-			uid_t a,b,c;
-			int i;
-			char *nargv[10000];
-			char arg1 [10];
-			nargv[0]=argv[0];
-			for (i=1; i<=argc; i++){
-				nargv[i+1]=argv[i];
-			}
-			nargv[1]=arg1;
-			getresuid (&a,&b,&c);
-			snprintf(arg1,8,\"%d\",a);
-			setresuid(c,c,c);
-			execve(\"\$out/libexec/xlaunch\", nargv, envp);
-		}
+  name = "xlaunch";
+  inherit xorgserver;
+  buildCommand = "
+    cat << EOF > realizeuid.c
+    #include <sys/types.h>
+    #include <unistd.h>
+    #include <stdio.h>
+    int main(int argc, char ** argv, char ** envp)
+    {
+      uid_t a,b,c;
+      int i;
+      char *nargv[10000];
+      char arg1 [10];
+      nargv[0]=argv[0];
+      for (i=1; i<=argc; i++){
+        nargv[i+1]=argv[i];
+      }
+      nargv[1]=arg1;
+      getresuid (&a,&b,&c);
+      snprintf(arg1,8,\"%d\",a);
+      setresuid(c,c,c);
+      execve(\"\$out/libexec/xlaunch\", nargv, envp);
+    }
 EOF
-		mkdir -p \$out/bin
-		mkdir -p \$out/libexec
-		gcc realizeuid.c -o \$out/bin/xlaunch
-		echo '#! ${stdenv.shell}
-			USER=\$(egrep '\\''^[-a-z0-9A-Z_]*:[^:]*:'\\''\$1'\\'':'\\'' /etc/passwd | sed -e '\\''s/:.*//'\\'' )
-			shift
-			case \"\$1\" in 
-				:*) export _display=\"\$1\"; 
-				shift
-			esac
-			_display=\${_display:-:0}
-			_display=\${_display#:}
-			echo Using :\$_display
-			if [ -n \"\$DO_X_RESET\" ]; then 
-			  RESET_OPTION=\"-once\"
-			else
-			  RESET_OPTION=\"-noreset\"
-			fi;
-			XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" 
-			PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\"
-			echo \"\$PRE_XCMD\" 
-			echo \"\$PRE_XCMD\" | bash
-			echo \"\$XCMD\" 
-			echo \"\$XCMD\" | bash &
-			while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done
-			su -l \${USER:-identityless-shelter} -c \"DISPLAY=:\$_display \$*\";
-		' >\$out/libexec/xlaunch
-		chmod a+x \$out/libexec/xlaunch
-	";
+    mkdir -p \$out/bin
+    mkdir -p \$out/libexec
+    gcc realizeuid.c -o \$out/bin/xlaunch
+    echo '#! ${stdenv.shell}
+      USER=\$(egrep '\\''^[-a-z0-9A-Z_]*:[^:]*:'\\''\$1'\\'':'\\'' /etc/passwd | sed -e '\\''s/:.*//'\\'' )
+      shift
+      case \"\$1\" in 
+        :*) export _display=\"\$1\"; 
+        shift
+      esac
+      _display=\${_display:-:0}
+      _display=\${_display#:}
+      echo Using :\$_display
+      if [ -n \"\$DO_X_RESET\" ]; then 
+        RESET_OPTION=\"-once\"
+      else
+        RESET_OPTION=\"-noreset\"
+      fi;
+      XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" 
+      PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\"
+      echo \"\$PRE_XCMD\" 
+      echo \"\$PRE_XCMD\" | bash
+      echo \"\$XCMD\" 
+      echo \"\$XCMD\" | bash &
+      while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done
+      su -l \${USER:-identityless-shelter} -c \"DISPLAY=:\$_display \$*\";
+    ' >\$out/libexec/xlaunch
+    chmod a+x \$out/libexec/xlaunch
+  ";
+  meta = {
+    description = ''Wrapper to parse NixOS-specific X environment and launch a custom X session'';
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+  };
 }
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index cd0cea13a14d7..0bf1ec736fca1 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     description = "A port of the 7-zip archiver";
     # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction"
     platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
   };
 }
diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix
index 2b60bef197ab7..ed60e3147a8f8 100644
--- a/pkgs/tools/archivers/xarchive/default.nix
+++ b/pkgs/tools/archivers/xarchive/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A GTK+ front-end for command line archiving tools";
-    mainatainers = [ stdenv.lib.maintainers.iElectric ];
+    maintainers = [ stdenv.lib.maintainers.iElectric ];
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
   };
-- 
cgit 1.4.1


From 91435c5e2873eae180358bb3cc5ace3ee77cd7ad Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 5 Nov 2014 11:22:36 +0300
Subject: Update ViFM

---
 pkgs/applications/misc/vifm/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index 5abf57ae1fc4d..5ff010005e409 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -1,18 +1,18 @@
-{ pkgs, fetchurl, stdenv, ncurses, utillinux, file, libX11 }:
+{ pkgs, fetchurl, stdenv, ncurses, utillinux, file, libX11, which, groff }:
 
 let
   name = "vifm-${version}";
-  version = "0.7.7";
+  version = "0.7.8";
 
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2";
-    sha256 = "1lflmkd5q7qqi9d44py0y41pcx5bsadkihn3gc0x5cka04f2gh0d";
+    sha256 = "00vnkr60ci6qwh95kzx399xm97g26svxl9i0y77qv99q41nb5ysx";
   };
 
-  buildInputs = [ utillinux ncurses file libX11 ];
+  buildInputs = [ utillinux ncurses file libX11 which groff ];
 
   meta = {
     description = "A vi-like file manager";
-- 
cgit 1.4.1


From 0770fce3c06a606990261d9887364e1165a80fde Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 5 Nov 2014 11:29:06 +0300
Subject: Update XBoard

---
 pkgs/games/xboard/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix
index 97414c07bda75..61329389d1685 100644
--- a/pkgs/games/xboard/default.nix
+++ b/pkgs/games/xboard/default.nix
@@ -5,11 +5,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="xboard";
-    version="4.7.3";
+    version="4.8.0";
     name="${baseName}-${version}";
-    hash="1amy9krr0qkvcc7gnp3i9x9ma91fc5cq8hy3gdc7rmfsaczv1l3z";
-    url="http://ftp.gnu.org/gnu/xboard/xboard-4.7.3.tar.gz";
-    sha256="1amy9krr0qkvcc7gnp3i9x9ma91fc5cq8hy3gdc7rmfsaczv1l3z";
+    hash="05rdj0nyirc4g1qi5hhrjy45y52ihp1j3ldq2c5bwrz0gzy4i3y8";
+    url="http://ftp.gnu.org/gnu/xboard/xboard-4.8.0.tar.gz";
+    sha256="05rdj0nyirc4g1qi5hhrjy45y52ihp1j3ldq2c5bwrz0gzy4i3y8";
   };
   buildInputs = [
     libX11 xproto libXt libXaw libSM libICE libXmu 
-- 
cgit 1.4.1


From a5dfaef9eae8c006d1ce0dde0d0315c195afd267 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 5 Nov 2014 11:31:31 +0300
Subject: Update XMoto

---
 pkgs/games/xmoto/src-for-default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/games/xmoto/src-for-default.nix b/pkgs/games/xmoto/src-for-default.nix
index 60de24e16c735..beb3f6af1645c 100644
--- a/pkgs/games/xmoto/src-for-default.nix
+++ b/pkgs/games/xmoto/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="0.5.10";
-   name="xmoto-0.5.10";
-   hash="07lyvwb8v75hzp4iqvnxzabzrmwkd3ignfzpm4dgr9asd3j3h91d";
+   version="0.5.11";
+   name="xmoto-0.5.11";
+   hash="1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155";
    url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz";
-   advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.10/xmoto-0.5.10-src.tar.gz";
+   advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-0.5.11-src.tar.gz";
   
   
 }
-- 
cgit 1.4.1


From 404930ec8c2f4a6ce13b979767a9ab03ae90f5d7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 5 Nov 2014 11:51:19 +0300
Subject: Add fairymax chess engine

---
 pkgs/games/fairymax/default.nix | 40 ++++++++++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/games/fairymax/default.nix

(limited to 'pkgs')

diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix
new file mode 100644
index 0000000000000..85fbd2d6a3b0a
--- /dev/null
+++ b/pkgs/games/fairymax/default.nix
@@ -0,0 +1,40 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+  name = "fairymax-${version}";
+  version = "4.8";
+  src = fetchurl {
+    url = "http://home.hccnet.nl/h.g.muller/fmax4_8w.c";
+    sha256 = "01vxhpa4z0613mkgkzmsln293wxmyp5kdzil93cd1ik51q4gwjca";
+  };
+  ini = fetchurl {
+    url = "http://home.hccnet.nl/h.g.muller/fmax.ini";
+    sha256 = "1zwx70g3gspbqx1zf9gm1may8jrli9idalvskxbdg33qgjys47cn";
+  };
+  unpackPhase = ''
+    cp ${src} fairymax.c
+    cp ${ini} fmax.ini
+  '';
+  buildPhase = ''
+    gcc *.c -o fairymax -DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"'
+  '';
+  installPhase = ''
+    mkdir -p "$out"/{bin,share/fairymax}
+    cp fairymax "$out/bin"
+    cp fmax.ini "$out/share/fairymax"
+  '';
+  meta = {
+    inherit version;
+    description = ''A small chess engine supporting fairy pieces'';
+    longDescription = ''
+       A version of micro-Max that reads the piece description
+       from a file fmax.ini, so that arbitrary fairy pieces can be
+       implemented. This version (4.8J) supports up to 15 piece types,
+       and board sizes upto 12x8 board. A Linux port exists in the
+       format of a debian package.
+    '';
+    license = stdenv.lib.licenses.free ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4515b8694e78..ab8bbe486e197 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11232,6 +11232,8 @@ let
 
   exult = callPackage ../games/exult { };
 
+  fairymax = callPackage ../games/fairymax {};
+
   flightgear = callPackage ../games/flightgear { };
 
   freeciv = callPackage ../games/freeciv { };
-- 
cgit 1.4.1


From ac8c9443329315d8a4d5a7e4513cf39865b5f422 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 5 Nov 2014 11:34:20 +0200
Subject: add myself as a maintainer

---
 pkgs/tools/security/tor/torsocks.nix | 1 +
 pkgs/top-level/python-packages.nix   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix
index f8e76c4e83b14..7db547bbe1cad 100644
--- a/pkgs/tools/security/tor/torsocks.nix
+++ b/pkgs/tools/security/tor/torsocks.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     homepage = http://code.google.com/p/torsocks/;
     repositories.git = https://git.torproject.org/torsocks.git;
     license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.phreedom ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dc2b8f54361a8..82f933bea8632 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5840,7 +5840,7 @@ let
   obfsproxy = buildPythonPackage ( rec {
     name = "obfsproxy-0.2.2";
     src = pkgs.fetchgit {
-      url = https://git.torproject.org/pluggable-transports/obfsproxy.git;
+      url = meta.repositories.git;
       rev = "3c4e843a30c430aec1de03e0e09ef654072efc03";
       sha256 = "8fd1e63a37bc42add7609d97d50ecd81da81881bcf7015a9e2958531dbf39018";
     };
@@ -5850,6 +5850,8 @@ let
     meta = {
       description = "a pluggable transport proxy";
       homepage = https://www.torproject.org/projects/obfsproxy;
+      repositories.git = https://git.torproject.org/pluggable-transports/obfsproxy.git;
+      maintainers = [ stdenv.lib.maintainers.phreedom ];
     };
   });
 
-- 
cgit 1.4.1


From a8e2e80bcde0166cfbd798e44d3569eb9e82c2d0 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 5 Nov 2014 09:49:37 +0000
Subject: xsokoban: fix eval

---
 pkgs/games/xsokoban/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix
index 3a2cdb44d5536..8cdf07bb3063d 100644
--- a/pkgs/games/xsokoban/default.nix
+++ b/pkgs/games/xsokoban/default.nix
@@ -1,8 +1,8 @@
-a :  
-let 
+a :
+let
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "3.3c" a; 
+  version = a.lib.attrByPath ["version"] "3.3c" a;
   buildInputs = with a; [
     a.libX11 a.xproto a.libXpm a.libXt
   ];
@@ -35,17 +35,17 @@ rec {
     sed -e 's/getpass[(][^)]*[)]/PASSWORD/' -i main.c
     sed -e '/if [(]owner[)]/iowner=1;' -i main.c
   '') ["minInit" "doUnpack"];
-      
+
   preBuild = a.fullDepEntry (''
     sed -e "s@/usr/local/@$out/@" -i Makefile
-    sed -e "s@ /bin/@ @" -i Makefile 
+    sed -e "s@ /bin/@ @" -i Makefile
     mkdir -p $out/bin $out/share $out/man/man1 $out/lib
   '') ["minInit" "doConfigure" "defEnsureDir"];
 
   name = "xsokoban-" + version;
   meta = {
     description = "X sokoban";
-    license = a.stdemv.lib.licenses.publicDomain;
+    license = a.stdenv.lib.licenses.publicDomain;
     maintainers = [ a.stdenv.lib.maintainers.raskin ];
   };
 }
-- 
cgit 1.4.1


From 6e726e1348a4ab130b7c531b784b62b6dfa3dbb6 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 5 Nov 2014 11:33:45 +0000
Subject: sxiv: use https

---
 pkgs/applications/graphics/sxiv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index e7e52f91b4993..ea982d87c138d 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "sxiv-${version}";
 
   src = fetchgit {
-    url = "git@github.com:muennich/sxiv.git";
+    url = "https://github.com/muennich/sxiv.git";
     rev = "f55d9f4283f7133ab5a137fc04ee19d1df62fafb";
     sha256 = "85f734f40fdc837514b72694de12bac92fe130286fa6f1dc374e94d575ca8280";
   };
-- 
cgit 1.4.1


From 876fa6a6a69ff6d3d9da101ada8d0b48ffaee002 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Nov 2014 13:00:20 +0100
Subject: Fix unstable job evaluation

---
 pkgs/top-level/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index a788427aa20c2..854bfacb0660d 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -32,7 +32,7 @@ let
               jobs.manual
               jobs.stdenv.x86_64-linux
               jobs.stdenv.i686-linux
-              jobs.stdenv.x86_64-darwin
+              #jobs.stdenv.x86_64-darwin
               jobs.linux.x86_64-linux
               jobs.linux.i686-linux
               # Ensure that X11/GTK+ are in order.
-- 
cgit 1.4.1


From 9fffaf43ba74ba2d560be269cf5ab60ee13cac42 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 5 Nov 2014 12:27:33 +0100
Subject: selenium-server-standalone: update -> 2.44, fix opera, create binary,
 chrome support

---
 pkgs/development/tools/selenium/server/default.nix | 45 +++++++++++++++++-----
 1 file changed, 35 insertions(+), 10 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
index efb1e85c2d730..ebbcd2c8fd870 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -1,27 +1,52 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xlibs
+, chromedriver, chromeSupport ? true }:
 
-stdenv.mkDerivation rec {
+with stdenv.lib;
+
+let
+  arch = if stdenv.system == "x86_64-linux" then "amd64"
+         else if stdenv.system == "i686-linux" then "i386"
+         else "";
+
+in stdenv.mkDerivation rec {
   name = "selenium-server-standalone-${version}";
-  version = "2.39.0";
+  version = "2.44.0";
 
   src = fetchurl {
-    url = "https://selenium.googlecode.com/files/${name}.jar";
-    sha256 = "11ixh5x5f9kia2va8wssd3n7y57dkv3snw6xvk85y4qhzg64b65f";
+    url = "http://selenium-release.storage.googleapis.com/2.44/selenium-server-standalone-2.44.0.jar";
+    sha256 = "1n53pyrxpmfh9lvr68d1l9rsiw7qr36farirpl3ivkyvnpm5iwm5";
   };
 
-  unpack = "";
+  unpackPhase = "true";
+
+  buildInputs = [ jre makeWrapper ];
+
+  # Patch launcher binaries for opera
+  patchPhase = optionalString (arch!="") ''
+    cp $src $TMPDIR/${name}.jar
+    export src=$TMPDIR/${name}.jar
+
+    ${jdk}/bin/jar xf $src launchers/launcher-linux-amd64
+    patchelf \
+      --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+      --set-rpath "${gcc.gcc}/lib/:${gcc.gcc}/lib64:${xlibs.libX11}/lib" \
+      launchers/launcher-linux-${arch}
+    ${jdk}/bin/jar uf $src launchers/launcher-linux-${arch}
+  '';
 
-  buildCommand = ''
+  installPhase = ''
     mkdir -p $out/share/lib/${name}
     cp $src $out/share/lib/${name}/${name}.jar
+    makeWrapper ${jre}/bin/java $out/bin/selenium-server \
+      --add-flags "-jar $out/share/lib/${name}/${name}.jar" \
+      --add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"}
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = https://code.google.com/p/selenium;
     description = "Selenium Server for remote WebDriver.";
-    maintainers = [ maintainers.coconnor ];
+    maintainers = with maintainers; [ coconnor offline ];
     platforms = platforms.all;
-    hydraPlatforms = [];
     license = licenses.asl20;
   };
 }
-- 
cgit 1.4.1


From 511a10103010c4ce9a55d38d0980dde1f9ed74a7 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 5 Nov 2014 13:05:02 +0100
Subject: pythonPackages.selenium: update 2.39 -> 2.44

---
 pkgs/top-level/python-packages.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0dbdfb96faccc..b45489c31d4ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8253,10 +8253,10 @@ let
   };
 
   selenium = buildPythonPackage rec {
-    name = "selenium-2.39.0";
+    name = "selenium-2.44.0";
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/s/selenium/${name}.tar.gz";
-      sha256 = "1kisndzl9s0vs0a5paqx35hxq28id3xyi1gfsjaixsi6rs0ibhhh";
+      sha256 = "0l70pqwg88imbylcd831vg8nj8ipy4zr331f6qjccss7vn56i2h5";
     };
 
     buildInputs = with self; [pkgs.xlibs.libX11];
@@ -8264,14 +8264,15 @@ let
     # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some
     # absolute paths. Replaced by relative path so it is found when used in nix.
     x_ignore_nofocus =
-      pkgs.fetchsvn {
-        url = http://selenium.googlecode.com/svn/tags/selenium-2.25.0/cpp/linux-specific;
-        rev = 17641;
-        sha256 = "1wif9r6307qhlcp2zbg6n05yvxxn9ppkxh8gpsplcbyh22zi7bcd";
+      pkgs.fetchFromGitHub {
+        owner = "SeleniumHQ";
+        repo = "selenium";
+        rev = "selenium-2.44.0";
+        sha256 = "13aqm0dwy17ghimy7m2mxjwlyc1k7zk5icxzrs1sa896056f1dyy";
       };
 
     preInstall = ''
-      cp "${x_ignore_nofocus}/"* .
+      cp "${x_ignore_nofocus}/cpp/linux-specific/"* .
       sed -i 's|dlopen(library,|dlopen("libX11.so.6",|' x_ignore_nofocus.c
       gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o
       gcc -shared \
-- 
cgit 1.4.1


From 66ae2a53220c90f119e4fd1cb4c76adfc2436555 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Wed, 5 Nov 2014 13:22:39 +0100
Subject: Revert "syslinux: disable parallel building"

The change fixed nothing. I'm sorry, I confused the platforms when testing.
The actual problem was fixed by peti.
This reverts commit e682e8018c004639f2c977fa9499af22dd992710.
---
 pkgs/os-specific/linux/syslinux/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index 146a8a8ce3619..93e5d591a9d9a 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ nasm perl libuuid ];
 
-  enableParallelBuilding = false; # problems on Hydra
+  enableParallelBuilding = true;
 
   preBuild = ''
     substituteInPlace Makefile --replace /bin/pwd $(type -P pwd)
-- 
cgit 1.4.1


From 852f0bf2d4f4ae2c58fd414e628d841879163386 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 5 Nov 2014 13:52:35 +0100
Subject: geeqie: xxd is required as build dependency

---
 pkgs/applications/graphics/geeqie/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 0db1f211e564e..4ef433a3636be 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, gtk, libpng, exiv2
-, lcms, intltool, gettext, libchamplain, fbida
+, lcms, intltool, gettext, libchamplain, fbida, vim
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     autoconf automake libtool pkgconfig gtk libpng exiv2 lcms intltool gettext
-    libchamplain
+    libchamplain vim
   ];
 
   postInstall = ''
-- 
cgit 1.4.1


From a1fd333816120c70aa10b48a044f599e4e805ea4 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 5 Nov 2014 14:27:38 +0100
Subject: Add locustio, msgpack-python. Upgraded requests2.

---
 pkgs/top-level/python-packages.nix | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 84905a441c544..a05ac2742accf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4730,6 +4730,22 @@ let
     };
   };
 
+  locustio = buildPythonPackage rec {
+    name = "locustio-0.7.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/l/locustio/${name}.tar.gz";
+      md5 = "90cf4d029d58ad58d19ea17a16e59c34";
+    };
+
+    propagatedBuildInputs = [ self.msgpack self.requests2 self.flask self.gevent self.pyzmq ];
+    buildInputs = [ self.mock self.unittest2 ];
+
+    meta = {
+      homepage = http://locust.io/;
+      description = "A load testing tool";
+    };
+  };
 
   lockfile = buildPythonPackage rec {
     name = "lockfile-0.9.1";
@@ -5254,6 +5270,17 @@ let
     };
   };
 
+  msgpack = buildPythonPackage rec {
+    name = "msgpack-python-${version}";
+    version = "0.4.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/m/msgpack-python/${name}.tar.gz";
+      md5 = "e3a0fdfd864c72c958bb501d39b39caf";
+    };
+
+    propagatedBuildInputs = with self; [ ];
+  };
 
   msrplib = buildPythonPackage rec {
     name = "python-msrplib-${version}";
@@ -7669,11 +7696,11 @@ let
 
 
   requests2 = buildPythonPackage rec {
-    name = "requests-2.2.1";
+    name = "requests-2.4.3";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz";
-      md5 = "ac27081135f58d1a43e4fb38258d6f4e";
+      md5 = "02214b3a179e445545de4b7a98d3dd17";
     };
 
     meta = {
-- 
cgit 1.4.1


From e10a8b731813a1ce1192e22bde7b9fb3551dfd23 Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Wed, 5 Nov 2014 15:28:52 +0200
Subject: ec2-ami-tools -> 1.5.6, updated license & homepage

---
 lib/licenses.nix                                    | 6 ++++++
 pkgs/tools/virtualization/ec2-ami-tools/default.nix | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/lib/licenses.nix b/lib/licenses.nix
index da5cc3a927df8..ed1b1469ae99e 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -21,6 +21,12 @@ rec {
     inherit (agpl3) url;
   };
 
+  amazonsl = {
+    shortName = "asl";
+    fullName = "Amazon Software License";
+    url = http://aws.amazon.com/asl/;
+  };
+
   amd = {
     shortName = "amd";
     fullName = "AMD License Agreement";
diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
index cbe53326339aa..dad581c93d067 100644
--- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "ec2-ami-tools-${version}";
 
-  version = "1.5.3";
+  version = "1.5.6";
 
   buildInputs = [ unzip makeWrapper ];
 
   src = fetchurl {
     url = "http://s3.amazonaws.com/ec2-downloads/${name}.zip";
-    sha256 = "0n184nxc57alg25h5bslg0cs1z854sf7f52a820ihxxknrq2dy6i";
+    sha256 = "0227370qbm26qaqvscqxv6002bqwy2i5fdhbhpwfnbymh7jz59ks";
   };
 
   # Amazon EC2 requires that disk images are writable.  If they're
@@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
     '';  # */
 
   meta = {
-    homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88;
+    homepage = https://aws.amazon.com/developertools/Amazon-EC2/368;
     description = "Command-line tools to create and manage Amazon EC2 virtual machine images";
-    license = "unfree-redistributable"; # Amazon || (Ruby GPL-2)
+    license = stdenv.lib.licenses.amazonsl;
   };
 
 }
-- 
cgit 1.4.1


From 1aafb0a70084f93a7c3e5b359ef4cadf45088ca1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Nov 2014 14:45:11 +0100
Subject: Revert "geeqie: xxd is required as build dependency"

This reverts commit 852f0bf2d4f4ae2c58fd414e628d841879163386. Geeqie
builds fine without vim.
---
 pkgs/applications/graphics/geeqie/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 4ef433a3636be..0db1f211e564e 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, gtk, libpng, exiv2
-, lcms, intltool, gettext, libchamplain, fbida, vim
+, lcms, intltool, gettext, libchamplain, fbida
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     autoconf automake libtool pkgconfig gtk libpng exiv2 lcms intltool gettext
-    libchamplain vim
+    libchamplain
   ];
 
   postInstall = ''
-- 
cgit 1.4.1


From 4942acc0d96161435b22244bee1e6217c21f6b16 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Nov 2014 14:25:34 +0100
Subject: geeqie: Don't use fetchgit

Fetchgit considered harmful.
---
 pkgs/applications/graphics/geeqie/default.nix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 0db1f211e564e..40b077ea88756 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, gtk, libpng, exiv2
+{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gtk, libpng, exiv2
 , lcms, intltool, gettext, libchamplain, fbida
 }:
 
@@ -6,19 +6,14 @@ stdenv.mkDerivation rec {
   name = "geeqie-${version}";
   version = "1.2";
 
-  src = fetchgit {
-    url = "git://gitorious.org/geeqie/geeqie.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "1h9w0jrcqcp5jjgmks5pvpppnfxhcd1s3vqlyb3qyil2wfk8n8wp";
+  src = fetchurl {
+    url = mirror://debian/pool/main/g/geeqie/geeqie_1.2.orig.tar.gz;
+    sha256 = "0wkcpyh3f6ig36x1q6h9iqgq225w37visip48m72j8rpghmv1rn3";
   };
 
-  configureFlags = [
-    "--enable-gps"
-  ];
+  configureFlags = [ "--enable-gps" ];
 
-  configurePhase = ''
-    ./autogen.sh $configureFlags --prefix="$out"
-  '';
+  preConfigure = "./autogen.sh";
 
   buildInputs = [
     autoconf automake libtool pkgconfig gtk libpng exiv2 lcms intltool gettext
-- 
cgit 1.4.1


From ebfdfdb7e4e358ca18484e40482d7c36e395a37b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Nov 2014 14:42:04 +0100
Subject: geeqie: Disable libchamplain dependency for now

It causes Geeqie to depend on both GTK+ 2 and 3, which is undesirable.
---
 pkgs/applications/graphics/geeqie/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 40b077ea88756..033a2027ec6b8 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     autoconf automake libtool pkgconfig gtk libpng exiv2 lcms intltool gettext
-    libchamplain
+    #libchamplain
   ];
 
   postInstall = ''
-- 
cgit 1.4.1


From af0557cf82080ab51bf82e1352f861d8ee6e469d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Nov 2014 15:15:00 +0100
Subject: Allow marking licenses as unfree

This allows licenses like the Amazon Software License to be identified
properly while still preventing packages with those licenses from
being distributed in the Nixpkgs/NixOS channels.
---
 lib/licenses.nix                | 17 ++++++++++++++---
 pkgs/stdenv/generic/default.nix |  5 ++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/lib/licenses.nix b/lib/licenses.nix
index aea7841c071e1..372adea4f9ada 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -25,6 +25,7 @@ rec {
     shortName = "asl";
     fullName = "Amazon Software License";
     url = http://aws.amazon.com/asl/;
+    free = false;
   };
 
   amd = {
@@ -290,11 +291,21 @@ rec {
     url = http://www.tcl.tk/software/tcltk/license.html;
   };
 
-  unfree = "unfree";
+  unfree = {
+    fullName = "Unfree";
+    free = false;
+  };
 
-  unfreeRedistributable = "unfree-redistributable";
+  unfreeRedistributable = {
+    fullName = "Unfree redistributable";
+    free = false;
+  };
 
-  unfreeRedistributableFirmware = "unfree-redistributable-firmware";
+  unfreeRedistributableFirmware = {
+    fullName = "Unfree redistributable firmware";
+    # Note: we currently consider these "free" for inclusion in the
+    # channel and NixOS images.
+  };
 
   unlicense = {
     shortName = "Unlicense";
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 399843c276030..038afc585c28b 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -41,6 +41,9 @@ let
 
   unsafeGetAttrPos = builtins.unsafeGetAttrPos or (n: as: null);
 
+  isUnfree = licenses: lib.lists.any (l:
+    !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses;
+
   # The stdenv that we are producing.
   result =
 
@@ -84,7 +87,7 @@ let
               unsafeGetAttrPos "name" attrs;
           pos' = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»";
         in
-        if !allowUnfree && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) && !(allowUnfreePredicate attrs) then
+        if !allowUnfree && isUnfree (lib.lists.toList attrs.meta.license or []) && !allowUnfreePredicate attrs then
           throw ''
             Package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate.
             ${forceEvalHelp "Unfree"}''
-- 
cgit 1.4.1


From 8913f14a5f925b7db05740e2032dd79ae9217809 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 5 Nov 2014 17:44:44 +0100
Subject: emacs-idris-mode: upgrade to 0.9.15

---
 pkgs/applications/editors/emacs-modes/idris/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix
index 4e9d1cfd77cdd..a631939b55c70 100644
--- a/pkgs/applications/editors/emacs-modes/idris/default.nix
+++ b/pkgs/applications/editors/emacs-modes/idris/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "idris-mode";
-  version = "0.9.14";
+  version = "0.9.15";
 
   src = fetchurl {
     url = "https://github.com/idris-hackers/${pname}/archive/${version}.tar.gz";
-    sha256 = "1qlkbf14mcibp6h5r84fp5xdjspyaw1xdmnkmaxbypwjhhjg4s83";
+    sha256 = "0ag7qqsv64rifk9ncdxv4gyylfbw6c8y2wq610l4pabqv2qrlh9r";
   };
 
   buildInputs = [ emacs ];
-- 
cgit 1.4.1


From f2b6b9871fc5c1509f09556c0a1d89ab1b0e284c Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 5 Nov 2014 21:43:12 +0100
Subject: new package: swaks, a command line SMTP tool

---
 pkgs/tools/networking/swaks/default.nix | 34 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/networking/swaks/default.nix

(limited to 'pkgs')

diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix
new file mode 100644
index 0000000000000..0743a5c62f7e5
--- /dev/null
+++ b/pkgs/tools/networking/swaks/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, perl, perlPackages, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "swaks-${version}";
+  version = "20130209.0";
+
+  src = fetchurl {
+    url = "http://www.jetmore.org/john/code/swaks/files/${name}.tar.gz";
+    sha256 = "0z0zsjminrdjpn6a8prjdwilnr27piibh78gc5ppg0nadljnf28b";
+  };
+
+  buildInputs = [ perl makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv swaks $out/bin/
+
+    wrapProgram $out/bin/swaks --set PERL5LIB \
+      "${with perlPackages; stdenv.lib.makePerlPath [
+        NetSSLeay AuthenSASL NetDNS IOSocketInet6
+      ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.jetmore.org/john/code/swaks/";
+    description = ''
+      A featureful, flexible, scriptable, transaction-oriented SMTP test tool
+    '';
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ rickynils ];
+    platforms = platforms.all;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f21567a381c36..dbe7f5345647d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2407,6 +2407,8 @@ let
 
   privoxy = callPackage ../tools/networking/privoxy { };
 
+  swaks = callPackage ../tools/networking/swaks { };
+
   t1utils = callPackage ../tools/misc/t1utils { };
 
   tarsnap = callPackage ../tools/backup/tarsnap { };
-- 
cgit 1.4.1


From ef321f539d8dff4cfbf69919abfea77737f4f8d0 Mon Sep 17 00:00:00 2001
From: Bjørn Forsman <bjorn.forsman@gmail.com>
Date: Wed, 5 Nov 2014 21:21:58 +0100
Subject: opkg-utils: new package

Helper scripts for use with the opkg package manager.

Upstream doesn't do releases it seems, so I'm packaging the latest git
version.
---
 .../package-management/opkg-utils/default.nix      | 24 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix                    |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/package-management/opkg-utils/default.nix

(limited to 'pkgs')

diff --git a/pkgs/tools/package-management/opkg-utils/default.nix b/pkgs/tools/package-management/opkg-utils/default.nix
new file mode 100644
index 0000000000000..9a197ca763a49
--- /dev/null
+++ b/pkgs/tools/package-management/opkg-utils/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "opkg-utils-20141030";
+
+  # No releases, only a git tree
+  src = fetchgit {
+    url = "git://git.yoctoproject.org/opkg-utils";
+    rev = "762d9dadce548108d4204c2113461a7dd6f57e60";
+    sha256 = "a450643fa1353b872166a3d462297fb2eb240554eed7a9186645ffd72b353417";
+  };
+
+  preBuild = ''
+    makeFlagsArray+=(PREFIX="$out")
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Helper scripts for use with the opkg package manager";
+    homepage = http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/;
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbe7f5345647d..8bde3f44c881f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12319,6 +12319,8 @@ let
 
   opkg = callPackage ../tools/package-management/opkg { };
 
+  opkg-utils = callPackage ../tools/package-management/opkg-utils { };
+
   pgadmin = callPackage ../applications/misc/pgadmin { };
 
   pgf = pgf2;
-- 
cgit 1.4.1


From d66bf89faab9ad437268b6e6f77882133a2ab42e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 6 Nov 2014 00:23:25 +0300
Subject: Update PhantomJS; should also fix remarkjs

---
 pkgs/development/tools/phantomjs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix
index 6fc53595efbd8..17837933eae69 100644
--- a/pkgs/development/tools/phantomjs/default.nix
+++ b/pkgs/development/tools/phantomjs/default.nix
@@ -3,7 +3,7 @@
 assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
 
 stdenv.mkDerivation rec {
-  name = "phantomjs-1.9.7";
+  name = "phantomjs-1.9.8";
 
   # I chose to use the binary build for now.
   # The source version is quite nasty to compile
@@ -13,18 +13,18 @@ stdenv.mkDerivation rec {
   src = if stdenv.system == "i686-linux" then
           fetchurl {
             url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-i686.tar.bz2";
-            sha256 = "1ffd5544wnkww5cgwsims4bk4bymvm6pm19p32nbhwabxqhbnj9a";
+            sha256 = "11fzmssz9pqf3arh4f36w06sl2nyz8l9h8iyxyd7w5aqnq5la0j1";
           }
         else
           if stdenv.system == "x86_64-linux" then
             fetchurl {
               url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-x86_64.tar.bz2";
-              sha256 = "06mhvj8rx298j0mrijw48zfm28hqgy81vdr1vv0jp4ncxbvijfs7";
+              sha256 = "0fhnqxxsxhy125fmif1lwgnlhfx908spy7fx9mng4w72320n5nd1";
             }
           else # x86_64-darwin
             fetchurl {
               url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-macosx.zip";
-              sha256 = "0vsagvx181gnypi6kgmxp4br6hnvd81vyy3cbz5pxccdys7iywvj";
+              sha256 = "0j0aq8dgzmb210xdrh0v3d4nblskl3zsckl8bzf1a603wcx085cg";
             };
 
   buildInputs = if stdenv.isDarwin then [ unzip ] else [];
-- 
cgit 1.4.1


From aeb032044d31be54cad6225208fd0929e5878e96 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 6 Nov 2014 00:31:46 +0300
Subject: Readd BtrFS-progs 3.16 for snapper build

---
 pkgs/tools/filesystems/btrfsprogs/3.16.nix | 31 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  5 ++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/filesystems/btrfsprogs/3.16.nix

(limited to 'pkgs')

diff --git a/pkgs/tools/filesystems/btrfsprogs/3.16.nix b/pkgs/tools/filesystems/btrfsprogs/3.16.nix
new file mode 100644
index 0000000000000..e1d4b8bd31cf5
--- /dev/null
+++ b/pkgs/tools/filesystems/btrfsprogs/3.16.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo
+, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }:
+
+let version = "3.16"; in
+
+stdenv.mkDerivation rec {
+  name = "btrfs-progs-${version}";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
+    sha256 = "0phbrgipl04q8cdj9nnshik7b6p2bg51jxb3l1gvfc04dkgm2xls";
+  };
+
+  buildInputs = [
+    attr acl zlib libuuid e2fsprogs lzo
+    asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
+  ];
+
+  # for btrfs to get the rpath to libgcc_s, needed for pthread_cancel to work
+  NIX_CFLAGS_LINK = "-lgcc_s";
+
+  makeFlags = "prefix=$(out)";
+
+  meta = with stdenv.lib; {
+    description = "Utilities for the btrfs filesystem";
+    homepage = https://btrfs.wiki.kernel.org/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ raskin wkennington ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bde3f44c881f..edb7a762f5b9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -642,6 +642,7 @@ let
   bsod = callPackage ../misc/emulators/bsod { };
 
   btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { };
+  btrfsProgs-3_16 = callPackage ../tools/filesystems/btrfsprogs/3.16.nix { };
 
   bwm_ng = callPackage ../tools/networking/bwm-ng { };
 
@@ -10503,7 +10504,9 @@ let
 
   smartdeblur = callPackage ../applications/graphics/smartdeblur { };
 
-  snapper = callPackage ../tools/misc/snapper { };
+  snapper = callPackage ../tools/misc/snapper { 
+    btrfsProgs = btrfsProgs-3_16;
+  };
 
   snd = callPackage ../applications/audio/snd { };
 
-- 
cgit 1.4.1


From 4201769344e418b649cc91f6c782db1bb6c4d1fd Mon Sep 17 00:00:00 2001
From: Bjørn Forsman <bjorn.forsman@gmail.com>
Date: Wed, 5 Nov 2014 22:05:11 +0100
Subject: perl-Net-CIDR: new package

Expression is generated with nix-generate-from-cpan. Then I added
platforms and maintainers.
---
 pkgs/top-level/perl-packages.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 04edc8c73642b..c549332d2fa86 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6593,6 +6593,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  NetCIDR = buildPerlPackage {
+    name = "Net-CIDR-0.17";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.17.tar.gz;
+      sha256 = "4a968e700d382cf0946e47df420d0151fbd8e0135f037d404c7c63713b66daf0";
+    };
+    meta = {
+      description = "Manipulate IPv4/IPv6 netblocks in CIDR notation";
+      license = "perl";
+      platforms = stdenv.lib.platforms.unix;
+      maintainers = [ maintainers.bjornfor ];
+    };
+  };
+
   NetCoverArtArchive = buildPerlPackage {
     name = "Net-CoverArtArchive-1.02";
     src = fetchurl {
-- 
cgit 1.4.1


From 4f220bd0c3ccac3ce97ae25b6fcb133b329f0156 Mon Sep 17 00:00:00 2001
From: Bjørn Forsman <bjorn.forsman@gmail.com>
Date: Wed, 5 Nov 2014 22:09:43 +0100
Subject: munin: add missing dependency on 'NetCIDR'

Fixes

  munin-node[30100]: Can't locate Net/CIDR.pm in @INC (@INC contains: [...])

when using the 'cidr_allow' configuration directive.
---
 pkgs/servers/monitoring/munin/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 0ce58e6401587..eaaaa6c32bf98 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
     perl
     perlPackages.ModuleBuild
     perlPackages.HTMLTemplate
+    perlPackages.NetCIDR
     perlPackages.NetSSLeay
     perlPackages.NetServer
     perlPackages.Log4Perl
@@ -107,7 +108,7 @@ stdenv.mkDerivation rec {
         wrapProgram "$file" \
           --set PERL5LIB "$out/lib/perl5/site_perl:${rrdtool}/lib/perl:${with perlPackages; stdenv.lib.makePerlPath [
                 Log4Perl IOSocketInet6 Socket6 URI DBFile DateManip
-                HTMLTemplate FileCopyRecursive FCGI NetSNMP NetServer
+                HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer
                 ListMoreUtils TimeHiRes DBDPg LWPUserAgent
                 ]}"
     done
-- 
cgit 1.4.1


From 9f338061affdd94980c2ab97b5495cc9a34c641b Mon Sep 17 00:00:00 2001
From: Carlo Nucera <meditans@gmail.com>
Date: Wed, 5 Nov 2014 22:52:47 +0100
Subject: Haskell - added package unification-fd

---
 .../libraries/haskell/unification-fd/default.nix         | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix                      |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/unification-fd/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/unification-fd/default.nix b/pkgs/development/libraries/haskell/unification-fd/default.nix
new file mode 100644
index 0000000000000..5489310e3320e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unification-fd/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, logict, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "unification-fd";
+  version = "0.9.0";
+  sha256 = "0fdnpcpcpjlxlwxpqlawwbgqhs1p9lrksy5ln5isyvr06hwqh7ki";
+  buildDepends = [ logict mtl ];
+  meta = {
+    homepage = "http://code.haskell.org/~wren/";
+    description = "Simple generic unification algorithms";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 890d95b21a822..643bfd56eb818 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2749,6 +2749,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   unboundedDelays = callPackage ../development/libraries/haskell/unbounded-delays {};
 
+  unificationFd = callPackage ../development/libraries/haskell/unification-fd {};  
+
   unionFind = callPackage ../development/libraries/haskell/union-find {};
 
   uniplate = callPackage ../development/libraries/haskell/uniplate {};
-- 
cgit 1.4.1


From d0e0d62e618aa651d6850f3828262e28a5873af3 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 5 Nov 2014 23:58:14 +0100
Subject: add duperemove: btrfs deduplication tool

---
 pkgs/tools/filesystems/duperemove/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/filesystems/duperemove/default.nix

(limited to 'pkgs')

diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix
new file mode 100644
index 0000000000000..087012d62a1fa
--- /dev/null
+++ b/pkgs/tools/filesystems/duperemove/default.nix
@@ -0,0 +1,24 @@
+{ lib, stdenv, fetchurl, libgcrypt, pkgconfig, glib, linuxHeaders }:
+
+stdenv.mkDerivation rec {
+  name = "duperemove-${version}";
+  version = "0.09.beta2";
+
+  src = fetchurl {
+    url = "https://github.com/markfasheh/duperemove/archive/v${version}.tar.gz";
+    sha256 = "0rn7lf9rjf4ypgfwms2y7b459rri4rfn809h6wx8xl9nbm5niil4";
+  };
+
+  buildInputs = [ libgcrypt pkgconfig glib linuxHeaders ];
+
+  makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
+
+  meta = {
+    description = "A simple tool for finding duplicated extents and submitting them for deduplication";
+    homepage = https://github.com/markfasheh/duperemove;
+    license = lib.licenses.gpl2;
+
+    maintainers = [ lib.maintainers.bluescreen303 ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index edb7a762f5b9c..aa63fdcd477fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -682,6 +682,10 @@ let
 
   dlx = callPackage ../misc/emulators/dlx { };
 
+  duperemove = callPackage ../tools/filesystems/duperemove {
+    linuxHeaders = linuxHeaders_3_14;
+  };
+
   eggdrop = callPackage ../tools/networking/eggdrop { };
 
   enca = callPackage ../tools/text/enca { };
-- 
cgit 1.4.1


From 21f57b8d78f0d3f2c7b041eab38c47deec457894 Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <cillian.deroiste@gmail.com>
Date: Thu, 6 Nov 2014 00:54:12 +0100
Subject: Add tessel: cli tools and node libs for tessel.io devices

---
 pkgs/applications/misc/tessel/default.nix |   40 +
 pkgs/applications/misc/tessel/package.nix | 1974 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |    2 +
 3 files changed, 2016 insertions(+)
 create mode 100644 pkgs/applications/misc/tessel/default.nix
 create mode 100644 pkgs/applications/misc/tessel/package.nix

(limited to 'pkgs')

diff --git a/pkgs/applications/misc/tessel/default.nix b/pkgs/applications/misc/tessel/default.nix
new file mode 100644
index 0000000000000..6a11713c75010
--- /dev/null
+++ b/pkgs/applications/misc/tessel/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, callPackage, libusb1, pkgconfig, python, utillinux }:
+
+with stdenv.lib;
+
+let 
+  nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
+    neededNatives =  [ libusb1 pkgconfig python utillinux ];
+    self = nodePackages;
+    generated = ./package.nix;
+  };
+
+in nodePackages.buildNodePackage rec {
+  name = "tessel-0.3.16";
+  bin = true;
+  
+  src = [
+    (fetchurl {
+      url = "http://registry.npmjs.org/tessel/-/tessel-0.3.16.tgz";
+      name = "tessel-0.3.16.tgz";
+      sha1 = "900a8d897ba03d7a9d5927697180284772d70738";
+    })
+  ];
+
+  deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
+
+  postInstall = ''
+    mkdir -p $out/etc/udev/rules.d
+    cp $out/lib/node_modules/tessel/install/85-tessel.rules $out/etc/udev/rules.d/
+  '';
+  
+  passthru.names = [ "tessel" ];
+
+  meta = {
+    description = "Command line tools and programmatic access library for Tessel devices";
+    homepage = https://tessel.io;
+    license = licenses.mit;
+    maintainers = with maintainers; [ goibhniu ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/applications/misc/tessel/package.nix b/pkgs/applications/misc/tessel/package.nix
new file mode 100644
index 0000000000000..d388387ccaf8b
--- /dev/null
+++ b/pkgs/applications/misc/tessel/package.nix
@@ -0,0 +1,1974 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+  by-spec."abbrev"."1" =
+    self.by-version."abbrev"."1.0.5";
+  by-version."abbrev"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "abbrev-1.0.5";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz";
+        name = "abbrev-1.0.5.tgz";
+        sha1 = "5d8257bd9ebe435e698b2fa431afde4fe7b10b03";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."abbrev" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "abbrev" ];
+  };
+  by-spec."asn1"."0.1.11" =
+    self.by-version."asn1"."0.1.11";
+  by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage {
+    name = "asn1-0.1.11";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+        name = "asn1-0.1.11.tgz";
+        sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."asn1" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "asn1" ];
+  };
+  by-spec."assert-plus"."0.1.2" =
+    self.by-version."assert-plus"."0.1.2";
+  by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "assert-plus-0.1.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";
+        name = "assert-plus-0.1.2.tgz";
+        sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."assert-plus" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "assert-plus" ];
+  };
+  by-spec."async"."~0.2.9" =
+    self.by-version."async"."0.2.10";
+  by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage {
+    name = "async-0.2.10";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
+        name = "async-0.2.10.tgz";
+        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
+  "async" = self.by-version."async"."0.2.10";
+  by-spec."async"."~0.9.0" =
+    self.by-version."async"."0.9.0";
+  by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage {
+    name = "async-0.9.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
+        name = "async-0.9.0.tgz";
+        sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
+  by-spec."aws-sign2"."~0.5.0" =
+    self.by-version."aws-sign2"."0.5.0";
+  by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "aws-sign2-0.5.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
+        name = "aws-sign2-0.5.0.tgz";
+        sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."aws-sign2" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "aws-sign2" ];
+  };
+  by-spec."bindings-shyp"."~0.2.3" =
+    self.by-version."bindings-shyp"."0.2.3";
+  by-version."bindings-shyp"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "bindings-shyp-0.2.3";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bindings-shyp/-/bindings-shyp-0.2.3.tgz";
+        name = "bindings-shyp-0.2.3.tgz";
+        sha1 = "909151c14c701f350eb6be8ad14784ad79813671";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bindings-shyp" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "bindings-shyp" ];
+  };
+  by-spec."block-stream"."*" =
+    self.by-version."block-stream"."0.0.7";
+  by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+    name = "block-stream-0.0.7";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz";
+        name = "block-stream-0.0.7.tgz";
+        sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."block-stream" or []);
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "block-stream" ];
+  };
+  by-spec."boom"."0.4.x" =
+    self.by-version."boom"."0.4.2";
+  by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "boom-0.4.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
+        name = "boom-0.4.2.tgz";
+        sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."boom" or []);
+    deps = {
+      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "boom" ];
+  };
+  by-spec."buffer-equal"."~0.0.0" =
+    self.by-version."buffer-equal"."0.0.1";
+  by-version."buffer-equal"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "buffer-equal-0.0.1";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz";
+        name = "buffer-equal-0.0.1.tgz";
+        sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."buffer-equal" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "buffer-equal" ];
+  };
+  by-spec."bunker"."0.1.X" =
+    self.by-version."bunker"."0.1.2";
+  by-version."bunker"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "bunker-0.1.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz";
+        name = "bunker-0.1.2.tgz";
+        sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bunker" or []);
+    deps = {
+      "burrito-0.2.12" = self.by-version."burrito"."0.2.12";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "bunker" ];
+  };
+  by-spec."burrito".">=0.2.5 <0.3" =
+    self.by-version."burrito"."0.2.12";
+  by-version."burrito"."0.2.12" = lib.makeOverridable self.buildNodePackage {
+    name = "burrito-0.2.12";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz";
+        name = "burrito-0.2.12.tgz";
+        sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."burrito" or []);
+    deps = {
+      "traverse-0.5.2" = self.by-version."traverse"."0.5.2";
+      "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "burrito" ];
+  };
+  by-spec."charm"."0.1.x" =
+    self.by-version."charm"."0.1.2";
+  by-version."charm"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "charm-0.1.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz";
+        name = "charm-0.1.2.tgz";
+        sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."charm" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "charm" ];
+  };
+  by-spec."colony-compiler"."~0.6.21" =
+    self.by-version."colony-compiler"."0.6.23";
+  by-version."colony-compiler"."0.6.23" = lib.makeOverridable self.buildNodePackage {
+    name = "colony-compiler-0.6.23";
+    bin = true;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/colony-compiler/-/colony-compiler-0.6.23.tgz";
+        name = "colony-compiler-0.6.23.tgz";
+        sha1 = "0bef9e899e1ae928f6fe5e0dcca6cab4d47ab448";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."colony-compiler" or []);
+    deps = {
+      "colors-0.6.2" = self.by-version."colors"."0.6.2";
+      "optimist-0.5.2" = self.by-version."optimist"."0.5.2";
+      "nan-1.0.0" = self.by-version."nan"."1.0.0";
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "bindings-shyp-0.2.3" = self.by-version."bindings-shyp"."0.2.3";
+      # "colony-compiler-shyp-win32-ia32-0.6.17-1" = self.by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1";
+      # "colony-compiler-shyp-win32-x64-0.6.17-0" = self.by-version."colony-compiler-shyp-win32-x64"."0.6.17-0";
+      # "colony-compiler-shyp-darwin-x64-0.6.17-0" = self.by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "colony-compiler" ];
+  };
+  "colony-compiler" = self.by-version."colony-compiler"."0.6.23";
+  by-spec."colony-compiler-shyp-darwin-x64"."0.6.x" =
+    self.by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0";
+  by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0" = lib.makeOverridable self.buildNodePackage {
+    name = "colony-compiler-shyp-darwin-x64-0.6.17-0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/colony-compiler-shyp-darwin-x64/-/colony-compiler-shyp-darwin-x64-0.6.17-0.tgz";
+        name = "colony-compiler-shyp-darwin-x64-0.6.17-0.tgz";
+        sha1 = "33eedbee7ff8679fde69ba03bf27777110113732";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."colony-compiler-shyp-darwin-x64" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "colony-compiler-shyp-darwin-x64" ];
+  };
+  by-spec."colony-compiler-shyp-win32-ia32"."0.6.x" =
+    self.by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1";
+  by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1" = lib.makeOverridable self.buildNodePackage {
+    name = "colony-compiler-shyp-win32-ia32-0.6.17-1";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/colony-compiler-shyp-win32-ia32/-/colony-compiler-shyp-win32-ia32-0.6.17-1.tgz";
+        name = "colony-compiler-shyp-win32-ia32-0.6.17-1.tgz";
+        sha1 = "6e11a978be5df7be00112d2a349d5e34925f443a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."colony-compiler-shyp-win32-ia32" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "colony-compiler-shyp-win32-ia32" ];
+  };
+  by-spec."colony-compiler-shyp-win32-x64"."0.6.x" =
+    self.by-version."colony-compiler-shyp-win32-x64"."0.6.17-0";
+  by-version."colony-compiler-shyp-win32-x64"."0.6.17-0" = lib.makeOverridable self.buildNodePackage {
+    name = "colony-compiler-shyp-win32-x64-0.6.17-0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/colony-compiler-shyp-win32-x64/-/colony-compiler-shyp-win32-x64-0.6.17-0.tgz";
+        name = "colony-compiler-shyp-win32-x64-0.6.17-0.tgz";
+        sha1 = "cd30416df0ab52e49c74e81d69bd23329983d005";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."colony-compiler-shyp-win32-x64" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "colony-compiler-shyp-win32-x64" ];
+  };
+  by-spec."colors"."0.5.x" =
+    self.by-version."colors"."0.5.1";
+  by-version."colors"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "colors-0.5.1";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz";
+        name = "colors-0.5.1.tgz";
+        sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."colors" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "colors" ];
+  };
+  by-spec."colors"."~0.6.0-1" =
+    self.by-version."colors"."0.6.2";
+  by-version."colors"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+    name = "colors-0.6.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
+        name = "colors-0.6.2.tgz";
+        sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."colors" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "colors" ];
+  };
+  "colors" = self.by-version."colors"."0.6.2";
+  by-spec."colors"."~0.6.1" =
+    self.by-version."colors"."0.6.2";
+  by-spec."colorsafeconsole"."0.0.4" =
+    self.by-version."colorsafeconsole"."0.0.4";
+  by-version."colorsafeconsole"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "colorsafeconsole-0.0.4";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/colorsafeconsole/-/colorsafeconsole-0.0.4.tgz";
+        name = "colorsafeconsole-0.0.4.tgz";
+        sha1 = "dc10508bb000e51964fb485fd8557faa169effbe";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."colorsafeconsole" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "colorsafeconsole" ];
+  };
+  "colorsafeconsole" = self.by-version."colorsafeconsole"."0.0.4";
+  by-spec."combined-stream"."~0.0.4" =
+    self.by-version."combined-stream"."0.0.7";
+  by-version."combined-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+    name = "combined-stream-0.0.7";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
+        name = "combined-stream-0.0.7.tgz";
+        sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."combined-stream" or []);
+    deps = {
+      "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "combined-stream" ];
+  };
+  by-spec."cryptiles"."0.2.x" =
+    self.by-version."cryptiles"."0.2.2";
+  by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "cryptiles-0.2.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
+        name = "cryptiles-0.2.2.tgz";
+        sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cryptiles" or []);
+    deps = {
+      "boom-0.4.2" = self.by-version."boom"."0.4.2";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "cryptiles" ];
+  };
+  by-spec."ctype"."0.5.2" =
+    self.by-version."ctype"."0.5.2";
+  by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+    name = "ctype-0.5.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";
+        name = "ctype-0.5.2.tgz";
+        sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ctype" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "ctype" ];
+  };
+  by-spec."debug"."^0.8.1" =
+    self.by-version."debug"."0.8.1";
+  by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage {
+    name = "debug-0.8.1";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
+        name = "debug-0.8.1.tgz";
+        sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."debug" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "debug" ];
+  };
+  "debug" = self.by-version."debug"."0.8.1";
+  by-spec."deep-equal"."~0.0.0" =
+    self.by-version."deep-equal"."0.0.0";
+  by-version."deep-equal"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "deep-equal-0.0.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
+        name = "deep-equal-0.0.0.tgz";
+        sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deep-equal" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "deep-equal" ];
+  };
+  by-spec."deep-equal"."~0.2.0" =
+    self.by-version."deep-equal"."0.2.1";
+  by-version."deep-equal"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "deep-equal-0.2.1";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz";
+        name = "deep-equal-0.2.1.tgz";
+        sha1 = "fad7a793224cbf0c3c7786f92ef780e4fc8cc878";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deep-equal" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "deep-equal" ];
+  };
+  by-spec."deep-is"."0.1.x" =
+    self.by-version."deep-is"."0.1.3";
+  by-version."deep-is"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "deep-is-0.1.3";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
+        name = "deep-is-0.1.3.tgz";
+        sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deep-is" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "deep-is" ];
+  };
+  by-spec."defined"."~0.0.0" =
+    self.by-version."defined"."0.0.0";
+  by-version."defined"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "defined-0.0.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz";
+        name = "defined-0.0.0.tgz";
+        sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."defined" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "defined" ];
+  };
+  by-spec."delayed-stream"."0.0.5" =
+    self.by-version."delayed-stream"."0.0.5";
+  by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "delayed-stream-0.0.5";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+        name = "delayed-stream-0.0.5.tgz";
+        sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."delayed-stream" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "delayed-stream" ];
+  };
+  by-spec."difflet"."~0.2.0" =
+    self.by-version."difflet"."0.2.6";
+  by-version."difflet"."0.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "difflet-0.2.6";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz";
+        name = "difflet-0.2.6.tgz";
+        sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."difflet" or []);
+    deps = {
+      "traverse-0.6.6" = self.by-version."traverse"."0.6.6";
+      "charm-0.1.2" = self.by-version."charm"."0.1.2";
+      "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "difflet" ];
+  };
+  by-spec."effess"."~0.0.2" =
+    self.by-version."effess"."0.0.5";
+  by-version."effess"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "effess-0.0.5";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/effess/-/effess-0.0.5.tgz";
+        name = "effess-0.0.5.tgz";
+        sha1 = "d328fd03929c168c02a63d9d3d889657dc9499db";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."effess" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "effess" ];
+  };
+  by-spec."effess"."~0.0.5" =
+    self.by-version."effess"."0.0.5";
+  "effess" = self.by-version."effess"."0.0.5";
+  by-spec."forever-agent"."~0.5.0" =
+    self.by-version."forever-agent"."0.5.2";
+  by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+    name = "forever-agent-0.5.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
+        name = "forever-agent-0.5.2.tgz";
+        sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."forever-agent" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "forever-agent" ];
+  };
+  by-spec."form-data"."~0.1.0" =
+    self.by-version."form-data"."0.1.4";
+  by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "form-data-0.1.4";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
+        name = "form-data-0.1.4.tgz";
+        sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."form-data" or []);
+    deps = {
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "form-data" ];
+  };
+  by-spec."fstream"."~0.1.25" =
+    self.by-version."fstream"."0.1.31";
+  by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage {
+    name = "fstream-0.1.31";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
+        name = "fstream-0.1.31.tgz";
+        sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fstream" or []);
+    deps = {
+      "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "fstream" ];
+  };
+  "fstream" = self.by-version."fstream"."0.1.31";
+  by-spec."fstream"."~0.1.28" =
+    self.by-version."fstream"."0.1.31";
+  by-spec."glob"."~3.2.1" =
+    self.by-version."glob"."3.2.11";
+  by-version."glob"."3.2.11" = lib.makeOverridable self.buildNodePackage {
+    name = "glob-3.2.11";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
+        name = "glob-3.2.11.tgz";
+        sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob" or []);
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob" ];
+  };
+  by-spec."glob"."~3.2.9" =
+    self.by-version."glob"."3.2.11";
+  by-spec."graceful-fs"."~1" =
+    self.by-version."graceful-fs"."1.2.3";
+  by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "graceful-fs-1.2.3";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+        name = "graceful-fs-1.2.3.tgz";
+        sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."graceful-fs" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "graceful-fs" ];
+  };
+  by-spec."graceful-fs"."~3.0.2" =
+    self.by-version."graceful-fs"."3.0.4";
+  by-version."graceful-fs"."3.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "graceful-fs-3.0.4";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz";
+        name = "graceful-fs-3.0.4.tgz";
+        sha1 = "a0306d9b0940e0fc512d33b5df1014e88e0637a3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."graceful-fs" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "graceful-fs" ];
+  };
+  by-spec."hardware-resolve"."~0.1.3" =
+    self.by-version."hardware-resolve"."0.1.6";
+  by-version."hardware-resolve"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "hardware-resolve-0.1.6";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hardware-resolve/-/hardware-resolve-0.1.6.tgz";
+        name = "hardware-resolve-0.1.6.tgz";
+        sha1 = "b03f5077ab1b4b185ecd9486a3ba754f4b46e02a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hardware-resolve" or []);
+    deps = {
+      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+      "osenv-0.0.3" = self.by-version."osenv"."0.0.3";
+      "effess-0.0.5" = self.by-version."effess"."0.0.5";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "hardware-resolve" ];
+  };
+  "hardware-resolve" = self.by-version."hardware-resolve"."0.1.6";
+  by-spec."hawk"."~1.0.0" =
+    self.by-version."hawk"."1.0.0";
+  by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "hawk-1.0.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
+        name = "hawk-1.0.0.tgz";
+        sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hawk" or []);
+    deps = {
+      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+      "boom-0.4.2" = self.by-version."boom"."0.4.2";
+      "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
+      "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "hawk" ];
+  };
+  by-spec."hoek"."0.9.x" =
+    self.by-version."hoek"."0.9.1";
+  by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage {
+    name = "hoek-0.9.1";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
+        name = "hoek-0.9.1.tgz";
+        sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hoek" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "hoek" ];
+  };
+  by-spec."http-signature"."~0.10.0" =
+    self.by-version."http-signature"."0.10.0";
+  by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "http-signature-0.10.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz";
+        name = "http-signature-0.10.0.tgz";
+        sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."http-signature" or []);
+    deps = {
+      "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
+      "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
+      "ctype-0.5.2" = self.by-version."ctype"."0.5.2";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "http-signature" ];
+  };
+  by-spec."humanize"."0.0.9" =
+    self.by-version."humanize"."0.0.9";
+  by-version."humanize"."0.0.9" = lib.makeOverridable self.buildNodePackage {
+    name = "humanize-0.0.9";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz";
+        name = "humanize-0.0.9.tgz";
+        sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."humanize" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "humanize" ];
+  };
+  "humanize" = self.by-version."humanize"."0.0.9";
+  by-spec."inherits"."*" =
+    self.by-version."inherits"."2.0.1";
+  by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "inherits-2.0.1";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+        name = "inherits-2.0.1.tgz";
+        sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inherits" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "inherits" ];
+  };
+  by-spec."inherits"."2" =
+    self.by-version."inherits"."2.0.1";
+  by-spec."inherits"."~2.0.0" =
+    self.by-version."inherits"."2.0.1";
+  by-spec."inherits"."~2.0.1" =
+    self.by-version."inherits"."2.0.1";
+  by-spec."json-stringify-safe"."~5.0.0" =
+    self.by-version."json-stringify-safe"."5.0.0";
+  by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "json-stringify-safe-5.0.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
+        name = "json-stringify-safe-5.0.0.tgz";
+        sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."json-stringify-safe" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "json-stringify-safe" ];
+  };
+  by-spec."keypress"."~0.2.1" =
+    self.by-version."keypress"."0.2.1";
+  by-version."keypress"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "keypress-0.2.1";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz";
+        name = "keypress-0.2.1.tgz";
+        sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."keypress" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "keypress" ];
+  };
+  "keypress" = self.by-version."keypress"."0.2.1";
+  by-spec."lru-cache"."2" =
+    self.by-version."lru-cache"."2.5.0";
+  by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lru-cache-2.5.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz";
+        name = "lru-cache-2.5.0.tgz";
+        sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lru-cache" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "lru-cache" ];
+  };
+  by-spec."mime"."~1.2.11" =
+    self.by-version."mime"."1.2.11";
+  by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage {
+    name = "mime-1.2.11";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+        name = "mime-1.2.11.tgz";
+        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mime" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "mime" ];
+  };
+  by-spec."mime"."~1.2.9" =
+    self.by-version."mime"."1.2.11";
+  by-spec."minimatch"."0.3" =
+    self.by-version."minimatch"."0.3.0";
+  by-version."minimatch"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "minimatch-0.3.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
+        name = "minimatch-0.3.0.tgz";
+        sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch" or []);
+    deps = {
+      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+      "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
+  by-spec."minimatch"."~0.2.14" =
+    self.by-version."minimatch"."0.2.14";
+  by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage {
+    name = "minimatch-0.2.14";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
+        name = "minimatch-0.2.14.tgz";
+        sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch" or []);
+    deps = {
+      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+      "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
+  by-spec."minimist"."0.0.8" =
+    self.by-version."minimist"."0.0.8";
+  by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "minimist-0.0.8";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        name = "minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimist" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimist" ];
+  };
+  by-spec."mkdirp"."0.5" =
+    self.by-version."mkdirp"."0.5.0";
+  by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.5.0";
+    bin = true;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
+        name = "mkdirp-0.5.0.tgz";
+        sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp" or []);
+    deps = {
+      "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  by-spec."mkdirp"."~0.3 || 0.4 || 0.5" =
+    self.by-version."mkdirp"."0.5.0";
+  by-spec."mkdirp"."~0.3.5" =
+    self.by-version."mkdirp"."0.3.5";
+  by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.3.5";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        name = "mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  "mkdirp" = self.by-version."mkdirp"."0.3.5";
+  by-spec."mute-stream"."~0.0.4" =
+    self.by-version."mute-stream"."0.0.4";
+  by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "mute-stream-0.0.4";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz";
+        name = "mute-stream-0.0.4.tgz";
+        sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mute-stream" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "mute-stream" ];
+  };
+  by-spec."my-local-ip"."~1.0.0" =
+    self.by-version."my-local-ip"."1.0.0";
+  by-version."my-local-ip"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "my-local-ip-1.0.0";
+    bin = true;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/my-local-ip/-/my-local-ip-1.0.0.tgz";
+        name = "my-local-ip-1.0.0.tgz";
+        sha1 = "37585555a4ff1985309edac7c2a045a466be6c32";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."my-local-ip" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "my-local-ip" ];
+  };
+  "my-local-ip" = self.by-version."my-local-ip"."1.0.0";
+  by-spec."nan"."~1.0.0" =
+    self.by-version."nan"."1.0.0";
+  by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "nan-1.0.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
+        name = "nan-1.0.0.tgz";
+        sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nan" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "nan" ];
+  };
+  by-spec."node-uuid"."~1.4.0" =
+    self.by-version."node-uuid"."1.4.1";
+  by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-uuid-1.4.1";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz";
+        name = "node-uuid-1.4.1.tgz";
+        sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."node-uuid" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "node-uuid" ];
+  };
+  by-spec."nomnom"."~1.6.2" =
+    self.by-version."nomnom"."1.6.2";
+  by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage {
+    name = "nomnom-1.6.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz";
+        name = "nomnom-1.6.2.tgz";
+        sha1 = "84a66a260174408fc5b77a18f888eccc44fb6971";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nomnom" or []);
+    deps = {
+      "colors-0.5.1" = self.by-version."colors"."0.5.1";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "nomnom" ];
+  };
+  "nomnom" = self.by-version."nomnom"."1.6.2";
+  by-spec."nopt"."~2" =
+    self.by-version."nopt"."2.2.1";
+  by-version."nopt"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-2.2.1";
+    bin = true;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
+        name = "nopt-2.2.1.tgz";
+        sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nopt" or []);
+    deps = {
+      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "nopt" ];
+  };
+  by-spec."oauth-sign"."~0.3.0" =
+    self.by-version."oauth-sign"."0.3.0";
+  by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "oauth-sign-0.3.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
+        name = "oauth-sign-0.3.0.tgz";
+        sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."oauth-sign" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "oauth-sign" ];
+  };
+  by-spec."object-inspect"."~0.4.0" =
+    self.by-version."object-inspect"."0.4.0";
+  by-version."object-inspect"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "object-inspect-0.4.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz";
+        name = "object-inspect-0.4.0.tgz";
+        sha1 = "f5157c116c1455b243b06ee97703392c5ad89fec";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."object-inspect" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "object-inspect" ];
+  };
+  by-spec."optimist"."~0.5.2" =
+    self.by-version."optimist"."0.5.2";
+  by-version."optimist"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+    name = "optimist-0.5.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.5.2.tgz";
+        name = "optimist-0.5.2.tgz";
+        sha1 = "85c8c1454b3315e4a78947e857b1df033450bfbc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optimist" or []);
+    deps = {
+      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "optimist" ];
+  };
+  by-spec."osenv"."0.0.3" =
+    self.by-version."osenv"."0.0.3";
+  by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "osenv-0.0.3";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
+        name = "osenv-0.0.3.tgz";
+        sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."osenv" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "osenv" ];
+  };
+  by-spec."punycode".">=0.2.0" =
+    self.by-version."punycode"."1.3.2";
+  by-version."punycode"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "punycode-1.3.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
+        name = "punycode-1.3.2.tgz";
+        sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."punycode" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "punycode" ];
+  };
+  by-spec."qs"."~0.6.0" =
+    self.by-version."qs"."0.6.6";
+  by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage {
+    name = "qs-0.6.6";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
+        name = "qs-0.6.6.tgz";
+        sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."qs" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "qs" ];
+  };
+  by-spec."read"."^1.0.5" =
+    self.by-version."read"."1.0.5";
+  by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "read-1.0.5";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
+        name = "read-1.0.5.tgz";
+        sha1 = "007a3d169478aa710a491727e453effb92e76203";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."read" or []);
+    deps = {
+      "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "read" ];
+  };
+  "read" = self.by-version."read"."1.0.5";
+  by-spec."request"."~2.33.0" =
+    self.by-version."request"."2.33.0";
+  by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.33.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz";
+        name = "request-2.33.0.tgz";
+        sha1 = "5167878131726070ec633752ea230a2379dc65ff";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request" or []);
+    deps = {
+      "qs-0.6.6" = self.by-version."qs"."0.6.6";
+      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+      "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+      "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
+      "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0";
+      "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
+      "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
+  "request" = self.by-version."request"."2.33.0";
+  by-spec."resumer"."~0.0.0" =
+    self.by-version."resumer"."0.0.0";
+  by-version."resumer"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "resumer-0.0.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz";
+        name = "resumer-0.0.0.tgz";
+        sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."resumer" or []);
+    deps = {
+      "through-2.3.6" = self.by-version."through"."2.3.6";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "resumer" ];
+  };
+  by-spec."rimraf"."2" =
+    self.by-version."rimraf"."2.2.8";
+  by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-2.2.8";
+    bin = true;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+        name = "rimraf-2.2.8.tgz";
+        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rimraf" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "rimraf" ];
+  };
+  by-spec."rimraf"."~2.1.4" =
+    self.by-version."rimraf"."2.1.4";
+  by-version."rimraf"."2.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-2.1.4";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
+        name = "rimraf-2.1.4.tgz";
+        sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rimraf" or []);
+    deps = {
+      "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "rimraf" ];
+  };
+  by-spec."runforcover"."~0.0.2" =
+    self.by-version."runforcover"."0.0.2";
+  by-version."runforcover"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "runforcover-0.0.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz";
+        name = "runforcover-0.0.2.tgz";
+        sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."runforcover" or []);
+    deps = {
+      "bunker-0.1.2" = self.by-version."bunker"."0.1.2";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "runforcover" ];
+  };
+  by-spec."semver"."^2.3.0" =
+    self.by-version."semver"."2.3.2";
+  by-version."semver"."2.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.3.2";
+    bin = true;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz";
+        name = "semver-2.3.2.tgz";
+        sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  "semver" = self.by-version."semver"."2.3.2";
+  by-spec."sigmund"."~1.0.0" =
+    self.by-version."sigmund"."1.0.0";
+  by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "sigmund-1.0.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz";
+        name = "sigmund-1.0.0.tgz";
+        sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sigmund" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "sigmund" ];
+  };
+  by-spec."slide"."*" =
+    self.by-version."slide"."1.1.6";
+  by-version."slide"."1.1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "slide-1.1.6";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
+        name = "slide-1.1.6.tgz";
+        sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."slide" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "slide" ];
+  };
+  by-spec."sntp"."0.2.x" =
+    self.by-version."sntp"."0.2.4";
+  by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "sntp-0.2.4";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
+        name = "sntp-0.2.4.tgz";
+        sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sntp" or []);
+    deps = {
+      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "sntp" ];
+  };
+  by-spec."structured-clone"."~0.2.2" =
+    self.by-version."structured-clone"."0.2.2";
+  by-version."structured-clone"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "structured-clone-0.2.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/structured-clone/-/structured-clone-0.2.2.tgz";
+        name = "structured-clone-0.2.2.tgz";
+        sha1 = "ac92b6be31958a643db30f1335abc6a1b02dfdc2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."structured-clone" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "structured-clone" ];
+  };
+  "structured-clone" = self.by-version."structured-clone"."0.2.2";
+  by-spec."tap"."~0.4.8" =
+    self.by-version."tap"."0.4.13";
+  by-version."tap"."0.4.13" = lib.makeOverridable self.buildNodePackage {
+    name = "tap-0.4.13";
+    bin = true;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tap/-/tap-0.4.13.tgz";
+        name = "tap-0.4.13.tgz";
+        sha1 = "3986134d6759727fc2223e61126eeb87243accbc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tap" or []);
+    deps = {
+      "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
+      "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0";
+      "difflet-0.2.6" = self.by-version."difflet"."0.2.6";
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
+      "runforcover-0.0.2" = self.by-version."runforcover"."0.0.2";
+      "slide-1.1.6" = self.by-version."slide"."1.1.6";
+      "yamlish-0.0.6" = self.by-version."yamlish"."0.0.6";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "tap" ];
+  };
+  "tap" = self.by-version."tap"."0.4.13";
+  by-spec."tape"."~2.12.3" =
+    self.by-version."tape"."2.12.3";
+  by-version."tape"."2.12.3" = lib.makeOverridable self.buildNodePackage {
+    name = "tape-2.12.3";
+    bin = true;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tape/-/tape-2.12.3.tgz";
+        name = "tape-2.12.3.tgz";
+        sha1 = "5559d5454050292627537c012991ec6971f66156";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tape" or []);
+    deps = {
+      "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1";
+      "defined-0.0.0" = self.by-version."defined"."0.0.0";
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "object-inspect-0.4.0" = self.by-version."object-inspect"."0.4.0";
+      "resumer-0.0.0" = self.by-version."resumer"."0.0.0";
+      "through-2.3.6" = self.by-version."through"."2.3.6";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "tape" ];
+  };
+  "tape" = self.by-version."tape"."2.12.3";
+  by-spec."tar"."~0.1.18" =
+    self.by-version."tar"."0.1.20";
+  by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage {
+    name = "tar-0.1.20";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
+        name = "tar-0.1.20.tgz";
+        sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tar" or []);
+    deps = {
+      "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
+      "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "tar" ];
+  };
+  "tar" = self.by-version."tar"."0.1.20";
+  by-spec."temp"."~0.6.0" =
+    self.by-version."temp"."0.6.0";
+  by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "temp-0.6.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz";
+        name = "temp-0.6.0.tgz";
+        sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."temp" or []);
+    deps = {
+      "rimraf-2.1.4" = self.by-version."rimraf"."2.1.4";
+      "osenv-0.0.3" = self.by-version."osenv"."0.0.3";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "temp" ];
+  };
+  "temp" = self.by-version."temp"."0.6.0";
+  by-spec."through"."~2.3.4" =
+    self.by-version."through"."2.3.6";
+  by-version."through"."2.3.6" = lib.makeOverridable self.buildNodePackage {
+    name = "through-2.3.6";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/through/-/through-2.3.6.tgz";
+        name = "through-2.3.6.tgz";
+        sha1 = "26681c0f524671021d4e29df7c36bce2d0ecf2e8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."through" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "through" ];
+  };
+  by-spec."tough-cookie".">=0.12.0" =
+    self.by-version."tough-cookie"."0.12.1";
+  by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage {
+    name = "tough-cookie-0.12.1";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz";
+        name = "tough-cookie-0.12.1.tgz";
+        sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tough-cookie" or []);
+    deps = {
+      "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "tough-cookie" ];
+  };
+  by-spec."traverse"."0.6.x" =
+    self.by-version."traverse"."0.6.6";
+  by-version."traverse"."0.6.6" = lib.makeOverridable self.buildNodePackage {
+    name = "traverse-0.6.6";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz";
+        name = "traverse-0.6.6.tgz";
+        sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."traverse" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "traverse" ];
+  };
+  by-spec."traverse"."~0.5.1" =
+    self.by-version."traverse"."0.5.2";
+  by-version."traverse"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+    name = "traverse-0.5.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz";
+        name = "traverse-0.5.2.tgz";
+        sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."traverse" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "traverse" ];
+  };
+  by-spec."tunnel-agent"."~0.3.0" =
+    self.by-version."tunnel-agent"."0.3.0";
+  by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "tunnel-agent-0.3.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
+        name = "tunnel-agent-0.3.0.tgz";
+        sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tunnel-agent" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "tunnel-agent" ];
+  };
+  by-spec."uglify-js"."~1.1.1" =
+    self.by-version."uglify-js"."1.1.1";
+  by-version."uglify-js"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-1.1.1";
+    bin = true;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz";
+        name = "uglify-js-1.1.1.tgz";
+        sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."uglify-js" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "uglify-js" ];
+  };
+  by-spec."underscore"."~1.4.4" =
+    self.by-version."underscore"."1.4.4";
+  by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "underscore-1.4.4";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+        name = "underscore-1.4.4.tgz";
+        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."underscore" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "underscore" ];
+  };
+  by-spec."usb"."~0.3.11" =
+    self.by-version."usb"."0.3.11";
+  by-version."usb"."0.3.11" = lib.makeOverridable self.buildNodePackage {
+    name = "usb-0.3.11";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/usb/-/usb-0.3.11.tgz";
+        name = "usb-0.3.11.tgz";
+        sha1 = "ee61d114181fd1de8738053920cde069d0aa428e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."usb" or []);
+    deps = {
+      "bindings-shyp-0.2.3" = self.by-version."bindings-shyp"."0.2.3";
+      # "usb-shyp-win32-x64-0.3.11-0" = self.by-version."usb-shyp-win32-x64"."0.3.11-0";
+      # "usb-shyp-win32-ia32-0.3.11-0" = self.by-version."usb-shyp-win32-ia32"."0.3.11-0";
+      # "usb-shyp-darwin-x64-0.3.11-0" = self.by-version."usb-shyp-darwin-x64"."0.3.11-0";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "usb" ];
+  };
+  "usb" = self.by-version."usb"."0.3.11";
+  by-spec."usb-shyp-darwin-x64"."0.3.x" =
+    self.by-version."usb-shyp-darwin-x64"."0.3.11-0";
+  by-version."usb-shyp-darwin-x64"."0.3.11-0" = lib.makeOverridable self.buildNodePackage {
+    name = "usb-shyp-darwin-x64-0.3.11-0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/usb-shyp-darwin-x64/-/usb-shyp-darwin-x64-0.3.11-0.tgz";
+        name = "usb-shyp-darwin-x64-0.3.11-0.tgz";
+        sha1 = "8e6c98e5dff676576dac02c8a0465f1eae833285";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."usb-shyp-darwin-x64" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "usb-shyp-darwin-x64" ];
+  };
+  by-spec."usb-shyp-win32-ia32"."0.3.x" =
+    self.by-version."usb-shyp-win32-ia32"."0.3.11-0";
+  by-version."usb-shyp-win32-ia32"."0.3.11-0" = lib.makeOverridable self.buildNodePackage {
+    name = "usb-shyp-win32-ia32-0.3.11-0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/usb-shyp-win32-ia32/-/usb-shyp-win32-ia32-0.3.11-0.tgz";
+        name = "usb-shyp-win32-ia32-0.3.11-0.tgz";
+        sha1 = "365babb7f648cb8aff12f70c65445e1b0958bbbb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."usb-shyp-win32-ia32" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "usb-shyp-win32-ia32" ];
+  };
+  by-spec."usb-shyp-win32-x64"."0.3.x" =
+    self.by-version."usb-shyp-win32-x64"."0.3.11-0";
+  by-version."usb-shyp-win32-x64"."0.3.11-0" = lib.makeOverridable self.buildNodePackage {
+    name = "usb-shyp-win32-x64-0.3.11-0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/usb-shyp-win32-x64/-/usb-shyp-win32-x64-0.3.11-0.tgz";
+        name = "usb-shyp-win32-x64-0.3.11-0.tgz";
+        sha1 = "561417f00ab33c9d990a56e3a4ee446a21a3fcbe";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."usb-shyp-win32-x64" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "usb-shyp-win32-x64" ];
+  };
+  by-spec."wordwrap"."~0.0.2" =
+    self.by-version."wordwrap"."0.0.2";
+  by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "wordwrap-0.0.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+        name = "wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."wordwrap" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "wordwrap" ];
+  };
+  by-spec."yamlish"."*" =
+    self.by-version."yamlish"."0.0.6";
+  by-version."yamlish"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "yamlish-0.0.6";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.6.tgz";
+        name = "yamlish-0.0.6.tgz";
+        sha1 = "c5df8f7661731351e39eb52223f83a46659452e3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."yamlish" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "yamlish" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa63fdcd477fb..8151d6a70f7e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2437,6 +2437,8 @@ let
 
   telnet = callPackage ../tools/networking/telnet { };
 
+  tessel = callPackage ../applications/misc/tessel { };
+
   texmacs = callPackage ../applications/editors/texmacs {
     tex = texLive; /* tetex is also an option */
     extraFonts = true;
-- 
cgit 1.4.1


From 9ad81702f7337716b8fcdee6eb12d9586360b29f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 4 Nov 2014 20:41:28 +0000
Subject: scribus: update from 1.4.3 to 1.4.4

---
 pkgs/applications/office/scribus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index fb7a41d624660..d0d6fd136efd9 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -3,11 +3,11 @@
 , zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "scribus-1.4.3";
+  name = "scribus-1.4.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz";
-    sha256 = "1zxgl2g299rllfy5ihs5skicpv7zcmz149ahraami69gqcag6bn7";
+    sha256 = "1bhp09x8rgdhyq8b516226nn0p7pxd2arkfkf2vvvklca5arsfx4";
   };
 
   enableParallelBuilding = true;
-- 
cgit 1.4.1


From fa09f72162a80d803e7dae6c14ca7d319a37d4e3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 5 Nov 2014 08:32:27 +0000
Subject: ccache: update from 3.1.9 to 3.1.10

---
 pkgs/development/tools/misc/ccache/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 3dd634274f3ee..56f8cefe07ca8 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -3,10 +3,10 @@
 let
   ccache =
 stdenv.mkDerivation {
-  name = "ccache-3.1.9";
+  name = "ccache-3.1.10";
   src = fetchurl {
-    url = http://samba.org/ftp/ccache/ccache-3.1.9.tar.gz;
-    sha256 = "0ixlxqv1xyacwgg0k9b4a6by07c7k75y0xbr8dp76jvyada0c9x2";
+    url = http://samba.org/ftp/ccache/ccache-3.1.10.tar.gz;
+    sha256 = "0fzxa45q7wfm63zrak65wh31w7pnsp0k65fxv00cgmf454as4dza";
   };
 
   buildInputs = [ zlib ];
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Compiler cache for fast recompilation of C/C++ code";
     homepage = http://ccache.samba.org/;
-    license = "GPL";
+    license = stdenv.lib.licenses.gpl3Plus;
   };
 };
 in
-- 
cgit 1.4.1


From 007f80c1d0440b89970000b92f78ce76186d99a5 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 6 Nov 2014 00:44:33 +0000
Subject: Turn more licenses into lib.licenses style

Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
---
 lib/licenses.nix                                   |  73 +-
 pkgs/applications/audio/gpodder/default.nix        |   2 +-
 pkgs/applications/audio/mp3splt/default.nix        |   2 +-
 pkgs/applications/audio/vimpc/default.nix          |   2 +-
 pkgs/applications/editors/elvis/default.nix        |   2 +-
 .../editors/emacs-modes/proofgeneral/4.3pre.nix    |   2 +-
 pkgs/applications/editors/mg/default.nix           |   2 +-
 pkgs/applications/editors/nvi/default.nix          |   2 +-
 pkgs/applications/graphics/cinepaint/default.nix   |   2 +-
 pkgs/applications/graphics/gimp/2.8.nix            |   2 +-
 .../applications/graphics/gimp/plugins/default.nix |   8 +-
 pkgs/applications/graphics/paraview/default.nix    |   3 +-
 pkgs/applications/misc/d4x/default.nix             |   6 +-
 pkgs/applications/misc/vue/default.nix             |  15 +-
 pkgs/applications/misc/xfontsel/default.nix        |   2 +-
 pkgs/applications/misc/xlsfonts/default.nix        |   2 +-
 .../networking/browsers/netsurf/haru.nix           |   4 +-
 .../networking/browsers/opera/default.nix          |   2 +-
 .../applications/networking/cluster/rq/default.nix |   2 +-
 .../networking/remote/freerdp/default.nix          |   2 +-
 pkgs/applications/science/logic/cvc3/default.nix   |  11 +-
 pkgs/applications/science/logic/ott/default.nix    |   2 +-
 .../science/logic/satallax/default.nix             |  13 +-
 pkgs/applications/science/logic/twelf/default.nix  |   2 +-
 pkgs/applications/science/misc/fityk/default.nix   |   2 +-
 pkgs/applications/science/misc/vite/default.nix    |   2 +-
 .../git-and-tools/fast-export/default.nix          |   4 +-
 pkgs/applications/video/quvi/library.nix           |   7 +-
 pkgs/applications/video/quvi/scripts.nix           |   7 +-
 pkgs/applications/video/xbmc/default.nix           |   2 +-
 .../window-managers/larswm/default.nix             |   2 +-
 pkgs/data/fonts/aurulent-sans/default.nix          |   2 +-
 pkgs/data/fonts/opensans-ttf/default.nix           |   2 +-
 pkgs/data/fonts/redhat-liberation-fonts/binary.nix |   4 +-
 .../data/fonts/redhat-liberation-fonts/default.nix |   4 +-
 pkgs/data/fonts/source-code-pro/default.nix        |   2 +-
 pkgs/data/fonts/ubuntu-font-family/default.nix     |   2 +-
 .../mobile-broadband-provider-info/default.nix     |   2 +-
 pkgs/data/misc/poppler-data/default.nix            |   2 +-
 pkgs/development/compilers/cmucl/binary.nix        |   2 +-
 .../compilers/emscripten-fastcomp/default.nix      |   2 +-
 pkgs/development/compilers/iasl/default.nix        |   2 +-
 pkgs/development/compilers/mono/default.nix        |   2 +-
 pkgs/development/compilers/ocaml/3.10.0.nix        |   8 +-
 .../development/compilers/ocaml/metaocaml-3.09.nix |   8 +-
 pkgs/development/compilers/yap/default.nix         |   2 +-
 pkgs/development/eclipse/ecj/default.nix           |   2 +-
 pkgs/development/interpreters/jruby/default.nix    |   2 +-
 pkgs/development/interpreters/kona/default.nix     |  11 +-
 pkgs/development/interpreters/php/5.4.nix          |   8 +-
 pkgs/development/interpreters/ruby/ruby-1.8.7.nix  |   2 +-
 pkgs/development/interpreters/ruby/ruby-2.0.0.nix  |   2 +-
 pkgs/development/interpreters/ruby/ruby-2.1.0.nix  |   2 +-
 pkgs/development/interpreters/ruby/ruby-2.1.1.nix  |   2 +-
 pkgs/development/interpreters/ruby/ruby-2.1.2.nix  |   2 +-
 pkgs/development/interpreters/ruby/ruby-2.1.3.nix  |   2 +-
 pkgs/development/libraries/allegro/5-unstable.nix  |   3 +-
 pkgs/development/libraries/allegro/5.nix           |   3 +-
 pkgs/development/libraries/allegro/default.nix     |   3 +-
 pkgs/development/libraries/asio/default.nix        |   4 +-
 pkgs/development/libraries/boost/generic.nix       |   2 +-
 pkgs/development/libraries/celt/0.5.1.nix          |   2 +-
 pkgs/development/libraries/celt/0.7.nix            |  11 +-
 pkgs/development/libraries/celt/default.nix        |  11 +-
 pkgs/development/libraries/cppnetlib/default.nix   |   2 +-
 pkgs/development/libraries/crypto++/default.nix    |   2 +-
 pkgs/development/libraries/dbus-glib/default.nix   |   2 +-
 pkgs/development/libraries/faac/default.nix        |   2 +-
 pkgs/development/libraries/flite/default.nix       |   3 +-
 pkgs/development/libraries/gsm/default.nix         |  11 +-
 .../libraries/java/classpath/default.nix           |   2 +-
 pkgs/development/libraries/leptonica/default.nix   |   2 +-
 pkgs/development/libraries/libcaca/default.nix     |   8 +-
 pkgs/development/libraries/libcec/default.nix      |   2 +-
 pkgs/development/libraries/libffi/default.nix      |   3 +-
 pkgs/development/libraries/libharu/default.nix     |   2 +-
 .../libraries/libixp_for_wmii/default.nix          |   2 +-
 .../libraries/libjpeg-turbo/default.nix            |   2 +-
 pkgs/development/libraries/libjpeg/default.nix     |   8 +-
 pkgs/development/libraries/libmng/default.nix      |   2 +-
 .../libraries/libopensc-dnie/default.nix           |   2 +-
 pkgs/development/libraries/librdf/raptor.nix       |   4 +-
 pkgs/development/libraries/librdf/raptor2.nix      |   2 +-
 pkgs/development/libraries/librdf/rasqal.nix       |   2 +-
 pkgs/development/libraries/libsodium/default.nix   |   2 +-
 pkgs/development/libraries/libwebp/default.nix     |   2 +-
 pkgs/development/libraries/mesa-glu/default.nix    |   2 +-
 .../libraries/nvidia-texture-tools/default.nix     |   2 +-
 pkgs/development/libraries/physfs/default.nix      |   2 +-
 .../development/libraries/pocketsphinx/default.nix |   2 +-
 pkgs/development/libraries/qhull/default.nix       |   2 +-
 pkgs/development/libraries/qwt/6.nix               |   2 +-
 pkgs/development/libraries/qwt/default.nix         |   2 +-
 .../libraries/science/math/blas/default.nix        |   2 +-
 pkgs/development/libraries/scmccid/default.nix     |   4 +-
 pkgs/development/libraries/slib/default.nix        |   2 +-
 .../development/libraries/speech-tools/default.nix |  11 +-
 pkgs/development/libraries/stlport/default.nix     |   2 +-
 pkgs/development/libraries/tinyxml/2.6.2.nix       |  24 +-
 pkgs/development/libraries/vrpn/default.nix        |   2 +-
 pkgs/development/ocaml-modules/dypgen/default.nix  |   2 +-
 .../ocaml-modules/ocamlgraph/default.nix           |   2 +-
 .../development/ocaml-modules/ocamlnat/default.nix |   2 +-
 .../ocaml-modules/ocsigen-deriving/default.nix     |   4 +-
 .../perl-modules/Compress-Raw-Zlib/default.nix     |   2 +-
 pkgs/development/perl-modules/DBD-Pg/default.nix   |   2 +-
 .../python-modules/mygpoclient/default.nix         |   2 +-
 pkgs/development/tools/analysis/smatch/default.nix |   2 +-
 pkgs/development/tools/analysis/spin/default.nix   |   2 +-
 pkgs/development/tools/boost-build/default.nix     |   2 +-
 .../tools/build-managers/bam/default.nix           |  11 +-
 .../tools/build-managers/jam/default.nix           |   2 +-
 .../tools/build-managers/leiningen/default.nix     |   2 +-
 pkgs/development/tools/cdecl/default.nix           |   2 +-
 pkgs/development/tools/misc/cproto/default.nix     |   4 +-
 pkgs/development/tools/parsing/byacc/default.nix   |   4 +-
 pkgs/development/tools/quilt/default.nix           |   2 +-
 pkgs/games/blackshades/default.nix                 |   2 +-
 pkgs/games/bsdgames/default.nix                    |   2 +-
 pkgs/games/d1x-rebirth/default.nix                 |   2 +-
 pkgs/games/d2x-rebirth/default.nix                 |   2 +-
 pkgs/games/dwarf-fortress/default.nix              |   2 +-
 pkgs/games/dwarf-fortress/df2014.nix               |   2 +-
 pkgs/games/eduke32/default.nix                     |  28 +-
 pkgs/games/hexen/default.nix                       |   2 +-
 pkgs/games/minecraft/default.nix                   |   2 +-
 pkgs/games/simutrans/default.nix                   |   2 +-
 pkgs/games/soi/default.nix                         |  12 +-
 pkgs/games/zangband/default.nix                    |  14 +-
 pkgs/misc/emulators/darcnes/default.nix            |   4 +-
 .../retroarch/xbmc-advanced-launchers.nix          |   2 +-
 pkgs/os-specific/linux/broadcom-sta/default.nix    |   2 +-
 .../linux/firmware/b43-firmware-cutter/default.nix |   3 +-
 .../linux/firmware/raspberrypi/default.nix         |   4 +-
 pkgs/os-specific/linux/sdparm/default.nix          |   2 +-
 pkgs/os-specific/linux/sysfsutils/default.nix      |   2 +-
 pkgs/os-specific/linux/udisks-glue/default.nix     |   2 +-
 pkgs/os-specific/linux/v4l-utils/default.nix       |   2 +-
 pkgs/servers/brickd/default.nix                    |   6 +-
 pkgs/servers/computing/storm/default.nix           |   2 +-
 pkgs/servers/http/joseki/default.nix               |  17 +-
 pkgs/servers/sip/freeswitch/default.nix            |   2 +-
 pkgs/servers/x11/xorg/unichrome/default.nix        |   2 +-
 pkgs/servers/xinetd/default.nix                    |   2 +-
 pkgs/tools/X11/virtualgl/default.nix               |   2 +-
 pkgs/tools/X11/xdg-utils/default.nix               |   6 +-
 pkgs/tools/admin/sec/default.nix                   |   2 +-
 pkgs/tools/archivers/unarj/default.nix             |   4 +-
 pkgs/tools/archivers/unzip/default.nix             |   4 +-
 pkgs/tools/compression/ncompress/default.nix       |   2 +-
 pkgs/tools/compression/zsync/default.nix           |   2 +-
 pkgs/tools/graphics/dcraw/default.nix              |   2 +-
 pkgs/tools/graphics/exiftags/default.nix           |   2 +-
 pkgs/tools/graphics/jhead/default.nix              |   2 +-
 pkgs/tools/graphics/pngcrush/default.nix           |   2 +-
 pkgs/tools/graphics/povray/default.nix             |   4 +-
 pkgs/tools/graphics/welkin/default.nix             |  11 +-
 pkgs/tools/misc/aws-mturk-clt/default.nix          |   4 +-
 pkgs/tools/misc/fasd/default.nix                   |   2 +-
 pkgs/tools/misc/figlet/default.nix                 |   4 +-
 pkgs/tools/misc/flashrom/default.nix               |   2 +-
 pkgs/tools/misc/i3minator/default.nix              |   2 +-
 pkgs/tools/misc/jdiskreport/default.nix            |   2 +-
 pkgs/tools/misc/mysql2pgsql/default.nix            |   4 +-
 pkgs/tools/misc/pk2cmd/default.nix                 |   2 +-
 pkgs/tools/misc/pv/default.nix                     |   2 +-
 pkgs/tools/misc/w3c-css-validator/default.nix      |   4 +-
 pkgs/tools/misc/xdaliclock/default.nix             |  10 +-
 pkgs/tools/networking/iodine/default.nix           |   2 +-
 pkgs/tools/networking/netboot/default.nix          |   4 +-
 pkgs/tools/networking/netkit/tftp/default.nix      |   2 +-
 pkgs/tools/networking/nylon/default.nix            |   2 +-
 pkgs/tools/networking/openssh/default.nix          |   2 +-
 pkgs/tools/networking/s3sync/default.nix           |   4 +-
 pkgs/tools/networking/stun/default.nix             |   2 +-
 pkgs/tools/security/volatility/default.nix         |   2 +-
 pkgs/tools/system/sleuthkit/default.nix            |   2 +-
 pkgs/tools/text/wgetpaste/default.nix              |   2 +-
 pkgs/tools/text/xml/html-xml-utils/default.nix     |   2 +-
 pkgs/tools/typesetting/biber/default.nix           |   2 +-
 pkgs/tools/typesetting/pdfgrep/default.nix         |   2 +-
 pkgs/tools/typesetting/tex/disser/default.nix      |  11 +-
 pkgs/tools/typesetting/tex/tex4ht/default.nix      |   2 +-
 .../tools/virtualization/ec2-api-tools/default.nix |   2 +-
 pkgs/top-level/perl-packages.nix                   | 816 ++++++++++-----------
 pkgs/top-level/python-packages-generated.nix       |  24 +-
 pkgs/top-level/python-packages.nix                 |  42 +-
 187 files changed, 835 insertions(+), 791 deletions(-)

(limited to 'pkgs')

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 46fa783b4bdd8..75a8149b7b92d 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -14,6 +14,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
    * add it to this list. The URL mentioned above is a good source for inspiration.
    */
 
+  afl21 = spdx {
+    spdxId = "AFL-2.1";
+    fullName = "Academic Free License";
+  };
+
   agpl3 = spdx {
     spdxId = "AGPL-3.0";
     fullName = "GNU Affero General Public License v3.0";
@@ -40,6 +45,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "Apple Public Source License 2.0";
   };
 
+  artistic1 = spdx {
+    spdxId = "Artistic-1.0";
+    fullName = "Artistic License 1.0";
+  };
+
   artistic2 = spdx {
     spdxId = "Artistic-2.0";
     fullName = "Artistic License 2.0";
@@ -72,7 +82,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
 
   cc0 = spdx {
     spdxId = "CC0-1.0";
-    fullName = ''Creative Commons Zero v1.0 Universal'';
+    fullName = "Creative Commons Zero v1.0 Universal";
   };
 
   cc-by-30 = spdx {
@@ -124,11 +134,21 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "Unspecified free software license";
   };
 
+  gpl1Plus = spdx {
+    spdxId = "GPL-1.0+";
+    fullName = "GNU General Public License v1.0 or later";
+  };
+
   gpl2 = spdx {
     spdxId = "GPL-2.0";
     fullName = "GNU General Public License v2.0 only";
   };
 
+  gpl2ClasspathPlus = {
+    fullName = "GNU General Public License v2.0 or later (with Classpath exception)";
+    url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
+  };
+
   gpl2Oss = {
     fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)";
     url = http://www.mysql.com/about/legal/licensing/foss-exception;
@@ -154,6 +174,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
   };
 
+  # Intel's license, seems free
+  iasl = {
+    fullName = "iASL";
+    url = http://www.calculate-linux.org/packages/licenses/iASL;
+  };
+
   inria = {
     fullName  = "INRIA Non-Commercial License Agreement";
     url       = "http://compcert.inria.fr/doc/LICENSE";
@@ -219,6 +245,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     url = http://opensource.franz.com/preamble.html;
   };
 
+  lppl12 = spdx {
+    spdxId = "LPPL-1.2";
+    fullName = "LaTeX Project Public License v1.2";
+  };
+
   lpl-102 = spdx {
     spdxId = "LPL-1.02";
     fullName = "Lucent Public License v1.02";
@@ -261,6 +292,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "OpenSSL License";
   };
 
+  php301 = spdx {
+    spdxId = "PHP-3.01";
+    fullName = "PHP License v3.01";
+  };
+
   postgresql = spdx {
     spdxId = "PostgreSQL";
     fullName = "PostgreSQL License";
@@ -276,6 +312,26 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "Public Domain";
   };
 
+  qpl = spdx {
+    spdxId = "QPL-1.0";
+    fullName = "Q Public License 1.0";
+  };
+
+  qwt = {
+    fullName = "Qwt License, Version 1.0";
+    url = http://qwt.sourceforge.net/qwtlicense.html;
+  };
+
+  ruby = spdx {
+    spdxId = "Ruby";
+    fullName = "Ruby License";
+  };
+
+  sgi-b-20 = spdx {
+    spdxId = "SGI-B-2.0";
+    fullName = "SGI Free Software License B v2.0";
+  };
+
   sleepycat = spdx {
     spdxId = "Sleepycat";
     fullName = "Sleepycat License";
@@ -307,11 +363,26 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "The Unlicense";
   };
 
+  vsl10 = spdx {
+    spdxId = "VSL-1.0";
+    fullName = "Vovida Software License v1.0";
+  };
+
+  w3c = spdx {
+    spdxId = "W3C";
+    fullName = "W3C Software Notice and License";
+  };
+
   wadalab = {
     fullName = "Wadalab Font License";
     url = https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab;
   };
 
+  wtfpl = spdx {
+    spdxId = "WTFPL";
+    fullName = "Do What The F*ck You Want To Public License";
+  };
+
   zlib = spdx {
     spdxId = "Zlib";
     fullName = "zlib License";
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index de5ef0551254c..ebe847353dd9a 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -66,7 +66,7 @@ in buildPythonPackage rec {
       for you. Listen directly on your computer or on your mobile devices.
     '';
     homepage = "http://gpodder.org/";
-    license = "GPLv3";
+    license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.skeidel ];
   };
diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix
index b1970a998d507..08d91498cc0a1 100644
--- a/pkgs/applications/audio/mp3splt/default.nix
+++ b/pkgs/applications/audio/mp3splt/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "utility to split mp3, ogg vorbis and FLAC files without decoding";
     homepage = http://sourceforge.net/projects/mp3splt/;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.bosu ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix
index 3e365cae8e944..717262dbcb577 100755
--- a/pkgs/applications/audio/vimpc/default.nix
+++ b/pkgs/applications/audio/vimpc/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A vi/vim inspired client for the Music Player Daemon (mpd).";
     homepage = https://github.com/boysetsfrog/vimpc;
-    license = "GPL3";
+    license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix
index e1d2ad69b1dd6..0850dd0e7be0b 100644
--- a/pkgs/applications/editors/elvis/default.nix
+++ b/pkgs/applications/editors/elvis/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://elvis.vi-editor.org/;
     description = "A vi clone for Unix and other operating systems";
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix
index 32a036805edc0..96d7619d387bc 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (rec {
       interactive theorem provers), based on the customizable text editor Emacs.
     '';
     homepage = http://proofgeneral.inf.ed.ac.uk;
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;  # arbitrary choice
   };
 })
diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix
index 6901aed774ba4..45a527c7484e2 100644
--- a/pkgs/applications/editors/mg/default.nix
+++ b/pkgs/applications/editors/mg/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://homepage.boetes.org/software/mg/;
     description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team";
-    license = "public domain";
+    license = stdenv.lib.licenses.publicDomain;
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix
index 81e0dd35db950..ee9b775453c28 100644
--- a/pkgs/applications/editors/nvi/default.nix
+++ b/pkgs/applications/editors/nvi/default.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.bostic.com/vi/;
     description = "The Berkeley Vi Editor";
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix
index 41a4b102a6f32..f1ca27eed8034 100644
--- a/pkgs/applications/graphics/cinepaint/default.nix
+++ b/pkgs/applications/graphics/cinepaint/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.cinepaint.org/;
-    license = "free";
+    license = stdenv.lib.licenses.free;
     description = "Image editor which supports images over 8bpp and ICC profiles";
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index bd155c59c6b27..9f7643ad1c04f 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The GNU Image Manipulation Program";
     homepage = http://www.gimp.org/;
-    license = "GPL";
+    license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 7139bc71f3c14..c5350228dcf29 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -59,7 +59,7 @@ rec {
       sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \
        -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure
     '';
-    meta = { 
+    meta = {
       description = "The GIMP Animation Package";
       homepage = http://www.gimp.org;
       # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license
@@ -174,10 +174,10 @@ rec {
       sourceRoot = "${name}/src";
       buildPhase = "make gimp";
       installPhase = "installPlugins gmic_gimp";
-      meta = { 
+      meta = {
         description = "script language for image processing which comes with its open-source interpreter";
         homepage = http://gmic.sourceforge.net/repository.shtml;
-        license = "CeCILL FREE SOFTWARE LICENSE AGREEMENT";
+        license = stdenv.lib.licenses.cecill20;
         /*
         The purpose of this Free Software license agreement is to grant users
         the right to modify and redistribute the software governed by this
@@ -197,7 +197,7 @@ rec {
       # --enable-dst-correction - enable DST correction for file timestamps.
       # --enable-contrast - enable the contrast setting option.
       # --enable-interp-none: enable 'None' interpolation (mostly for debugging).
-      # --with-lensfun: use the lensfun library - experimental feature, read this before using it. 
+      # --with-lensfun: use the lensfun library - experimental feature, read this before using it.
       # --with-prefix=PREFIX - use also PREFIX as an input prefix for the build
       # --with-dosprefix=PREFIX - PREFIX in the the prefix in dos format (needed only for ms-window
     configureFlags = "--enable-extras --enable-dst-correction --enable-contrast";
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index cc42e1c40466f..40f8d441d7e9e 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -36,9 +36,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.paraview.org/";
     description = "3D Data analysis and visualization application";
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [viric guibert];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
-
diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix
index 66fceec9a51b2..3c146249dd0b2 100644
--- a/pkgs/applications/misc/d4x/default.nix
+++ b/pkgs/applications/misc/d4x/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "d4x-2.5.7.1";
-  
+
   inherit boost;
 
   src = fetchurl {
@@ -12,9 +12,9 @@ stdenv.mkDerivation {
 
   buildInputs = [ gtk glib pkgconfig openssl boost ];
 
-  meta = { 
+  meta = {
     description = "Graphical download manager";
     homepage = http://www.krasu.ru/soft/chuchelo/;
-    license = "perl";
+    license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
   };
 }
diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix
index 542f11f6e6710..5133ad3c29ebc 100644
--- a/pkgs/applications/misc/vue/default.nix
+++ b/pkgs/applications/misc/vue/default.nix
@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , jre, unzip
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -32,11 +32,11 @@ rec {
   doDeploy = a.fullDepEntry ''
     mkdir -p "$out"/{share/vue,bin}
     cp ${src} "$out/share/vue/vue.jar"
-    echo '#!${a.stdenv.shell}' >> "$out/bin/vue" 
-    echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" 
+    echo '#!${a.stdenv.shell}' >> "$out/bin/vue"
+    echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue"
     chmod a+x "$out/bin/vue"
   '' ["addInputs" "defEnsureDir"];
-      
+
   meta = {
     description = "Visual Understanding Environment - mind mapping software";
     maintainers = with a.lib.maintainers;
@@ -45,7 +45,6 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-    license = "free-noncopyleft"; # Apache License fork, actually
+    license = a.lib.licenses.free; # Apache License fork, actually
   };
 }) x
-
diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix
index 2bb05fe44e07b..15d054c2be2af 100644
--- a/pkgs/applications/misc/xfontsel/default.nix
+++ b/pkgs/applications/misc/xfontsel/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.x.org/;
     description = "Allows testing the fonts available in an X server";
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix
index 06b09154ba550..7584ebf72fb12 100644
--- a/pkgs/applications/misc/xlsfonts/default.nix
+++ b/pkgs/applications/misc/xlsfonts/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.x.org/;
     description = "Lists the fonts available in the X server";
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
diff --git a/pkgs/applications/networking/browsers/netsurf/haru.nix b/pkgs/applications/networking/browsers/netsurf/haru.nix
index 47f0c2f645527..7aa362c613fdc 100644
--- a/pkgs/applications/networking/browsers/netsurf/haru.nix
+++ b/pkgs/applications/networking/browsers/netsurf/haru.nix
@@ -15,10 +15,10 @@ stdenv.mkDerivation {
 
   installPhase = "make PREFIX=$out install";
 
-  meta = { 
+  meta = {
     description = "cross platform, open source library for generating PDF files";
     homepage = http://libharu.org/wiki/Main_Page;
-    license = "ZLIB/LIBPNG"; # see README.
+    license = with stdenv.lib.licenses; [ libpng zlib ];
     maintainers = [args.lib.maintainers.marcweber];
     platforms = args.lib.platforms.linux;
     broken = true;
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index e1bcbf923677b..d0fe7e91989d5 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -82,6 +82,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.opera.com;
     description = "Web browser";
-    license = "unfree";
+    license = stdenv.lib.licenses.unfree;
   };
 }
diff --git a/pkgs/applications/networking/cluster/rq/default.nix b/pkgs/applications/networking/cluster/rq/default.nix
index 8935aeb2771af..fdf11adfb6c0e 100644
--- a/pkgs/applications/networking/cluster/rq/default.nix
+++ b/pkgs/applications/networking/cluster/rq/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    license = "Ruby";
+    license = stdenv.lib.licenses.ruby;
     homepage = "http://www.codeforpeople.com/lib/ruby/rq/";
     description = "Simple cluster queue runner";
     longDescription = "rq creates instant linux clusters by managing priority work queues, even on a multi-core single machine. This cluster runner is easy to install and easy to manage, contrasting with the common complicated solutions.";
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 8785837fbb935..092e6f53e4930 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.freerdp.com/;
 
-    license = "free-non-copyleft";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix
index 07b87e3cf0730..ce6e039c5b1b9 100644
--- a/pkgs/applications/science/logic/cvc3/default.nix
+++ b/pkgs/applications/science/logic/cvc3/default.nix
@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , flex, bison, gmp, perl
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     ["gmp"];
 
   buildInputs = (map (n: builtins.getAttr n x)
@@ -33,7 +33,7 @@ rec {
     sed -e "s@ /bin/bash@bash@g" -i Makefile.std
     find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';'
   '') ["minInit" "doUnpack"];
-      
+
   meta = {
     description = "A prover for satisfiability modulo theory (SMT)";
     maintainers = with a.lib.maintainers;
@@ -42,7 +42,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-    license = "free-noncopyleft";
+    license = a.lib.licenses.free;
     homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html";
   };
   passthru = {
@@ -51,4 +51,3 @@ rec {
     };
   };
 }) x
-
diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix
index afe827f3ad983..293381d2888b9 100644
--- a/pkgs/applications/science/logic/ott/default.nix
+++ b/pkgs/applications/science/logic/ott/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       target-system terms.
     '';
     homepage = http://www.cl.cam.ac.uk/~pes20/ott;
-    license = "BSD3";
+    license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ jwiegley ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix
index 2126a4d76d635..89a214c3f474a 100644
--- a/pkgs/applications/science/logic/satallax/default.nix
+++ b/pkgs/applications/science/logic/satallax/default.nix
@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , sbcl, zlib
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -47,11 +47,11 @@ rec {
 
     sbcl --load make.lisp
     ! ( ./test | grep ERROR )
-    
+
     mkdir -p "$out/bin"
     cp bin/satallax "$out/bin"
   '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"];
-      
+
   meta = {
     description = "A higher-order logic prover";
     maintainers = with a.lib.maintainers;
@@ -60,7 +60,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       unix;
-    license = "free-noncopyleft";
+    license = a.lib.licenses.free;
     homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/";
   };
   passthru = {
@@ -69,4 +69,3 @@ rec {
     };
   };
 }) x
-
diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix
index f9680b4757975..4d97f0480bb32 100644
--- a/pkgs/applications/science/logic/twelf/default.nix
+++ b/pkgs/applications/science/logic/twelf/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       Standard ML.
     '';
     homepage = http://twelf.org/wiki/Main_Page;
-    license = "MIT";
+    license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ jwiegley ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix
index 4c93eef2b1c01..7a534fce4f67f 100644
--- a/pkgs/applications/science/misc/fityk/default.nix
+++ b/pkgs/applications/science/misc/fityk/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Curve fitting and peak fitting software";
-    license = "GPL2";
+    license = stdenv.lib.licenses.gpl2;
     homepage = http://fityk.nieto.pl/;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix
index 2e25ff582ee91..42c72fa47d41c 100644
--- a/pkgs/applications/science/misc/vite/default.nix
+++ b/pkgs/applications/science/misc/vite/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
 
     homepage = http://vite.gforge.inria.fr/;
 
-    license = "CeCILL-A";
+    license = stdenv.lib.licenses.cecill20;
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
index dcfcce1fcf63b..562917ec07375 100644
--- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
@@ -30,10 +30,10 @@ stdenv.mkDerivation {
     done
   '';
 
-  # usage: 
+  # usage:
   meta = {
       description = "import svn, mercurial into git";
       homepage = "http://repo.or.cz/w/fast-export.git";
-      license = "?"; # the .py file is GPLv2
+      license = stdenv.lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix
index 0fdd78fe10684..3fa426d9f6f99 100644
--- a/pkgs/applications/video/quvi/library.nix
+++ b/pkgs/applications/video/quvi/library.nix
@@ -11,12 +11,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt ];
 
-  meta = { 
+  meta = {
     description = "Web video downloader";
     homepage = http://quvi.sf.net;
-    license = "LGPLv2.1+";
+    license = stdenv.lib.licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.mornfall ]; 
+    maintainers = [ stdenv.lib.maintainers.mornfall ];
   };
 }
-
diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix
index 68b61fc453deb..cdc53367d114d 100644
--- a/pkgs/applications/video/quvi/scripts.nix
+++ b/pkgs/applications/video/quvi/scripts.nix
@@ -11,12 +11,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig ];
 
-  meta = { 
+  meta = {
     description = "Web video downloader";
     homepage = http://quvi.sf.net;
-    license = "LGPLv2.1+";
+    license = stdenv.lib.licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.mornfall ]; 
+    maintainers = [ stdenv.lib.maintainers.mornfall ];
   };
 }
-
diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix
index 65a930a261c93..f7bddc50ef823 100644
--- a/pkgs/applications/video/xbmc/default.nix
+++ b/pkgs/applications/video/xbmc/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
     meta = with stdenv.lib; {
       homepage = http://xbmc.org/;
       description = "Media center";
-      license = "GPLv2";
+      license = stdenv.lib.licenses.gpl2;
       platforms = platforms.linux;
       maintainers = [ maintainers.iElectric maintainers.titanous ];
     };
diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix
index e3fa4f9fc7119..c88603892b5dc 100644
--- a/pkgs/applications/window-managers/larswm/default.nix
+++ b/pkgs/applications/window-managers/larswm/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://larswm.fnurt.net/;
     description = "9wm-like tiling window manager";
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix
index a56efa35c7c8c..d6b4829d7306d 100644
--- a/pkgs/data/fonts/aurulent-sans/default.nix
+++ b/pkgs/data/fonts/aurulent-sans/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "Aurulent Sans";
     longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font.";
     homepage = http://delubrum.org/;
-    license = "SIL";
+    license = stdenv.lib.licenses.ofl;
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix
index 2e0f3d5df2a70..946efa00b9ab9 100644
--- a/pkgs/data/fonts/opensans-ttf/default.nix
+++ b/pkgs/data/fonts/opensans-ttf/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = "http://en.wikipedia.org/wiki/Open_Sans";
-    license = "Apache";
+    license = stdenv.lib.licenses.asl20;
 
     platforms = stdenv.lib.platforms.all;
     maintainers = [ ];
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix
index cc6f9c6b5cc47..e3d2cfe0226a2 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
     sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q";
   };
-  
+
   installPhase = ''
     mkdir -p $out/share/fonts/truetype
     cp -v $( find . -name '*.ttf') $out/share/fonts/truetype
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     '';
 
     # See `License.txt' for details.
-    license = "GPLv2 + exception";
+    license = stdenv.lib.licenses.gpl2Oss;
 
     homepage = https://fedorahosted.org/liberation-fonts/;
 
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index 0f29f166d369b..f8dca0fd5a3de 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
     url = "https://fedorahosted.org/releases/l/i/liberation-fonts/${name}.tar.gz";
     sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
   };
-  
+
   buildInputs = [fontforge python pythonPackages.fonttools];
 
   installPhase = ''
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     '';
 
     # See `License.txt' for details.
-    license = "GPLv2 + exception";
+    license = stdenv.lib.licenses.gpl2Oss;
 
     homepage = https://fedorahosted.org/liberation-fonts/;
 
diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix
index 8fde0c6ef03fd..dc5bcb5b9a79a 100644
--- a/pkgs/data/fonts/source-code-pro/default.nix
+++ b/pkgs/data/fonts/source-code-pro/default.nix
@@ -37,6 +37,6 @@ rec {
     maintainers = with a.lib.maintainers; [ relrod ];
     platforms = with a.lib.platforms; all;
     homepage = "http://blog.typekit.com/2012/09/24/source-code-pro/";
-    license = "OFL";
+    license = a.lib.licenses.ofl;
   };
 }) x
diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix
index 130aeef88ab4d..d64a8883d326b 100644
--- a/pkgs/data/fonts/ubuntu-font-family/default.nix
+++ b/pkgs/data/fonts/ubuntu-font-family/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     contemporary style and contains characteristics unique to
     the Ubuntu brand that convey a precise, reliable and free attitude.";
     homepage = http://font.ubuntu.com/;
-    license = "free";
+    license = stdenv.lib.licenses.free;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.antono ];
   };
diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix
index 52e9ebf0617c2..94a65f6e63e40 100644
--- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix
+++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "Mobile broadband service provider database";
     homepage = http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders;
     platforms = stdenv.lib.platforms.all;
-    license = "CC-PD";
+    license = stdenv.lib.licenses.publicDomain;
     maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }
diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index 5bf86ea6b3267..59dd4da792bb4 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = http://poppler.freedesktop.org/;
     description = "Encoding files for Poppler, a PDF rendering library";
     platforms = stdenv.lib.platforms.all;
-    license = "free"; # more free licenses combined
+    license = stdenv.lib.licenses.free; # more free licenses combined
     maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }
diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix
index 55f64234a32e4..c3a960388bb4c 100644
--- a/pkgs/development/compilers/cmucl/binary.nix
+++ b/pkgs/development/compilers/cmucl/binary.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
       which runs on most major Unix platforms.  It mainly conforms to the
       ANSI Common Lisp standard.
     '';
-    license = "free";		# public domain
+    license = stdenv.lib.licenses.free;		# public domain
     homepage = http://www.cons.org/cmucl/;
   };
 }
diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index 3eb9aef528c0e..a8180947f4a03 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/kripken/emscripten-fastcomp;
     description = "emscripten llvm";
     maintainers = with maintainers; [ bosu ];
-    license = "University of Illinois/NCSA Open Source License";
+    license = stdenv.lib.licenses.ncsa;
   };
 }
diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index 09245ba6d4bdc..973a07b1295f9 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation {
   meta = {
     description = "Intel ACPI Compiler";
     homepage = http://www.acpica.org/;
-    license = "iasl"; # FIXME: is this a free software license?
+    license = stdenv.lib.licenses.iasl;
   };
 }
diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index 1b9e9118d56f5..e098f48a24ce5 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
     description = "Cross platform, open source .NET development framework";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice ];
-    license = "free"; # Combination of LGPL/X11/GPL ?
+    license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
   };
 }
diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix
index 1d68585d93a12..69a6a1f5f6763 100644
--- a/pkgs/development/compilers/ocaml/3.10.0.nix
+++ b/pkgs/development/compilers/ocaml/3.10.0.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, x11, ncurses }:
 
 stdenv.mkDerivation (rec {
-  
+
   name = "ocaml-3.10.0";
-  
+
   src = fetchurl {
     url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2";
     sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d";
@@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
   configureFlags = ["-no-tk" "-x11lib" x11];
   buildFlags = "world bootstrap world.opt";
   buildInputs = [x11 ncurses];
-  installTargets = "install installopt"; 
+  installTargets = "install installopt";
   patchPhase = ''
     CAT=$(type -tp cat)
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
@@ -25,7 +25,7 @@ stdenv.mkDerivation (rec {
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
-    license = "QPL, LGPL2 (library part)";
+    license = with stdenv.lib.licenses; [ qpl lgpl2 ];
     description = "Most popular variant of the Caml language";
   };
 
diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
index 4313dcd7537e5..9b340f69e90b0 100644
--- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
+++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, x11, ncurses }:
 
 stdenv.mkDerivation (rec {
-  
+
   name = "metaocaml-3.09-alpha-30";
-  
+
   src = fetchurl {
     url = "http://www.metaocaml.org/dist/old/MetaOCaml_309_alpha_030.tar.gz";
     sha256 = "0migbn0zwfb7yb24dy7qfqi19sv3drqcv4369xi7xzpds2cs35fd";
@@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
   configureFlags = ["-no-tk" "-x11lib" x11];
   buildFlags = "world bootstrap world.opt";
   buildInputs = [x11 ncurses];
-  installTargets = "install installopt"; 
+  installTargets = "install installopt";
   patchPhase = ''
     CAT=$(type -tp cat)
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
@@ -25,7 +25,7 @@ stdenv.mkDerivation (rec {
 
   meta = {
     homepage = http://www.metaocaml.org/;
-    license = "QPL, LGPL2 (library part)";
+    license = with stdenv.lib.licenses; [ qpl lgpl2 ];
     desctiption = "A compiled, type-safe, multi-stage programming language";
   };
 
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index a29c0de65b878..dea7d3cd6e841 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/";
     description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler";
-    license = "artistic";
+    license = stdenv.lib.licenses.artistic2;
 
     maintainers = [ stdenv.lib.maintainers.simons ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix
index 0f52e879863ee..19ec3a3a2fb53 100644
--- a/pkgs/development/eclipse/ecj/default.nix
+++ b/pkgs/development/eclipse/ecj/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.eclipse.org/jdt/core/index.php;
 
     # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft)
-    license = "EPLv1.0";
+    license = stdenv.lib.licenses.epl10;
 
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index f70fb164623b0..ab559aa9e659b 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Ruby interpreter written in Java";
     homepage = http://jruby.org/;
-    license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those
+    license = with stdenv.lib.licenses; [ cpl10 gpl2 lgpl21 ];
   };
 }
diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix
index cec0d35bde524..2a8f7ca2c302c 100644
--- a/pkgs/development/interpreters/kona/default.nix
+++ b/pkgs/development/interpreters/kona/default.nix
@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , fetchgit
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     ["fetchgit"];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -31,7 +31,7 @@ rec {
   prepareOut = a.fullDepEntry ''
     mkdir -p "$out/bin"
   '' ["minInit" "defEnsureDir"];
-      
+
   meta = {
     description = "An interpreter of K, APL-like programming language";
     maintainers = with a.lib.maintainers;
@@ -40,7 +40,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-    license = "free-noncopyleft";
+    license = a.lib.licenses.free;
   };
   passthru = {
     updateInfo = {
@@ -48,4 +48,3 @@ rec {
     };
   };
 }) x
-
diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index 0edf5e6080109..79363f189d02b 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -185,12 +185,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
          php is build within this derivation in order to add the xdebug lines to the php.ini.
          So both Apache and command line php both use xdebug without having to configure anything.
          Xdebug could be put in its own derivation.
-      * /
-        meta = {
-                description = "debugging support for PHP";
-                homepage = http://xdebug.org;
-                license = "based on the PHP license - as is";
-                };
       */
     };
 
@@ -255,7 +249,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
   meta = {
     description = "An HTML-embedded scripting language";
     homepage = http://www.php.net/;
-    license = "PHP-3";
+    license = stdenv.lib.licenses.php301;
   };
 
   patches = [ ./fix-5.4.patch ];
diff --git a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix
index 9b43368c6173b..9f2945dfb7682 100644
--- a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix
+++ b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    license = "Ruby";
+    license = stdenv.lib.licenses.ruby;
     homepage = "http://www.ruby-lang.org/en/";
     description = "The Ruby language";
   };
diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix
index 4c3344f7672ea..6e85d6c0330f6 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    license = "Ruby";
+    license = stdenv.lib.licenses.ruby;
     homepage = "http://www.ruby-lang.org/en/";
     description = "The Ruby language";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix
index afe4cbef79d40..39884745635a1 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    license = "Ruby";
+    license = stdenv.lib.licenses.ruby;
     homepage = "http://www.ruby-lang.org/en/";
     description = "The Ruby language";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix
index d87526b1570c3..eb8239086ea9b 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    license = "Ruby";
+    license = stdenv.lib.licenses.ruby;
     homepage = "http://www.ruby-lang.org/en/";
     description = "The Ruby language";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix
index e2ee74fac2df8..2cefa6b002a6c 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    license = "Ruby";
+    license = stdenv.lib.licenses.ruby;
     homepage = "http://www.ruby-lang.org/en/";
     description = "The Ruby language";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.3.nix b/pkgs/development/interpreters/ruby/ruby-2.1.3.nix
index 0f8b251232203..9609a8758f989 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.1.3.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.1.3.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    license = "Ruby";
+    license = stdenv.lib.licenses.ruby;
     homepage = "http://www.ruby-lang.org/en/";
     description = "The Ruby language";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix
index d7a8708e5401e..5309d32382c15 100644
--- a/pkgs/development/libraries/allegro/5-unstable.nix
+++ b/pkgs/development/libraries/allegro/5-unstable.nix
@@ -45,7 +45,7 @@ rec {
 
   meta = {
     description = "A game programming library";
-    license = "free-noncopyleft"; # giftware
+    license = a.lib.licenses.free; # giftware
     maintainers = with a.lib.maintainers;
     [
       raskin
@@ -55,4 +55,3 @@ rec {
     inherit version;
   };
 }) x
-
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index f03dd5b548c79..5f67e9592305d 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -44,7 +44,7 @@ rec {
 
   meta = {
     description = "A game programming library";
-    license = "free-noncopyleft"; # giftware
+    license = a.lib.licenses.free; # giftware
     maintainers = with a.lib.maintainers;
     [
       raskin
@@ -54,4 +54,3 @@ rec {
     inherit version;
   };
 }) x
-
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 213b086c3ccf5..6d31087968cca 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -43,7 +43,7 @@ rec {
   meta = {
     branch = "4";
     description = "A game programming library";
-    license = "free-noncopyleft"; # giftware
+    license = a.lib.licenses.free; # giftware
     maintainers = with a.lib.maintainers;
     [
       raskin
@@ -57,4 +57,3 @@ rec {
     };
   };
 }) x
-
diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix
index 699030b8fe530..813dd2d868763 100644
--- a/pkgs/development/libraries/asio/default.nix
+++ b/pkgs/development/libraries/asio/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "asio-1.10.4";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/asio/${name}.tar.bz2";
     sha256 = "0jminwr84wphwpph7j820cql7cbaqlj2zv4gfjk2imazpmlhsfri";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://asio.sourceforge.net/;
     description = "Cross-platform C++ library for network and low-level I/O programming";
-    license = "boost";
+    license = stdenv.lib.licenses.boost;
   };
 
 }
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index fdfc8b45a683e..ea2710c8e5642 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://boost.org/";
     description = "Collection of C++ libraries";
-    license = "boost-license";
+    license = stdenv.lib.licenses.boost;
 
     platforms = platforms.unix;
     maintainers = with maintainers; [ simons wkennington ];
diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/pkgs/development/libraries/celt/0.5.1.nix
index f489e95f5d4fb..a520ffd9c0f31 100644
--- a/pkgs/development/libraries/celt/0.5.1.nix
+++ b/pkgs/development/libraries/celt/0.5.1.nix
@@ -36,7 +36,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-    license = "free";
+    license = a.lib.licenses.free;
     branch = "0.5.1";
   };
   passthru = {
diff --git a/pkgs/development/libraries/celt/0.7.nix b/pkgs/development/libraries/celt/0.7.nix
index 35cfae9ebb16d..db4c0821336bf 100644
--- a/pkgs/development/libraries/celt/0.7.nix
+++ b/pkgs/development/libraries/celt/0.7.nix
@@ -1,9 +1,9 @@
 x@{builderDefsPackage
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -27,7 +27,7 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["doConfigure" "doMakeInstall"];
-      
+
   meta = {
     description = "CELT - low-delay audio codec";
     maintainers = with a.lib.maintainers;
@@ -36,7 +36,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-    license = "free";
+    license = a.lib.licenses.free;
     branch = "0.7";
   };
   passthru = {
@@ -45,4 +45,3 @@ rec {
     };
   };
 }) x
-
diff --git a/pkgs/development/libraries/celt/default.nix b/pkgs/development/libraries/celt/default.nix
index ca25be9050480..03eba5a8d2540 100644
--- a/pkgs/development/libraries/celt/default.nix
+++ b/pkgs/development/libraries/celt/default.nix
@@ -1,9 +1,9 @@
 x@{builderDefsPackage
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -27,7 +27,7 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["doConfigure" "doMakeInstall"];
-      
+
   meta = {
     description = "Low-delay audio codec";
     maintainers = with a.lib.maintainers;
@@ -36,7 +36,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-    license = "free";
+    license = a.lib.licenses.free;
   };
   passthru = {
     updateInfo = {
@@ -44,4 +44,3 @@ rec {
     };
   };
 }) x
-
diff --git a/pkgs/development/libraries/cppnetlib/default.nix b/pkgs/development/libraries/cppnetlib/default.nix
index 3eab580c6a892..818e28b0a7690 100644
--- a/pkgs/development/libraries/cppnetlib/default.nix
+++ b/pkgs/development/libraries/cppnetlib/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://cpp-netlib.github.com/;
     description = "Provides application layer network support at boost style";
-    license = "boost";
+    license = stdenv.lib.licenses.boost;
   };
 }
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index 3b517d60b27f1..c326fb7fd3841 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Crypto++, a free C++ class library of cryptographic schemes";
     homepage = http://cryptopp.com/;
-    license = "Boost 1.0";
+    license = stdenv.lib.licenses.boost;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index 9c774e802fc13..80afcb343ddd1 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://dbus.freedesktop.org;
-    license = "AFL-2.1 or GPL-2";
+    license = with stdenv.lib.licenses; [ afl21 gpl2 ];
     description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism";
     maintainers = [ stdenv.lib.maintainers.urkud ];
   };
diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index 2c4f8da77835d..a058fb9cfa212 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.audiocoding.com/faac.html;
     # Incompatible with GPL. Some changes to the base code, included in faac,
     # are under LGPL though.
-    license = "unfree-redistributable";
+    license = stdenv.lib.licenses.unfreeRedistributable;
   };
 }
diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix
index 5b1dc6fc0a41b..bf690c020cb51 100644
--- a/pkgs/development/libraries/flite/default.nix
+++ b/pkgs/development/libraries/flite/default.nix
@@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A small, fast run-time speech synthesis engine";
     homepage = http://www.festvox.org/flite/;
-    license = "free-non-copyleft";
+    license = stdenv.lib.licenses.free;
     platforms = stdenv.lib.platforms.linux;
   };
 }
-
diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix
index 04fbb01a3bfcb..31be86ee13ecd 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/pkgs/development/libraries/gsm/default.nix
@@ -1,9 +1,9 @@
 x@{builderDefsPackage
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -40,7 +40,7 @@ rec {
     ''INSTALL_ROOT="$out"''
     ''GSM_INSTALL_INC="$out/include/gsm"''
   ];
-      
+
   meta = {
     description = "A GSM codec library";
     maintainers = with a.lib.maintainers;
@@ -49,7 +49,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-    license = "free-noncopyleft";
+    license = a.lib.licenses.free;
   };
   passthru = {
     updateInfo = {
@@ -57,4 +57,3 @@ rec {
     };
   };
 }) x
-
diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix
index eff52cc177b6b..898813be7f88b 100644
--- a/pkgs/development/libraries/java/classpath/default.nix
+++ b/pkgs/development/libraries/java/classpath/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/classpath/;
 
     # The exception makes it similar to LGPLv2+ AFAICS.
-    license = "GPLv2+ + exception";
+    license = stdenv.lib.licenses.gpl2ClasspathPlus;
 
     maintainers = [ ];
   };
diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix
index ecd63e98f191a..ae5d49f28506d 100644
--- a/pkgs/development/libraries/leptonica/default.nix
+++ b/pkgs/development/libraries/leptonica/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation {
     description = "Image processing and analysis library";
     homepage = http://www.leptonica.org/;
     # Its own license: http://www.leptonica.org/about-the-license.html
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix
index 8e68e10d940f7..de2ab0ff3b150 100644
--- a/pkgs/development/libraries/libcaca/default.nix
+++ b/pkgs/development/libraries/libcaca/default.nix
@@ -2,19 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "libcaca-0.99.beta19";
-  
+
   src = fetchurl {
     url = "http://caca.zoy.org/files/libcaca/${name}.tar.gz";
     sha256 = "1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj";
   };
-  
+
   configureFlags = "--disable-x11 --disable-imlib2 --disable-doc";
-  
+
   propagatedBuildInputs = [ncurses];
 
   meta = {
     homepage = http://libcaca.zoy.org/;
     description = "A graphics library that outputs text instead of pixels";
-    license = "WTFPL"; # http://sam.zoy.org/wtfpl/
+    license = stdenv.lib.licenses.wtfpl;
   };
 }
diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index 51c23451fec8b..853786c34045c 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     description = "USB CEC adapter communication library";
     homepage = "http://libcec.pulse-eight.com";
     repositories.git = "https://github.com/Pulse-Eight/libcec.git";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.titanous ];
   };
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index da5a080521c6d..6810c8665a77f 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -46,10 +46,9 @@ stdenv.mkDerivation rec {
     homepage = http://sourceware.org/libffi/;
 
     # See http://github.com/atgreen/libffi/blob/master/LICENSE .
-    license = "free, non-copyleft";
+    license = stdenv.lib.licenses.free;
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
     platforms = stdenv.lib.platforms.all;
   };
 }
-
diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix
index 11b3bf4f6d5eb..eb617ed6b9e99 100644
--- a/pkgs/development/libraries/libharu/default.nix
+++ b/pkgs/development/libraries/libharu/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Cross platform, open source library for generating PDF files";
     homepage = http://libharu.org/wiki/Main_Page;
-    license = "ZLIB/LIBPNG"; # see README.
+    license = stdenv.lib.licenses.zlib;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix
index caeb87ee694b8..cbe9e20f0b1ba 100644
--- a/pkgs/development/libraries/libixp_for_wmii/default.nix
+++ b/pkgs/development/libraries/libixp_for_wmii/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://libs.suckless.org/libixp;
     description = "stand-alone client/server 9P library";
-    license = "MIT / LPL";
+    license = with stdenv.lib.licenses; [ mit lpl-102 ];
   };
 }
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index bf27e074dd58b..07f3d65ffc1f1 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://libjpeg-turbo.virtualgl.org/;
     description = "A faster (using SIMD) libjpeg implementation";
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index d7a1bcb46385d..bf2ebb27f37f8 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchurl, static ? false }: 
+{ stdenv, fetchurl, static ? false }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation {
   name = "libjpeg-8d";
-  
+
   src = fetchurl {
     url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz;
     sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0";
   };
 
   configureFlags = optional static "--enable-static --disable-shared";
-  
+
   meta = {
     homepage = http://www.ijg.org/;
     description = "A library that implements the JPEG image file format";
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix
index b58e2dd257d76..234f56863c099 100644
--- a/pkgs/development/libraries/libmng/default.nix
+++ b/pkgs/development/libraries/libmng/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics";
     homepage = http://www.libmng.com;
-    license = "zlib/libpng";
+    license = stdenv.lib.licenses.zlib;
     maintainers = with stdenv.lib.maintainers; [ marcweber urkud ];
     hydraPlatforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix
index 2d736411780f2..1452ec6160695 100644
--- a/pkgs/development/libraries/libopensc-dnie/default.nix
+++ b/pkgs/development/libraries/libopensc-dnie/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.dnielectronico.es/descargas/;
     description = "Opensc plugin to access the Spanish national ID smartcard";
-    license = "nonfree";
+    license = stdenv.lib.licenses.unfree;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
     broken = true;
diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix
index dd19d3f179fd7..ef194bb0b1ecb 100644
--- a/pkgs/development/libraries/librdf/raptor.nix
+++ b/pkgs/development/libraries/librdf/raptor.nix
@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
     sed -e '/curl\/types/d' -i src/*.c src/*.h
   '';
 
-  meta = { 
+  meta = {
     description = "The RDF Parser Toolkit";
     homepage = "http://librdf.org/raptor";
-    license = "LGPL-2.1 Apache-2.0";
+    license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix
index 500acdfb2ec12..8c748447ae14e 100644
--- a/pkgs/development/libraries/librdf/raptor2.nix
+++ b/pkgs/development/libraries/librdf/raptor2.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The RDF Parser Toolkit";
     homepage = "http://librdf.org/raptor";
-    license = "LGPL-2.1 Apache-2.0";
+    license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
     maintainers = with stdenv.lib.maintainers; [ marcweber urkud ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index 1acc7c1d73cdc..551b31d416eba 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Library that handles Resource Description Framework (RDF)";
     homepage = "http://librdf.org/rasqal";
-    license = "LGPL-2.1 Apache-2.0";
+    license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
     maintainers = with stdenv.lib.maintainers; [ marcweber urkud ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index dcef77d591971..af3d03cc661b2 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Version of NaCl with harwdare tests at runtime, not build time";
-    license = "ISC";
+    license = stdenv.lib.licenses.isc;
     maintainers = with stdenv.lib.maintainers; [ viric ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index 2346e4b750150..3d52fa3ac9df0 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "Tools and library for the WebP image format";
 
     /* It has its own licence, google-related, but that looks like BSD */
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix
index 502329226ff3f..0ea73a3a57f0b 100644
--- a/pkgs/development/libraries/mesa-glu/default.nix
+++ b/pkgs/development/libraries/mesa-glu/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "OpenGL utility library";
     homepage = http://cgit.freedesktop.org/mesa/glu/;
-    license = "bsd"; # SGI-B-2.0, which seems BSD-like
+    license = stdenv.lib.licenses.sgi-b-20;
   };
 }
diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix
index 852d72cb9aada..78932259841bc 100644
--- a/pkgs/development/libraries/nvidia-texture-tools/default.nix
+++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A set of cuda-enabled texture tools and compressors";
     homepage = "http://developer.nvidia.com/object/texture_tools.html";
-    license = "MIT";
+    license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix
index 16fb46d1698ae..78cfeb13a2c5d 100644
--- a/pkgs/development/libraries/physfs/default.nix
+++ b/pkgs/development/libraries/physfs/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://icculus.org/physfs/";
     description = "Library to provide abstract access to various archives";
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix
index 3111f71369a0a..745626e76b0f9 100644
--- a/pkgs/development/libraries/pocketsphinx/default.nix
+++ b/pkgs/development/libraries/pocketsphinx/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Voice recognition library written in C";
     homepage = http://cmusphinx.sourceforge.net;
-    license = "free-non-copyleft";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix
index a82acd2745db0..76ceb12b401f7 100644
--- a/pkgs/development/libraries/qhull/default.nix
+++ b/pkgs/development/libraries/qhull/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.qhull.org/;
     description = "Computes the convex hull, Delaunay triangulation, Voronoi diagram and more";
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix
index c13862775268f..8d31978657d44 100644
--- a/pkgs/development/libraries/qwt/6.nix
+++ b/pkgs/development/libraries/qwt/6.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Qt widgets for technical applications";
     homepage = http://qwt.sourceforge.net/;
     # LGPL 2.1 plus a few exceptions (more liberal)
-    license = "Qwt License, Version 1.0";
+    license = stdenv.lib.licenses.qwt;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
   };
diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix
index fe73e0beabd95..aa4f45243e0be 100644
--- a/pkgs/development/libraries/qwt/default.nix
+++ b/pkgs/development/libraries/qwt/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     description = "Qt widgets for technical applications";
     homepage = http://qwt.sourceforge.net/;
     # LGPL 2.1 plus a few exceptions (more liberal)
-    license = "Qwt License, Version 1.0";
+    license = stdenv.lib.licenses.qwt;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
   };
diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix
index 1bc7eff31819c..fa8412ccb6dbf 100644
--- a/pkgs/development/libraries/science/math/blas/default.nix
+++ b/pkgs/development/libraries/science/math/blas/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Basic Linear Algebra Subprograms";
-    license = "public domain";
+    license = stdenv.lib.licenses.publicDomain;
     homepage = "http://www.netlib.org/blas/";
   };
 }
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix
index f18107c48a5eb..1b0039952d7dd 100644
--- a/pkgs/development/libraries/scmccid/default.nix
+++ b/pkgs/development/libraries/scmccid/default.nix
@@ -4,7 +4,7 @@ assert stdenv ? gcc && stdenv.gcc.libc != null;
 
 stdenv.mkDerivation rec {
   name = "scmccid-5.0.11";
-  
+
   src = if stdenv.system == "i686-linux" then (fetchurl {
       url = "http://www.scmmicro.com/support/download/scmccid_5.0.11_linux.tar.gz";
       sha256 = "1r5wkarhzl09ncgj55baizf573czw0nplh1pgddzx9xck66kh5bm";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.scmmicro.com/support/pc-security-support/downloads.html;
     description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others";
-    license = "nonfree";
+    license = stdenv.lib.licenses.unfree;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix
index 4c615b81552fd..02e7dc24159f2 100644
--- a/pkgs/development/libraries/slib/default.nix
+++ b/pkgs/development/libraries/slib/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     '';
 
     # Public domain + permissive (non-copyleft) licensing of some files.
-    license = "public domain";
+    license = stdenv.lib.licenses.publicDomain;
 
     homepage = http://people.csail.mit.edu/jaffer/SLIB;
 
diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix
index 48168ceb92ddc..79a633c654171 100644
--- a/pkgs/development/libraries/speech-tools/default.nix
+++ b/pkgs/development/libraries/speech-tools/default.nix
@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , gawk, alsaLib, ncurses
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -28,7 +28,7 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["doUnpack" "killUsrBin" "doConfigure" "doMakeInstall" "doDeploy" "fixPaths"];
-      
+
   killUsrBin = a.fullDepEntry ''
     sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . )
     sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . )
@@ -55,7 +55,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-    license = "free-noncopyleft";
+    license = a.lib.licenses.free;
   };
   passthru = {
     updateInfo = {
@@ -63,4 +63,3 @@ rec {
     };
   };
 }) x
-
diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix
index f1c8a84fee26a..5588646e53adb 100644
--- a/pkgs/development/libraries/stlport/default.nix
+++ b/pkgs/development/libraries/stlport/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An implementation of the C++ Standard Library";
     homepage = http://sourceforge.net/projects/stlport/;
-    license = "free"; # seems BSD-like
+    license = stdenv.lib.licenses.free; # seems BSD-like
   };
 }
diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix
index e1cc1f27c1d04..7f0a343eba233 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/pkgs/development/libraries/tinyxml/2.6.2.nix
@@ -4,20 +4,20 @@ let
   version = "2.6.2";
 in stdenv.mkDerivation {
   name = "tinyxml-${version}";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip";
     sha256 = "04nmw6im2d1xp12yir8va93xns5iz816pwi25n9cql3g3i8bjsxc";
   };
-  
+
   patches = [
     # add pkgconfig file
     ./2.6.2-add-pkgconfig.patch
-    
+
     # http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
     ./2.6.2-entity.patch
   ];
-  
+
   buildInputs = [ unzip ];
   buildPhase = ''
     # use STL (xbmc requires it)
@@ -26,13 +26,13 @@ in stdenv.mkDerivation {
 
     # build xmltest
     make
-    
+
     # build the lib as a shared library
     g++ -Wall -O2 -shared -fpic tinyxml.cpp \
     tinyxmlerror.cpp tinyxmlparser.cpp      \
     tinystr.cpp -o libtinyxml.so
   '';
-  
+
   doCheck = true;
   checkPhase = ''
     ./xmltest
@@ -41,25 +41,25 @@ in stdenv.mkDerivation {
       exit $result
     fi
   '';
-  
+
   installPhase = ''
     mkdir -pv $out/include/
     mkdir -pv $out/lib/pkgconfig/
     mkdir -pv $out/share/doc/tinyxml/
-    
+
     cp -v libtinyxml.so $out/lib/
     cp -v *.h $out/include/
-    
+
     substituteInPlace tinyxml.pc --replace "@out@" "$out"
     substituteInPlace tinyxml.pc --replace "@version@" "${version}"
     cp -v tinyxml.pc $out/lib/pkgconfig/
-    
+
     cp -v docs/* $out/share/doc/tinyxml/
   '';
-  
+
   meta = {
     description = "Simple, small, C++ XML parser that can be easily integrating into other programs";
     homepage = "http://www.grinninglizard.com/tinyxml/index.html";
-    license = "free-non-copyleft";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix
index 3544e984077af..d07c1d5504721 100644
--- a/pkgs/development/libraries/vrpn/default.nix
+++ b/pkgs/development/libraries/vrpn/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
     homepage = http://www.cs.unc.edu/Research/vrpn/;
 
-    license = "BSL1.0"; # Boost Software License,
+    license = stdenv.lib.licenses.boost;
                         # see # <http://www.cs.unc.edu/Research/vrpn/obtaining_vrpn.html>
 
   };
diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix
index 73f543f5b626a..9de4df9288b39 100644
--- a/pkgs/development/ocaml-modules/dypgen/default.nix
+++ b/pkgs/development/ocaml-modules/dypgen/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://dypgen.free.fr;
     description = "Dypgen GLR self extensible parser generator";
-    license = "CeCILL-B_V1";
+    license = stdenv.lib.licenses.cecill-b;
 #    maintainers = [ stdenv.lib.maintainers.roconnor ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index 98747e2a193e6..c7427558314e3 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://ocamlgraph.lri.fr/;
     description = "Graph library for Objective Caml";
-    license = "GNU Library General Public License version 2, with the special exception on linking described in file LICENSE";
+    license = stdenv.lib.licenses.gpl2Oss;
     platforms = ocaml.meta.platforms;
     maintainers = [
       stdenv.lib.maintainers.kkallio
diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix
index a8e0f28628a4e..dc5d191f75af6 100644
--- a/pkgs/development/ocaml-modules/ocamlnat/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   meta = {
     description = "OCaml native toplevel";
     homepage = http://benediktmeurer.de/ocamlnat/;
-    license = "QPL";
+    license = stdenv.lib.licenses.qpl;
     longDescription = ''
       The ocamlnat project provides a new native code OCaml toplevel
       ocamlnat, which is mostly compatible to the byte code toplevel ocaml,
diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
index d2a1ed3a6240e..ad1bc97d2f748 100644
--- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     rev = "refs/tags/0.6.2";
     sha256 = "2b3bf3f4972d0e6eaf075f7353ce482b776726e0cd04947a89b7156384ec0662";
     };
-  
+
   buildInputs = [ocaml findlib ocaml_oasis ocaml_data_notation ocaml_optcomp];
 
   configurePhase = ''
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   meta =  {
     homepage = https://github.com/ocsigen/deriving;
     description = "Extension to OCaml for deriving functions from type declarations";
-    license = "MIT";
+    license = stdenv.lib.licenses.mit;
     platforms = ocaml.meta.platforms;
     maintainers = [
       stdenv.lib.maintainers.gal_bolle
diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
index 93cef5d844cc8..20362a51a7be3 100644
--- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
+++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
@@ -21,6 +21,6 @@ buildPerlPackage rec {
   doCheck = !stdenv.isDarwin;
 
   meta = {
-    license = "perl";
+    license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
   };
 }
diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix
index 619f2f14b96bb..f6c8bcc2e2fce 100644
--- a/pkgs/development/perl-modules/DBD-Pg/default.nix
+++ b/pkgs/development/perl-modules/DBD-Pg/default.nix
@@ -16,7 +16,7 @@ buildPerlPackage rec {
   meta = {
     homepage = http://search.cpan.org/dist/DBD-Pg/;
     description = "DBI PostgreSQL interface";
-    license = "perl";
+    license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix
index d446178838180..e83cc9ad1f4c8 100644
--- a/pkgs/development/python-modules/mygpoclient/default.nix
+++ b/pkgs/development/python-modules/mygpoclient/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
       to the gpodder.net web services.
     '';
     homepage = "https://thp.io/2010/mygpoclient/";
-    license = "GPLv3";
+    license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.skeidel ];
   };
diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix
index 3bf459000342b..e3fd1306cece6 100644
--- a/pkgs/development/tools/analysis/smatch/default.nix
+++ b/pkgs/development/tools/analysis/smatch/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation {
   meta = {
     description = "A semantic analysis tool for C";
     homepage = "http://smatch.sourceforge.net/";
-    license = "free"; /* OSL, see http://www.opensource.org */
+    license = stdenv.lib.licenses.free; /* OSL, see http://www.opensource.org */
   };
 }
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index 62182d0b84567..e21ae8e927385 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Formal verification tool for distributed software systems";
     homepage = http://spinroot.com/;
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = with maintainers; [ mornfall pSub ];
   };
 }
diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix
index 5538eae4104aa..723219336bb90 100644
--- a/pkgs/development/tools/boost-build/default.nix
+++ b/pkgs/development/tools/boost-build/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.boost.org/boost-build2/;
-    license = "boost-license";
+    license = stdenv.lib.licenses.boost;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
   };
diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix
index e7e4b6d090922..b01d22b524b7a 100644
--- a/pkgs/development/tools/build-managers/bam/default.nix
+++ b/pkgs/development/tools/build-managers/bam/default.nix
@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , lua5, python
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -43,7 +43,7 @@ rec {
     mkdir -p "$out/bin"
     cp bam "$out/bin"
   '' ["minInit" "defEnsureDir" "build"];
-      
+
   meta = {
     description = "Yet another build manager";
     maintainers = with a.lib.maintainers;
@@ -52,7 +52,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-    license = "free-noncopyleft";
+    license = a.lib.licenses.free;
   };
   passthru = {
     updateInfo = {
@@ -60,4 +60,3 @@ rec {
     };
   };
 }) x
-
diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix
index 434e23d9b9901..8f56577de32fd 100644
--- a/pkgs/development/tools/build-managers/jam/default.nix
+++ b/pkgs/development/tools/build-managers/jam/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://public.perforce.com/wiki/Jam;
-    license = "free";
+    license = stdenv.lib.licenses.free;
     description = "Just Another Make";
   };
 }
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 69db7da17bcf1..7a7755ab2b04e 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://leiningen.org/;
     description = "Project automation for Clojure";
-    license = "EPL";
+    license = stdenv.lib.licenses.epl10;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix
index d923fea8b5985..48d04fd48ab32 100644
--- a/pkgs/development/tools/cdecl/default.nix
+++ b/pkgs/development/tools/cdecl/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Translator English -- C/C++ declarations";
-    license = "Public Domain";
+    license = stdenv.lib.licenses.publicDomain;
     maintainers = with stdenv.lib.maintainers; [viric joelteon];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix
index c91d826e3b373..a729821492651 100644
--- a/pkgs/development/tools/misc/cproto/default.nix
+++ b/pkgs/development/tools/misc/cproto/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation {
   # patch made by Joe Khoobyar copied from gentoo bugs
   patches = ./cproto_patch;
 
-  meta = { 
+  meta = {
     description = "Tool to generate C function prototypes from C source code";
     homepage = http://cproto.sourceforge.net/;
-    license = "public domain";
+    license = stdenv.lib.licenses.publicDomain;
   };
 }
diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index 8842c8723b1ef..5be797507c027 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -8,9 +8,9 @@ stdenv.mkDerivation {
     sha256 = "1rbzx5ipkvih9rjfdfv6310wcr6mxjbdlsh9zcv5aaz6yxxxil7c";
   };
 
-  meta = { 
+  meta = {
     description = "Berkeley YACC";
     homepage = http://dickey.his.com/byacc/byacc.html;
-    license = "public domain";
+    license = stdenv.lib.licenses.publicDomain;
   };
 }
diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix
index da806a77fa4a3..1fd70730265a8 100644
--- a/pkgs/development/tools/quilt/default.nix
+++ b/pkgs/development/tools/quilt/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       and more.
     '';
 
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix
index 61e8571c47669..42a1b19c4d7ad 100644
--- a/pkgs/games/blackshades/default.nix
+++ b/pkgs/games/blackshades/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://icculus.org/blackshades/;
     description = "Protect the VIP";
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix
index 882f5f3cde6bc..0709692552c2f 100644
--- a/pkgs/games/bsdgames/default.nix
+++ b/pkgs/games/bsdgames/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.t2-project.org/packages/bsd-games.html";
     description = "Ports of all the games from NetBSD-current that are free";
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/games/d1x-rebirth/default.nix b/pkgs/games/d1x-rebirth/default.nix
index ca348592d1d21..ab8c76680d40d 100644
--- a/pkgs/games/d1x-rebirth/default.nix
+++ b/pkgs/games/d1x-rebirth/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.dxx-rebirth.com/;
     description = "Source Port of the Descent 1 engine";
-    license = "BSD"; # Parallax license, like BSD I think
+    license = stdenv.lib.licenses.mit;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [viric];
   };
diff --git a/pkgs/games/d2x-rebirth/default.nix b/pkgs/games/d2x-rebirth/default.nix
index 644c270359961..58df972257e5b 100644
--- a/pkgs/games/d2x-rebirth/default.nix
+++ b/pkgs/games/d2x-rebirth/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.dxx-rebirth.com/;
     description = "Source Port of the Descent 2 engine";
-    license = "BSD"; # Parallax license, like BSD I think
+    license = stdenv.lib.licenses.mit;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [viric];
   };
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 6e53aff65a573..c9d421eac9bea 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
   meta = {
       description = "control a dwarven outpost or an adventurer in a randomly generated, persistent world";
       homepage = http://www.bay12games.com/dwarves;
-      license = "unfree-redistributable";
+      license = stdenv.lib.licenses.unfreeRedistributable;
       maintainers = [stdenv.lib.maintainers.roconnor];
   };
 }
diff --git a/pkgs/games/dwarf-fortress/df2014.nix b/pkgs/games/dwarf-fortress/df2014.nix
index 64a3e5bc97557..406c45d3414b5 100644
--- a/pkgs/games/dwarf-fortress/df2014.nix
+++ b/pkgs/games/dwarf-fortress/df2014.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
   meta = {
       description = "control a dwarven outpost or an adventurer in a randomly generated, persistent world";
       homepage = http://www.bay12games.com/dwarves;
-      license = "unfree-redistributable";
+      license = stdenv.lib.licenses.unfreeRedistributable;
       maintainers = [stdenv.lib.maintainers.roconnor];
   };
 }
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index 4f1b126ac47e8..1d93b24d38ab2 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "eduke32-20130303-3542";
-  
+
   src = fetchurl {
     url = http://dukeworld.duke4.net/eduke32/synthesis/20130303-3542/eduke32_src_20130303-3542.tar.bz2;
     sha256 = "0v1q2bkmpnac5l9x97nnlhrrb95518vmhxx48zv3ncvmpafl1mqc";
   };
-  
+
   buildInputs = [ SDL SDL_mixer libvorbis mesa gtk pkgconfig libvpx flac ]
     ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
-  
+
   NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL";
   NIX_LDFLAGS = "-L${SDL}/lib -lgcc_s";
-  
+
   desktopItem = makeDesktopItem {
     name = "eduke32";
     exec = "eduke32-wrapper";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     sed -i -e "s|/usr/bin/sdl-config|${SDL}/bin/sdl-config|" build/Makefile.shared
   '';
-  
+
   buildPhase = ''
     make OPTLEVEL=0
   '';
@@ -34,34 +34,34 @@ stdenv.mkDerivation rec {
   installPhase = ''
     # Install binaries
     mkdir -p $out/bin
-    cp eduke32 mapster32 $out/bin 
-    
+    cp eduke32 mapster32 $out/bin
+
     # Make wrapper script
     cat > $out/bin/eduke32-wrapper <<EOF
     #!/bin/sh
-    
+
     if [ "$EDUKE32_DATA_DIR" = "" ]
-    then 
+    then
         EDUKE32_DATA_DIR=/var/lib/games/eduke32
     fi
     if [ "$EDUKE32_GRP_FILE" = "" ]
     then
         EDUKE32_GRP_FILE=\$EDUKE32_DATA_DIR/DUKE3D.GRP
     fi
-    
+
     cd \$EDUKE32_DATA_DIR
-    eduke32 -g \$EDUKE32_GRP_FILE    
+    eduke32 -g \$EDUKE32_GRP_FILE
     EOF
     chmod 755 $out/bin/eduke32-wrapper
-    
+
     # Install desktop item
     mkdir -p $out/share/applications
     cp ${desktopItem}/share/applications/* $out/share/applications
   '';
-  
+
   meta = {
     description = "Enhanched port of Duke Nukem 3D for various platforms";
-    license = "GPLv2+ and BUILD license";
+    license = stdenv.lib.licenses.gpl2Plus;
     homepage = http://eduke32.com;
     maintainers = [ stdenv.lib.maintainers.sander ];
   };
diff --git a/pkgs/games/hexen/default.nix b/pkgs/games/hexen/default.nix
index c97ba4d5bf4ea..9e8d3ce0b8e7c 100644
--- a/pkgs/games/hexen/default.nix
+++ b/pkgs/games/hexen/default.nix
@@ -12,6 +12,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.libsdl.org/projects/hexen/;
     description = "Port of Raven Software's popular Hexen 3-D shooter game";
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 70bda820e2ec1..3198ad785f090 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation {
       description = "A sandbox-building game";
       homepage = http://www.minecraft.net;
       maintainers = [ stdenv.lib.maintainers.page ];
-      license = "unfree-redistributable";
+      license = stdenv.lib.licenses.unfreeRedistributable;
   };
 }
diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index 403fc88cb4adb..e913b0bb2a8a6 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -94,7 +94,7 @@ let
       '';
 
       homepage = http://www.simutrans.com/;
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = [ stdenv.lib.maintainers.kkallio ];
       platforms = stdenv.lib.platforms.linux;
     };
diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix
index a61d2f370d04b..7fd13ccab3b08 100644
--- a/pkgs/games/soi/default.nix
+++ b/pkgs/games/soi/default.nix
@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , mesa, SDL, cmake, eigen
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -35,8 +35,8 @@ rec {
 
   setVars = a.noDepEntry ''
     export EIGENDIR=${a.eigen}/include/eigen2
-  ''; 
-      
+  '';
+
   meta = {
     description = "A physics-based puzzle game";
     maintainers = with a.lib.maintainers;
@@ -45,7 +45,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-    license = "free-noncopyleft";
+    license = a.lib.licenses.free;
     broken = true;
   };
   passthru = {
diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix
index b94633d8d3a6f..d7b1c18807696 100644
--- a/pkgs/games/zangband/default.nix
+++ b/pkgs/games/zangband/default.nix
@@ -1,8 +1,8 @@
-a :  
-let 
+a :
+let
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "2.7.3" a; 
+  version = a.lib.attrByPath ["version"] "2.7.3" a;
   buildInputs = with a; [
     ncurses flex bison autoconf automake m4
   ];
@@ -17,7 +17,7 @@ rec {
   configureFlags = [];
 
   preConfigure = a.fullDepEntry (''
-    chmod a+rwX -R . 
+    chmod a+rwX -R .
     sed -re 's/ch(own|grp|mod)/true/' -i lib/*/makefile.zb makefile.in
     sed -e '/FIXED_PATHS/d' -i src/z-config.h
     ./bootstrap
@@ -42,7 +42,7 @@ rec {
       done
       mkdir -p lib/user lib/save
       for i in lib/*/*.raw; do
-        test -L "$i" && rm "$i"; 
+        test -L "$i" && rm "$i";
       done
       for i in $(find lib -type l); do if ! test -e $(readlink "$i"); then rm "$i"; fi; done;
       export ANGBAND_PATH="$PWD"
@@ -53,10 +53,10 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["preConfigure" "doConfigure" "doMakeInstall" "postInstall"];
-      
+
   name = "zangband-" + version;
   meta = {
     description = "rogue-like game";
-    license = "non-free"; # Basically "not for commercial profit"
+    license = a.lib.licenses.unfree;
   };
 }
diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix
index 15ab18495d271..12c76c89790ae 100644
--- a/pkgs/misc/emulators/darcnes/default.nix
+++ b/pkgs/misc/emulators/darcnes/default.nix
@@ -2,7 +2,7 @@
 
 assert stdenv.system == "i686-linux";
 
-stdenv.mkDerivation { 
+stdenv.mkDerivation {
   name = "darcnes-9b0401";
   src = fetchurl {
     url = http://www.dridus.com/~nyef/darcnes/download/dn9b0401.tgz;
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     homepage = http://www.dridus.com/~nyef/darcnes/;
     description = "Multi-System emulator, specially for NES";
     /* Prohibited commercial use, credit required. */
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 
 }
diff --git a/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix
index ec539cb43f95e..3ff15aa1258a4 100644
--- a/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix
+++ b/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
       anglescry advanced launcher for XBMC since device input is
       caught by both XBMC and the retroarch process.
     '';
-    license = "GPL-3";
+    license = stdenv.lib.licenses.gpl3;
   };
 }
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 1f0674c9bca31..e88b41a36ae79 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Kernel module driver for some Broadcom's wireless cards";
     homepage = http://www.broadcom.com/support/802.11/linux_sta.php;
-    license = "unfree-redistributable";
+    license = stdenv.lib.licenses.unfreeRedistributable;
     maintainers = with stdenv.lib.maintainers; [ phreedom vcunat ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
index 9d31fde2f0f85..a01d5d38e9382 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Firmware extractor for cards supported by the b43 kernel module";
     homepage = http://wireless.kernel.org/en/users/Drivers/b43;
-    license = "free-non-copyleft";
+    license = stdenv.lib.licenses.free;
   };
 }
-
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index c989303149547..690b7dcc40f21 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -18,10 +18,10 @@ in stdenv.mkDerivation {
     cp -R hardfp/opt/vc/* $out
     cp opt/vc/LICENCE $out/share/raspberrypi
   '';
-  
+
   meta = {
     description = "Firmware for the Raspberry Pi board";
     homepage = https://github.com/raspberrypi;
-    license = "non-free";
+    license = stdenv.lib.licenses.unfree;
   };
 }
diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix
index 2a796c1b3a9eb..30943d8cd4130 100644
--- a/pkgs/os-specific/linux/sdparm/default.nix
+++ b/pkgs/os-specific/linux/sdparm/default.nix
@@ -11,6 +11,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://sg.danny.cz/sg/sdparm.html;
     description = "A utility to access SCSI device parameters";
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/os-specific/linux/sysfsutils/default.nix
index bf6dafae10ac6..99e6c4ff38023 100644
--- a/pkgs/os-specific/linux/sysfsutils/default.nix
+++ b/pkgs/os-specific/linux/sysfsutils/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
         filesystem in Linux kernel versions 2.5+ that exposes a system's
         device tree.
       '';
-    license = "GPL-v2 / LGPL-v2.1";
+    license = with stdenv.lib.licenses; [ gpl2 lgpl21 ];
   };
 }
diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix
index 9f99d5e9f2096..2dfc8f1b52073 100644
--- a/pkgs/os-specific/linux/udisks-glue/default.nix
+++ b/pkgs/os-specific/linux/udisks-glue/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation {
     description = "A tool to associate udisks events to user-defined actions";
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [pSub];
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index c220d2d2dd0ca..0455c2b8626aa 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://linuxtv.org/projects.php;
     description = "V4L utils and libv4l, that provides common image formats regardless of the v4l device";
-    license = "free"; # The libs are of LGPLv2.1+, some other pieces are GPL.
+    license = stdenv.lib.licenses.free; # The libs are of LGPLv2.1+, some other pieces are GPL.
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix
index 9c88a6462145f..e88f62a1337d3 100644
--- a/pkgs/servers/brickd/default.nix
+++ b/pkgs/servers/brickd/default.nix
@@ -13,7 +13,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "brickd-${version}";
-  
+
   src = fetchgit {
     url = "git://github.com/Tinkerforge/brickd.git";
     rev = "refs/tags/v${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libusb pkgconfig pmutils udev ];
- 
+
   # shell thing didn't work so i replaced it using nix
   prePatch = ''
     substituteInPlace src/brickd/Makefile --replace 'PKG_CONFIG := $(shell which pkg-config 2> /dev/null)' "PKG_CONFIG := $pkgconfig/bin/pkg_config";
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.tinkerforge.com/;
     description = "The Brick Daemon is a daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages.";
     maintainers = [ stdenv.lib.maintainers.qknight ];
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index 88837f9bb4270..cab91409654d4 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://storm-project.net";
     description = "Distributed realtime computation system";
-    license = "Eclipse Public License 1.0";
+    license = stdenv.lib.licenses.epl10;
     maintainers = [ lib.maintainers.vizanto ];
   };
 }
diff --git a/pkgs/servers/http/joseki/default.nix b/pkgs/servers/http/joseki/default.nix
index f42ae81a700da..59f9fd8624d15 100644
--- a/pkgs/servers/http/joseki/default.nix
+++ b/pkgs/servers/http/joseki/default.nix
@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , unzip
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -47,13 +47,13 @@ rec {
   phaseNames = ["doDeploy" "fixScripts"];
 
   fixScripts = a.doPatchShebangs ''$TARGET/bin'';
-      
+
   doDeploy = a.fullDepEntry (''
     ${a.lib.concatStringsSep ";" (map (y : "unzip ${y}") tarballFiles)}
     for i in */; do cp -rTf $i merged; done
     cd merged
-    
-    for i in "lib/"jsp-*/*.jar; do 
+
+    for i in "lib/"jsp-*/*.jar; do
       ln -s "''${i#lib/}" "lib" || true
     done
 
@@ -67,7 +67,7 @@ rec {
       ls "lib/"tdb-[0-9]*.jar | sort | tac | tail -n +2
       ls "lib/"jetty-[0-9]*.jar | sort | tac | tail -n +2
       ls "lib/"jetty-util-[0-9]*.jar | sort | tac | tail -n +2
-    ) | 
+    ) |
       xargs -I @@ mv @@  lib/obsolete
 
     mv lib/slf4j-simple-*.jar lib/obsolete
@@ -106,8 +106,7 @@ rec {
       raskin
     ];
     hydraPlatforms = []; # Builder is just unpacking/mixing what is needed
-    license = "free"; # mix of packages under different licenses
+    license = a.lib.licenses.free; # mix of packages under different licenses
     homepage = "http://openjena.org/";
   };
 }) x
-
diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index a1d9940c8871b..c4a5fcc4284e1 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";
     homepage = http://freeswitch.org/;
-    license = "MPL1.1";
+    license = stdenv.lib.licenses.mpl11;
     maintainers = with stdenv.lib.maintainers; [ viric ];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/servers/x11/xorg/unichrome/default.nix b/pkgs/servers/x11/xorg/unichrome/default.nix
index bc1ebf4eb43e2..b9cedfc4679f2 100644
--- a/pkgs/servers/x11/xorg/unichrome/default.nix
+++ b/pkgs/servers/x11/xorg/unichrome/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://unichrome.sourceforge.net/";
     description = "Xorg video driver for the S3 Unichrome family of integrated graphics devices";
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
     broken = true;
diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix
index c841f8431deb2..34e67e171f4a0 100644
--- a/pkgs/servers/xinetd/default.nix
+++ b/pkgs/servers/xinetd/default.nix
@@ -12,6 +12,6 @@ stdenv.mkDerivation rec {
     description = "Secure replacement for inetd";
     platforms = stdenv.lib.platforms.linux;
     homepage = http://xinetd.org;
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix
index 3ae0920b9a727..ceeadbaafaa7f 100644
--- a/pkgs/tools/X11/virtualgl/default.nix
+++ b/pkgs/tools/X11/virtualgl/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.virtualgl.org/;
     description = "X11 GL rendering in a remote computer with full 3D hw acceleration";
-    license = "free"; # many parts under different free licenses
+    license = stdenv.lib.licenses.free; # many parts under different free licenses
   };
 }
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 52ddb5a0f6b13..a0b3283bb04cd 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "xdg-utils-1.1.0-rc1";
-  
+
   src = fetchurl {
     url = "http://portland.freedesktop.org/download/${name}.tar.gz";
     sha256 = "00lisw4x43sp189lb7dz46j2l09y5v2fijk3d0sxx3mvwj55a1bv";
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
   postInstall = ''
     substituteInPlace $out/bin/xdg-mime --replace /usr/bin/file ${file}/bin/file
   '';
-  
+
   meta = {
     homepage = http://portland.freedesktop.org/wiki/;
     description = "A set of command line tools that assist applications with a variety of desktop integration tasks";
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = [ stdenv.lib.maintainers.eelco ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix
index d8c60c0ec3c8c..41c83344c14ac 100644
--- a/pkgs/tools/admin/sec/default.nix
+++ b/pkgs/tools/admin/sec/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://simple-evcorr.sourceforge.net/";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
     description = "Simple Event Correlator";
     maintainers = [ stdenv.lib.maintainers.tv ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix
index 0852674e8c89c..546f398bec3a0 100644
--- a/pkgs/tools/archivers/unarj/default.nix
+++ b/pkgs/tools/archivers/unarj/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "unarj-2.63a";
-  
+
   src = fetchurl {
     url = http://www.ibiblio.org/pub/Linux/utils/compress/unarj-2.63a.tar.gz;
     sha256 = "0j4sn57fq2p23pcq4ck06pm618q4vq09wgm89ilfn4c9l9x2ky1k";
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Unarchiver of ARJ files";
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index f939c968c44d3..f19a2f0c5d359 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation ({
   name = "unzip-6.0";
-  
+
   src = fetchurl {
     url = mirror://sourceforge/infozip/unzip60.tar.gz;
     sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83";
@@ -27,7 +27,7 @@ stdenv.mkDerivation ({
   meta = {
     homepage = http://www.info-zip.org;
     description = "An extraction utility for archives compressed in .zip format";
-    license = "free"; # http://www.info-zip.org/license.html
+    license = stdenv.lib.licenses.free; # http://www.info-zip.org/license.html
     platforms = stdenv.lib.platforms.all;
   };
 } // (if enableNLS then {
diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix
index 937cf9875132c..3d3ad80e25def 100644
--- a/pkgs/tools/compression/ncompress/default.nix
+++ b/pkgs/tools/compression/ncompress/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://ncompress.sourceforge.net/;
-    license = "public domain";
+    license = stdenv.lib.licenses.publicDomain;
     description = "A fast, simple LZW file compressor";
   };
 }
diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix
index 3732e5b175654..4606d5bf79bdc 100644
--- a/pkgs/tools/compression/zsync/default.nix
+++ b/pkgs/tools/compression/zsync/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://zsync.moria.org.uk/;
     description = "File distribution system using the rsync algorithm";
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; all;
   };
diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix
index 72b50bd4e7735..5dcac6a021592 100644
--- a/pkgs/tools/graphics/dcraw/default.nix
+++ b/pkgs/tools/graphics/dcraw/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.cybercom.net/~dcoffin/dcraw/;
     description = "Decoder for many camera raw picture formats";
-    license = "free";
+    license = stdenv.lib.licenses.free;
     platforms = with stdenv.lib.platforms; allBut cygwin;
     maintainers = [ stdenv.lib.maintainers.urkud ];
   };
diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix
index 531e17b92cbb6..ea729d71be250 100644
--- a/pkgs/tools/graphics/exiftags/default.nix
+++ b/pkgs/tools/graphics/exiftags/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://johnst.org/sw/exiftags/;
     description = "Displays EXIF data from JPEG files";
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [viric];
   };
 }
diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix
index c497d60aef9a1..ee44ff975bb3d 100644
--- a/pkgs/tools/graphics/jhead/default.nix
+++ b/pkgs/tools/graphics/jhead/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.sentex.net/~mwandel/jhead/;
     description = "Exif Jpeg header manipulation tool";
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [viric];
   };
 }
diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
index 0419732949d85..79902582ff41d 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://pmt.sourceforge.net/pngcrush;
     description = "A PNG optimizer";
-    license = "free";
+    license = stdenv.lib.licenses.free;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix
index 79ca54fe0ed59..2ee419a0512f5 100644
--- a/pkgs/tools/graphics/povray/default.nix
+++ b/pkgs/tools/graphics/povray/default.nix
@@ -33,10 +33,10 @@ stdenv.mkDerivation {
       PATH="$TMP/bin:$PATH"
     done
   '';
-  
+
   meta = {
     homepage = http://www.povray.org/;
     description = "Persistence of Vision Raytracer";
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix
index 23c5ec11aaadd..3d1a2aa5bdc0b 100644
--- a/pkgs/tools/graphics/welkin/default.nix
+++ b/pkgs/tools/graphics/welkin/default.nix
@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , jre
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     ["jre"];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -39,7 +39,7 @@ rec {
     sed -e 's@[.]/lib/welkin[.]jar@"'"$out"'/share/welkin/lib/welkin.jar"@' -i "$out/share/welkin/welkin.sh"
     chmod a+x "$out/bin/welkin"
   '' ["minInit" "defEnsureDir"];
-      
+
   meta = {
     description = "An RDF visualizer";
     maintainers = with a.lib.maintainers;
@@ -47,7 +47,7 @@ rec {
       raskin
     ];
     hydraPlatforms = [];
-    license = "free-noncopyleft";
+    license = a.lib.licenses.free;
   };
   passthru = {
     updateInfo = {
@@ -55,4 +55,3 @@ rec {
     };
   };
 }) x
-
diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix
index d2d29aae785dc..4db4f3b1672be 100644
--- a/pkgs/tools/misc/aws-mturk-clt/default.nix
+++ b/pkgs/tools/misc/aws-mturk-clt/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "aws-mturk-clt-1.3.0";
-  
+
   src = fetchurl {
     url = "http://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz";
     sha256 = "06p0cbb5afmqjjlibbw9gb08jp270c7j57lhnf9ld50sm1z021ln";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = https://requester.mturk.com/developer;
     description = "Command line tools for interacting with the Amazon Mechanical Turk";
-    license = "unfree-redistributable"; # Amazon http://aws.amazon.com/asl/
+    license = stdenv.lib.licenses.amazonsl;
 
     longDescription =
       ''
diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix
index 1cbbb9720c9a0..54edaaa033a42 100644
--- a/pkgs/tools/misc/fasd/default.nix
+++ b/pkgs/tools/misc/fasd/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://github.com/clvv/fasd";
     description = "quick command-line access to files and directories for POSIX shells";
-    license = "free"; # https://github.com/clvv/fasd/blob/master/LICENSE
+    license = stdenv.lib.licenses.free; # https://github.com/clvv/fasd/blob/master/LICENSE
 
     longDescription = ''
       Fasd is a command-line productivity booster.
diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix
index 7f22a35e8de11..99c7a056051d7 100644
--- a/pkgs/tools/misc/figlet/default.nix
+++ b/pkgs/tools/misc/figlet/default.nix
@@ -16,9 +16,9 @@ stdenv.mkDerivation {
     makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet"
   '';
 
-  meta = { 
+  meta = {
     description = "Program for making large letters out of ordinary text";
     homepage = http://www.figlet.org/;
-    license = "AFL-2.1";
+    license = stdenv.lib.licenses.afl21;
   };
 }
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index c4e74359b15b1..2d22bdcd3026b 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.flashrom.org";
     description = "Utility for reading, writing, erasing and verifying flash ROM chips";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.funfunctor ];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix
index 08e012128c242..02b8049365498 100644
--- a/pkgs/tools/misc/i3minator/default.nix
+++ b/pkgs/tools/misc/i3minator/default.nix
@@ -32,7 +32,7 @@ in buildPythonPackage rec {
       project is inspired by tmuxinator and uses i3-py.
     '';
     homepage = https://github.com/carlesso/i3minator;
-    license = "WTFPL"; # http://sam.zoy.org/wtfpl/
+    license = stdenv.lib.licenses.wtfpl;
     maintainers = with maintainers; [ iElectric ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix
index 2fa7122393143..08fbba873e5bd 100644
--- a/pkgs/tools/misc/jdiskreport/default.nix
+++ b/pkgs/tools/misc/jdiskreport/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.jgoodies.com/freeware/jdiskreport/;
     description = "A graphical utility to visualize disk usage";
-    license = "unfree-redistributable"; #TODO freedist, libs under BSD-3
+    license = stdenv.lib.licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3
   };
 }
diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix
index 0dad6c2d33f35..ce4f8728a8086 100644
--- a/pkgs/tools/misc/mysql2pgsql/default.nix
+++ b/pkgs/tools/misc/mysql2pgsql/default.nix
@@ -20,9 +20,9 @@ stdenv.mkDerivation {
     mv {,$out/bin/}mysql2psql
   '';
 
-  meta = { 
+  meta = {
     description = "converts mysql dump files to psql loadable files ";
     homepage = http://pgfoundry.org/projects/mysql2pgsql/;
-    license = "BSD-Original";
+    license = stdenv.lib.licenses.bsdOriginal;
   };
 }
diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix
index 909ed0856bb92..3501090c63c85 100644
--- a/pkgs/tools/misc/pk2cmd/default.nix
+++ b/pkgs/tools/misc/pk2cmd/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://www.microchip.com/pickit2;
-    license = "nonfree"; #MicroChip-PK2
+    license = stdenv.lib.licenses.unfree; #MicroChip-PK2
     description = "Microchip PIC programming software for the PICKit2 programmer";
   };
 }
diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix
index 0af7143a320a5..a94cdea1339f9 100644
--- a/pkgs/tools/misc/pv/default.nix
+++ b/pkgs/tools/misc/pv/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.ivarch.com/programs/pv;
     description = "Tool for monitoring the progress of data through a pipeline";
-    license = "Artistic-2";
+    license = stdenv.lib.licenses.artistic2;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; all;
   };
diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix
index f08fe87202f08..3c7aa5261a244 100644
--- a/pkgs/tools/misc/w3c-css-validator/default.nix
+++ b/pkgs/tools/misc/w3c-css-validator/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, sourceFromHead, apacheAnt, tomcat, jre }:
 
-let 
+let
 
   sources =
     [ (fetchurl {
@@ -69,7 +69,7 @@ stdenv.mkDerivation {
     homepage = http://dev.w3.org/cvsweb/2002/css-validator/;
     # dependencies ship their own license files
     # I think all .java files are covered by this license (?)
-    license = "w3c"; # http://www.w3.org/Consortium/Legal/ 
+    license = stdenv.lib.licenses.w3c;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
     broken = true;
diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index df1a7eedeffd4..7d731650288c9 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -3,9 +3,9 @@ x@{builderDefsPackage
   , libSM, libXext
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -35,7 +35,7 @@ rec {
   '' ["minInit" "defEnsureDir"];
 
   goSrcDir = "cd X11";
-      
+
   meta = {
     description = "A clock application that morphs digits when they are changed";
     maintainers = with a.lib.maintainers;
@@ -44,7 +44,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux ++ freebsd;
-    license = "free"; #TODO BSD on Gentoo, looks like MIT
+    license = a.lib.licenses.free; #TODO BSD on Gentoo, looks like MIT
     downloadPage = "http://www.jwz.org/xdaliclock/";
     inherit version;
     updateWalker = true;
diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix
index f6be163bb839c..6b07d5bd2f12e 100644
--- a/pkgs/tools/networking/iodine/default.nix
+++ b/pkgs/tools/networking/iodine/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://code.kryo.se/iodine/;
     description = "Tool to tunnel IPv4 data through a DNS server";
-    license = "ISC";
+    license = stdenv.lib.licenses.isc;
   };
 }
diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix
index dbf393094c8ee..0f75bd44d69b9 100644
--- a/pkgs/tools/networking/netboot/default.nix
+++ b/pkgs/tools/networking/netboot/default.nix
@@ -6,13 +6,13 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/netboot/${name}.tar.gz";
     sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0";
   };
-  
+
   buildInputs = [ yacc lzo db4 ];
 
   meta = with stdenv.lib; {
     description = "Mini PXE server";
     maintainers = [ maintainers.raskin ];
     platforms = ["x86_64-linux"];
-    license = "free-noncopyleft";
+    license = stdenv.lib.licenses.free;
   };
 }
\ No newline at end of file
diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix
index 7288bb7e39b19..858683e3374cb 100644
--- a/pkgs/tools/networking/netkit/tftp/default.nix
+++ b/pkgs/tools/networking/netkit/tftp/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Netkit TFTP client and server";
     homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/";
-    license = "BSD-Original";
+    license = stdenv.lib.licenses.bsdOriginal;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix
index 9050423cfafb8..9a9d41ed6a487 100644
--- a/pkgs/tools/networking/nylon/default.nix
+++ b/pkgs/tools/networking/nylon/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://monkey.org/~marius/nylon;
     description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode";
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index a894de6475882..453b6d8623f3a 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "http://www.openssh.org/";
     description = "An implementation of the SSH protocol";
-    license = "bsd"; # multi BSD GPL-2
+    license = stdenv.lib.licenses.bsd2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ eelco ];
   };
diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix
index 8390c70a4d3b3..1ab3e062ca00c 100644
--- a/pkgs/tools/networking/s3sync/default.nix
+++ b/pkgs/tools/networking/s3sync/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "s3sync-1.2.6";
-  
+
   src = fetchurl {
     url = http://s3.amazonaws.com/ServEdge_pub/s3sync/s3sync.tar.gz; # !!!
     sha256 = "19467mgym0da0hifhkcbivccdima7gkaw3k8q760ilfbwgwxcn7f";
@@ -24,6 +24,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://s3sync.net/;
     description = "Command-line tools to manipulate Amazon S3 buckets";
-    license = "free-non-copyleft"; # some custom as-is in file headers
+    license = stdenv.lib.licenses.free; # some custom as-is in file headers
   };
 }
diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix
index 795c0cfc8ccb4..ce7a4dd64340d 100644
--- a/pkgs/tools/networking/stun/default.nix
+++ b/pkgs/tools/networking/stun/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Stun server and test client";
     homepage = http://sourceforge.net/projects/stun/;
-    license = "Vovida 1.0"; # See any header file.
+    license = stdenv.lib.licenses.vsl10;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix
index 41e227cee7e36..e88c8b7db1f50 100644
--- a/pkgs/tools/security/volatility/default.nix
+++ b/pkgs/tools/security/volatility/default.nix
@@ -17,6 +17,6 @@ buildPythonPackage rec {
     homepage = https://code.google.com/p/volatility;
     description = "advanced memory forensics framework";
     maintainers = with maintainers; [ bosu ];
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix
index 016e2ccda37cd..872dbf0c20e79 100644
--- a/pkgs/tools/system/sleuthkit/default.nix
+++ b/pkgs/tools/system/sleuthkit/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "A forensic/data recovery tool";
     maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = stdenv.lib.platforms.linux;
-    license = "IBM Public License";
+    license = stdenv.lib.licenses.ipl10;
     inherit version;
   };
 }
diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
index 3c0af0157a52e..235dcfe745865 100644
--- a/pkgs/tools/text/wgetpaste/default.nix
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Command-line interface to various pastebins";
     homepage = http://wgetpaste.zlin.dk/;
-    license = "publicDomain";
+    license = stdenv.lib.licenses.publicDomain;
     maintainers = with stdenv.lib.maintainers; [ qknight iElectric ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix
index fd5a5dc5f8e5c..cabb931c44708 100644
--- a/pkgs/tools/text/xml/html-xml-utils/default.nix
+++ b/pkgs/tools/text/xml/html-xml-utils/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Utilities for manipulating HTML and XML files";
     homepage = http://www.w3.org/Tools/HTML-XML-utils/;
-    license = "free-non-copyleft"; #TODO W3C
+    license = stdenv.lib.licenses.w3c;
   };
 }
diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix
index efce7d4de8126..ffd275069da4c 100644
--- a/pkgs/tools/typesetting/biber/default.nix
+++ b/pkgs/tools/typesetting/biber/default.nix
@@ -33,7 +33,7 @@ buildPerlPackage {
 
   meta = {
     description = "Backend for BibLaTeX";
-    license = "perl";
+    license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.ttuegel ];
   };
diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix
index e05e4d16a06ec..ff3bad12bc52e 100644
--- a/pkgs/tools/typesetting/pdfgrep/default.nix
+++ b/pkgs/tools/typesetting/pdfgrep/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "a tool to search text in PDF files";
     homepage = http://pdfgrep.sourceforge.net/;
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [qknight];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/tools/typesetting/tex/disser/default.nix b/pkgs/tools/typesetting/tex/disser/default.nix
index 28bcfcd97fe10..cbbc3844fefb3 100644
--- a/pkgs/tools/typesetting/tex/disser/default.nix
+++ b/pkgs/tools/typesetting/tex/disser/default.nix
@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , unzip, texLive, texLiveCMSuper, texLiveAggregationFun
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     ["texLive" "texLiveCMSuper" "texLiveAggregationFun"];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -36,7 +36,7 @@ rec {
   '';
 
   makeFlags = ["DESTDIR=$out/share/texmf-dist"];
-      
+
   meta = {
     description = "Russian PhD thesis LaTeX package";
     maintainers = with a.lib.maintainers;
@@ -45,7 +45,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux; # platform-independent
-    license = "free"; # LaTeX Project Public License
+    license = a.lib.licenses.free; # LaTeX Project Public License
   };
   passthru = {
     updateInfo = {
@@ -53,4 +53,3 @@ rec {
     };
   };
 }) x
-
diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix
index 69d02a275b341..e3e19d82b4ec0 100644
--- a/pkgs/tools/typesetting/tex/tex4ht/default.nix
+++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://tug.org/tex4ht/";
     description = "a system to convert (La)TeX documents to HTML and various other formats";
-    license = "LPPL-1.2";		# LaTeX Project Public License
+    license = stdenv.lib.licenses.lppl12;
   };
 }
diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix
index 34cfa662c9167..5ffba07087ad7 100644
--- a/pkgs/tools/virtualization/ec2-api-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351;
     description = "Command-line tools to create and manage Amazon EC2 virtual machines";
-    license = "unfree-redistributable"; #Amazon
+    license = stdenv.lib.licenses.amazonsl;
   };
 }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c549332d2fa86..23c4773c8fea7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -61,7 +61,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "A module for merging hierarchies using the C3 algorithm";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -125,7 +125,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ AnyEvent JSONXS ];
     meta = {
       description = "Communicate with the i3 window manager";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -139,7 +139,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ];
     meta = {
       description = "An asynchronous and multi channel Perl AMQP client";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -164,7 +164,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/kazeburo/Apache-LogFormat-Compiler;
       description = "Compile a log format string to perl-code";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -188,7 +188,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/app-cmd;
       description = "Write command line apps with less suffering";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -215,7 +215,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ];
     meta = {
       description = "Manage perl installations in your $HOME";
-      license = "mit";
+      license = stdenv.lib.licenses.mit;
     };
   };
 
@@ -295,7 +295,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ScopeGuard ];
     meta = {
       description = "Call methods on native types";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -323,7 +323,7 @@ let self = _self // overrides; _self = with self; {
       '';
 
       homepage = http://www.aarontrevena.co.uk/opensource/autodia/;
-      license = "GPLv2+";
+      license = stdenv.lib.licenses.gpl2Plus;
 
       maintainers = [ ];
     };
@@ -337,7 +337,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Replace functions with ones that succeed or die with lexical scope";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -352,7 +352,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/autovivification/;
       description = "Lexically disable autovivification";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -371,7 +371,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/B-Hooks-EndOfScope;
       description = "Execute code after a scope finished compilation";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -384,7 +384,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ ExtUtilsDepends ];
     meta = {
       description = "Wrap OP check callbacks";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -424,7 +424,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/ingydotnet/boolean-pm/tree;
       description = "Boolean support for Perl";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -446,7 +446,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ BusinessISBNData URI ];
     meta = {
       description = "Parse and validate ISBNs";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -458,7 +458,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Data pack for Business::ISBN";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -471,7 +471,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ TieCycle ];
     meta = {
       description = "Work with International Standard Music Numbers";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -483,7 +483,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Work with International Standard Serial Numbers";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -580,7 +580,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://metacpan.org/release/Capture-Tiny;
       description = "Capture STDOUT and STDERR from Perl, XS or external programs";
-      license = "apache_2_0";
+      license = stdenv.lib.licenses.asl20;
     };
   };
 
@@ -592,7 +592,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Warns and dies noisily with stack backtraces";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -615,7 +615,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CarpAssert TestException ];
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -628,7 +628,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ TestException ];
     meta = {
       description = "Report errors from perspective of caller of a \"clan\" of modules";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -651,7 +651,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CatalystRuntime ClassInspector ConfigGeneral DataSerializer DataTaxi FreezeThaw HTMLParser JSONXS LWPUserAgent Moose MROCompat namespaceautoclean ParamsValidate PHPSerialization URIFind XMLSimple YAMLSyck ];
     meta = {
       description = "Automated REST Method Dispatching";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
   };
@@ -666,7 +666,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CatalystPluginAuthentication CatalystRuntime ClassAccessorFast DataUUID StringEscape URI ];
     meta = {
       description = "HTTP Basic and Digest authentication";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -692,7 +692,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication CatalystRuntime DBIxClass ListMoreUtils Moose namespaceautoclean TryTiny ];
     meta = {
       description = "A storage class for Catalyst Authentication using DBIx::Class";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -731,7 +731,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://dev.catalyst.perl.org/;
       description = "Catalyst Development Tools";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
   };
@@ -745,7 +745,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Moose TextSimpleTable ];
     meta = {
       description = "Regex DispatchType";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -775,7 +775,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "The Catalyst developer's manual";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -789,7 +789,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CarpClan CatalystComponentInstancePerContext CatalystRuntime CatalystXComponentTraits DBIxClass DBIxClassSchemaLoader HashMerge ListMoreUtils ModuleRuntime Moose MooseXMarkAsMethods MooseXNonMoose MooseXTypes MooseXTypesLoadableClass TieIxHash TryTiny namespaceautoclean namespaceclean ];
     meta = {
       description = "DBIx::Class::Schema Model Class";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
   };
@@ -805,7 +805,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://dev.catalyst.perl.org/;
       description = "The Catalyst Framework Runtime";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
   };
@@ -820,7 +820,7 @@ let self = _self // overrides; _self = with self; {
     doCheck = false;
     meta = {
       description = "Request logging from within Catalyst";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
   };
@@ -835,7 +835,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CatalystPluginSession CatalystRuntime ClassInspector Moose MooseXEmulateClassAccessorFast MROCompat namespaceautoclean StringRewritePrefix TryTiny ];
     meta = {
       description = "Infrastructure plugin for the Catalyst authentication framework";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -858,7 +858,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CatalystPluginAuthentication CatalystRuntime SetObject UNIVERSALisa ];
     meta = {
       description = "Role based authorization for Catalyst based on Catalyst::Plugin::Authentication";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
   };
@@ -873,7 +873,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CatalystRuntime MROCompat TaskWeaken ];
     meta = {
       description = "Flexible caching support for Catalyst.";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -889,7 +889,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ClassAccessorFast HTTPMessage MROCompat ];
     meta = {
       description = "HTTP/1.1 cache validators for Catalyst";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -927,7 +927,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CatalystRuntime ClassDataInheritable LWP TryTiny URI ];
     meta = {
       description = "Unicode aware Catalyst";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -952,7 +952,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CatalystRuntime Moose MooseXEmulateClassAccessorFast MROCompat namespaceclean ObjectSignature ];
     meta = {
       description = "Generic Session plugin - ties together server side storage and client side state required to maintain session data";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -991,7 +991,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CatalystRuntime DevelStackTrace MROCompat ];
     meta = {
       description = "Display a stack trace on the debug screen";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1005,7 +1005,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CatalystRuntime MIMETypes Moose MooseXTypes namespaceautoclean ];
     meta = {
       description = "Make serving static pages painless";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1029,7 +1029,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CatalystRuntime JSONAny MROCompat YAML ];
     meta = {
       description = "JSON view for your data";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
   };
@@ -1043,7 +1043,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CatalystRuntime ClassAccessor MROCompat PathClass TemplateToolkit TemplateTimer ];
     meta = {
       description = "Template View Class";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
   };
@@ -1088,7 +1088,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CatalystRuntime Moose namespaceautoclean Starman ];
     meta = {
       description = "Replace the development server with Starman";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
   };
@@ -1141,7 +1141,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ IOStringy ];
     meta = {
       description = "A Simple totally OO CGI interface that is CGI.pm compliant";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1165,7 +1165,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd";
     };
     meta = {
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1185,7 +1185,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd";
     };
     meta = {
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -1201,7 +1201,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ModuleRuntime ];
     meta = {
       description = "Lets you build groups of accessors";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1230,7 +1230,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ AlgorithmC3 ];
     meta = {
       description = "A pragma to use the C3 method resolution order algortihm";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1245,7 +1245,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/Class-C3-Adopt-NEXT;
       description = "Make NEXT suck less";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1258,7 +1258,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestException ];
     propagatedBuildInputs = [ ClassC3 ClassInspector MROCompat ];
     meta = {
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1294,7 +1294,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Get information about a class and its structure";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1333,7 +1333,7 @@ let self = _self // overrides; _self = with self; {
     preConfigure = "patchShebangs .";
     meta = {
       description = "A module for creating generic methods";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1347,7 +1347,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/sartak/Class-Method-Modifiers/tree;
       description = "Provides Moose-like method modifiers";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1389,7 +1389,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "A working (require \"Class::Name\") and more";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1404,7 +1404,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "XS implementation of parts of Class::Load";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -1425,7 +1425,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Generate fast XS accessors without runtime compilation";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1437,7 +1437,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Recursively copy Perl datatypes";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1467,7 +1467,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Low-Level Interface to bzip2 compression library";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1504,7 +1504,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CaptureTiny ];
     meta = {
       description = "A module to implement some of AutoConf macros in pure perl.";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1515,7 +1515,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "07rmabdh21ljyc9yy6gpjg4w1y0lzwz8daljf0jv2g521hpdfdwr";
     };
     meta = {
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1529,7 +1529,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/Config-INI;
       description = "Simple .ini-file format";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1544,7 +1544,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/config-mvp;
       description = "Multivalue-property package-oriented configuration";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1558,7 +1558,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/Config-MVP-Reader-INI;
       description = "An MVP config reader for .ini files";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1649,7 +1649,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Read and write Changes files";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1663,7 +1663,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/Perl-Toolchain-Gang/CPAN-Meta;
       description = "The distribution metadata for a CPAN dist";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1677,7 +1677,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CPANMeta CPANMetaRequirements ];
     meta = {
       description = "Verify requirements in a CPAN::Meta object";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1690,7 +1690,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/dagolden/CPAN-Meta-Requirements;
       description = "A set of version requirements for a CPAN dist";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1705,7 +1705,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/dagolden/CPAN-Meta-YAML;
       description = "Read and write a subset of YAML for CPAN Meta files";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1718,7 +1718,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/bingos/cpan-perl-releases;
       description = "Mapping Perl releases on CPAN to the location of the tarballs";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1732,7 +1732,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/cpan-uploader;
       description = "Upload things to the CPAN";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1809,7 +1809,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/Crypt-Random-Source;
       description = "Get weak or strong random data from pluggable sources";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -1912,7 +1912,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Temporary changing working directory (chdir)";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -1925,7 +1925,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestRequires ];
     meta = {
       description = "Polymorphic data cloning";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -1948,7 +1948,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Pretty printing of data structures";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2004,7 +2004,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://github.com/rjbs/data-optlist;
       description = "Parse and validate simple name/value option pairs";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2027,7 +2027,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/data-section;
       description = "Read multiple hunks of data out of your DATA section";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2039,7 +2039,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Modules that serialize data structures";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2054,7 +2054,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/Data-Stream-Bulk;
       description = "N at a time iteration API";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2086,7 +2086,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://metacpan.org/release/Data-UUID-MT;
       description = "Fast random UUID generator using the Mersenne Twister algorithm";
-      license = "apache_2_0";
+      license = stdenv.lib.licenses.asl20;
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -2149,7 +2149,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ];
     meta = {
       description = "A date and time object";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -2184,7 +2184,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ClassFactoryUtil DateTime DateTimeFormatStrptime ParamsValidate ];
     meta = {
       description = "Create DateTime parser classes and objects";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -2197,7 +2197,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ListMoreUtils TestMockTime ];
     meta = {
       description = "DateTime::Format::Flexible - Flexibly parse strings and turn them into DateTime objects";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2210,7 +2210,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DateTime HTTPDate ];
     meta = {
       description = "Date conversion routines";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2223,7 +2223,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DateTime DateTimeEventICal DateTimeSet DateTimeTimeZone ParamsValidate ];
     meta = {
       description = "Parse and format iCal datetime and duration strings";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2236,7 +2236,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ];
     meta = {
       description = "Parses ISO8601 formats";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -2252,7 +2252,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Clone DateTime DateTimeTimeZone ListMoreUtils ParamsValidate boolean ];
     meta = {
       description = "Create machine readable date/time with natural parsing logic";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2265,7 +2265,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ];
     meta = {
       description = "Parse and format PostgreSQL dates and times";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -2280,7 +2280,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone ParamsValidate ];
     meta = {
       description = "Parse and format strp and strf time patterns";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -2294,7 +2294,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://datetime.perl.org/;
       description = "Localization support for DateTime.pm";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2321,7 +2321,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate ];
     meta = {
       description = "Time zone object base class and factory";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2335,7 +2335,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DateTime DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ];
     meta = {
       description = "Parse a date/time string using the best method available";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2348,7 +2348,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ClassISA DevelStackTrace StringUtil TermReadKey TextTabularDisplay TieIxHash ];
     meta = {
       description = "Debug::ShowStuff - A collection of handy debugging routines for displaying the values of variables with a minimum of coding.";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2361,7 +2361,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ PadWalker ];
     meta = {
       description = "Meatier versions of C<caller>";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2384,7 +2384,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/bingos/devel-patchperl;
       description = "Patch perl source a la Devel::PPPort's buildperl.pl";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2398,7 +2398,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/timbunce/devel-sizeme;
       description = "Unknown";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2410,7 +2410,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Print out each line before it is executed (like sh -x)";
-      license = "Public Domain";
+      license = stdenv.lib.licenses.publicDomain;
     };
   };
 
@@ -2443,7 +2443,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://dbi.perl.org/;
       description = "Database independent interface for Perl";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2458,7 +2458,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://www.dbix-class.org/;
       description = "Extensible and flexible object <-> relational mapper";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2471,7 +2471,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ TestDeep TestFatal DBIxClass LinguaENInflect StringCamelCase ];
     meta = {
       description = "Sugar for your favorite ORM, DBIx::Class";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2485,7 +2485,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CarpClan DBIxClass ];
     meta = {
       description = "Cursor class with built-in caching support";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2507,7 +2507,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DBIxClassCandy TestDeep CarpClan DBDSQLite ];
     meta = {
       description = "Simplify the common case stuff for DBIx::Class.";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2520,7 +2520,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DBIxClass ];
     meta = {
       description = "Introspect many-to-many relationships";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2534,7 +2534,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DataDump DBIxClass HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger ListMoreUtils MROCompat namespaceclean ScopeGuard StringCamelCase StringToIdentifierEN SubName TaskWeaken TryTiny ];
     meta = {
       description = "Create a DBIx::Class::Schema based on a database";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2549,7 +2549,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/DBIx-Connector/;
       description = "Fast, safe DBI connection and transaction management";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -2592,7 +2592,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ];
     meta = {
       description = "Adding keywords to perl, in perl";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -2608,7 +2608,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ExtUtilsConfig ];
     meta = {
       description = "Find the path to your perl";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2621,7 +2621,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ SubExporterProgressive ];
     meta = {
       homepage = http://search.cpan.org/dist/Devel-GlobalDestruction;
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2655,7 +2655,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/Devel-StackTrace;
       description = "An object representing a stack trace";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -2668,7 +2668,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DevelStackTrace ];
     meta = {
       description = "Displays stack trace in HTML";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2699,7 +2699,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Keyed-Hashing for Message Authentication";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2711,7 +2711,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Keyed-Hashing for Message Authentication";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -2749,7 +2749,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Perl interface to the SHA-1 algorithm";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2764,7 +2764,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Declare version conflicts for your dist";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2779,7 +2779,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://dzil.org/;
       description = "Distribution builder; installer not included!";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
     doCheck = false;
   };
@@ -2795,7 +2795,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/Dist-Zilla-PluginBundle-TestingMania/;
       description = "Test your dist with every testing plugin conceivable";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2808,7 +2808,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DistZilla ];
     meta = {
       description = "Dist::Zilla with Changes check";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2822,7 +2822,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/creaktive/Dist-Zilla-Plugin-MojibakeTests;
       description = "Release tests for source encoding";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2836,7 +2836,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-NoTabsTests;
       description = "Release tests making sure hard tabs aren't used";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2851,7 +2851,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/Dist-Zilla-Plugin-PodWeaver;
       description = "Weave your Pod together from configuration and Dist::Zilla";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2866,7 +2866,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeAnyFromPod;
       description = "Automatically convert POD to a README in any format for Dist::Zilla";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2881,7 +2881,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeMarkdownFromPod;
       description = "Automatically convert POD to a README.mkdn for Dist::Zilla";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2896,7 +2896,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-CPAN-Changes/;
       description = "Release tests for your changelog";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2911,7 +2911,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON;
       description = "Release tests for your META.json";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2926,7 +2926,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Compile/;
       description = "Common tests to check syntax of your modules";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2941,7 +2941,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-DistManifest/;
       description = "Release tests for the manifest";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2956,7 +2956,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-EOL/;
       description = "Author tests making sure correct line endings are used";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -2971,7 +2971,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Kwalitee;
       description = "Release tests for kwalitee";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -2986,7 +2986,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-MinimumVersion/;
       description = "Release tests for minimum required versions";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3001,7 +3001,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Perl-Critic/;
       description = "Tests to check your code against best practices";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3015,7 +3015,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck;
       description = "Add release tests for POD links";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3030,7 +3030,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Portability/;
       description = "Release tests for portability";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3045,7 +3045,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Synopsis/;
       description = "Release tests for synopses";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3060,7 +3060,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-UnusedVars/;
       description = "Release tests for unused variables";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3075,7 +3075,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Version/;
       description = "Release Test::Version tests";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -3087,7 +3087,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ EmailSimple MROCompat ];
     meta = {
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3100,7 +3100,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "RFC 2822 Address Parsing";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3112,7 +3112,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Produce RFC 8822 date strings";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3125,7 +3125,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ EmailAddress ];
     meta = {
       description = "Generate world unique message-ids";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -3139,7 +3139,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ EmailMessageID EmailMIMEContentType EmailMIMEEncodings EmailSimple MIMETypes ];
     meta = {
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -3153,7 +3153,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Parse a MIME Content-Type Header";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -3166,7 +3166,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "0fac34g44sn0l59wim68zrhih1mvlh1rxvyn3gc5pviaiz028lyy";
     };
     meta = {
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -3194,7 +3194,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/email-sender;
       description = "A library for sending email";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3207,7 +3207,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ EmailDateFormat ];
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3237,7 +3237,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "EucJP-ascii - An eucJP-open mapping";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3249,7 +3249,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Extra sets of Chinese encodings";
-      license = "mit";
+      license = stdenv.lib.licenses.mit;
     };
   };
 
@@ -3302,7 +3302,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Safely and cleanly create closures via string eval";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3367,7 +3367,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://open-exodus.net/projects/Exporter-Declare;
       description = "Exporting done right";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -3380,7 +3380,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "01g6a2ixgdi825v0l4ny3vx4chzsfxirka741x0i057cf6y5ciir";
     };
     meta = {
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3401,7 +3401,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "A wrapper for perl's configuration";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3421,7 +3421,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "0s935hmxjl6md47i80abcfaghqwhnv0ikzzqln80w4ydhg5qn9a5";
     };
     meta = {
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -3435,7 +3435,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Various portability utilities for module builders";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3448,7 +3448,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ExtUtilsConfig ];
     meta = {
       description = "Build.PL install path logic made easy";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3460,7 +3460,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "A tool to build C libraries.";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3475,7 +3475,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://metacpan.org/release/ExtUtils-MakeMaker;
       description = "Create a module Makefile";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3578,7 +3578,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://open-exodus.net/projects/Fennec-Lite;
       description = "Minimalist Fennec, the commonly used bits";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -3669,7 +3669,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ FileFindRule ParamsUtil ];
     meta = {
       description = "Common rules for searching for Perl things";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3682,7 +3682,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ FileWhich ];
     meta = {
       description = "Find your home and other directories on any platform";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
     preCheck = "export HOME=$TMPDIR";
   };
@@ -3743,7 +3743,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://metacpan.org/release/File-pushd;
       description = "Change directory temporarily for a limited scope";
-      license = "apache";
+      license = stdenv.lib.licenses.asl20;
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -3767,7 +3767,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://github.com/ingydotnet/file-share-pm/tree;
       description = "Extend File::ShareDir to Local Libraries";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -3782,7 +3782,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ClassInspector ];
     meta = {
       description = "Locate per-dist and per-module shared files";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3794,7 +3794,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Install shared files";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -3808,7 +3808,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Simple and dumb file system watcher";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3822,7 +3822,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Simple and Efficient Reading/Writing/Modifying of Complete Files";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
   };
@@ -3875,7 +3875,7 @@ let self = _self // overrides; _self = with self; {
     doCheck = false;
     meta = {
       description = "Extensions and convenience methods to manage background processes";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3922,7 +3922,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ GD ];
     meta = {
       description = "Security image (captcha) generator";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3954,7 +3954,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/Getopt-Long-Descriptive;
       description = "Getopt::Long, but simpler and more powerful";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -3982,7 +3982,7 @@ let self = _self // overrides; _self = with self; {
       [ ../development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch ];
     meta = {
       description = "Simple interface to Google Protocol Buffers";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4066,7 +4066,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Clone ];
     meta = {
       description = "Recursively merge two or more hashes, simply";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4078,7 +4078,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Store multiple values per key";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4145,7 +4145,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ HTMLParser HTTPMessage URI ];
     meta = {
       description = "Class that represents an HTML form element";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4181,7 +4181,7 @@ let self = _self // overrides; _self = with self; {
       description = "HTML forms using Moose";
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4194,7 +4194,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ HTMLTagset ];
     meta = {
       description = "HTML parser class";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4274,7 +4274,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Work with HTML in a DOM-like tree structure";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4287,7 +4287,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ HTMLTree XMLXPathEngine ];
     meta = {
       description = "Add XPath support to HTML::TreeBuilder";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -4317,7 +4317,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ HTTPMessage ];
     meta = {
       description = "HTTP Body Parser";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4330,7 +4330,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ HTTPDate HTTPMessage ];
     meta = {
       description = "HTTP cookie jars";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4343,7 +4343,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ HTTPDate HTTPMessage LWPMediaTypes ];
     meta = {
       description = "A simple http server class";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4355,7 +4355,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Date conversion routines";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4384,7 +4384,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ];
     meta = {
       description = "HTTP style messages";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4397,7 +4397,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ HTTPMessage ];
     meta = {
       description = "Choose a variant to serve";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4439,7 +4439,7 @@ let self = _self // overrides; _self = with self; {
     };
     doCheck = false;
     meta = {
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4468,7 +4468,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ModuleRuntime ];
     meta = {
       description = "Import packages into other packages";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4482,7 +4482,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/ingydotnet/io-all-pm/tree;
       description = "IO::All of it to Graham and Damian!";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -4506,7 +4506,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "IO Interface to compressed data files/buffers";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
     doCheck = !stdenv.isDarwin;
@@ -4530,7 +4530,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Open an HTML file with automatic charset detection";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4542,7 +4542,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Utilities for interactive I/O";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4582,7 +4582,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/noxxi/p5-io-socket-ssl;
       description = "Nearly transparent SSL encapsulation for IO::Socket::INET";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
     doCheck = false; # tries to connect to facebook.com etc.
   };
@@ -4614,7 +4614,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/io-tiecombine;
       description = "Produce tied (and other) separate but combined variables";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -4638,7 +4638,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "System() and background procs w/ piping, redirs, ptys (Unix, Win32)";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
   };
@@ -4711,7 +4711,7 @@ let self = _self // overrides; _self = with self; {
         for immediate access from Perl.
       '';
 
-      license = "Artistic";
+      license = stdenv.lib.licenses.artistic2;
 
       maintainers = [ ];
     };
@@ -4735,7 +4735,7 @@ let self = _self // overrides; _self = with self; {
 
     meta = {
       description = "Write Perl Subroutines in C";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4765,7 +4765,7 @@ let self = _self // overrides; _self = with self; {
         available to the Perl program as if they had been written in Perl.
       '';
 
-      license = "Artistic";
+      license = stdenv.lib.licenses.artistic2;
 
       maintainers = [ ];
     };
@@ -4788,7 +4788,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestPod ];
     meta = {
       description = "JSON (JavaScript Object Notation) encoder/decoder";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4801,7 +4801,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ JSON ];
     meta = {
       description = "Wrapper Class for the various JSON classes";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4815,7 +4815,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ JSONPP ];
     meta = {
       description = "Use L<Cpanel::JSON::XS> with a fallback to L<JSON::XS> and L<JSON::PP>";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4827,7 +4827,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "JSON::XS compatible pure-Perl module";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4839,7 +4839,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Helper module in using JSON::PP in Perl 5.6";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4919,7 +4919,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ HTMLParser HTMLTagset LinguaStem /* MemoizeExpireLRU */ ];
     meta = {
       description = "Part-of-speech tagger for English natural language processing";
-      license = "gpl_3";
+      license = stdenv.lib.licenses.gpl3;
     };
   };
 
@@ -4950,7 +4950,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ListMoreUtils ];
     meta = {
       description = "Combines List::Util and List::MoreUtils in one bite-sized package";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -4972,7 +4972,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Provide the stuff missing in List::Util";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5045,7 +5045,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Create and use a local lib/ for perl modules with PERL5LIB";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5067,7 +5067,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ];
     meta = {
       description = "Simple logging interface with a contextual log";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -5082,7 +5082,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ClassLoad ParamsValidate ];
     meta = {
       description = "Dispatches messages to one or more outputs";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -5115,7 +5115,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/log-dispatch-array;
       description = "Log events to an array (reference)";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5130,7 +5130,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/log-dispatchouli;
       description = "A simple wrapper around Log::Dispatch";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5144,7 +5144,7 @@ let self = _self // overrides; _self = with self; {
     doCheck = false; # tries to start a daemon
     meta = {
       description = "The World-Wide Web library for Perl";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     };
   };
@@ -5157,7 +5157,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Guess media type for a file or a URL";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5174,7 +5174,7 @@ let self = _self // overrides; _self = with self; {
     doCheck = false; # tries to connect to https://www.apache.org/.
     meta = {
       description = "Provide https support for LWP::UserAgent";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
   };
@@ -5188,7 +5188,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPNegotiate HTTPMessage LWPMediaTypes NetHTTP URI WWWRobotRules ];
     meta = {
       description = "The World-Wide Web library for Perl";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5369,7 +5369,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ AnyMoose CryptRandomSource MathRandomISAAC ];
     meta = {
       description = "Cryptographically-secure, cross-platform replacement for rand()";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -5392,7 +5392,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ FennecLite TestException ];
     meta = {
       description = "Tools for creating Meta objects to track custom metrics";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -5407,7 +5407,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DevelDeclare ];
     meta = {
       description = "Basic method declarations with signatures, without source filters";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -5446,7 +5446,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Charset Information for MIME";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5467,7 +5467,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Definition of MIME types";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5481,7 +5481,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/mixin-linewise;
       description = "Write your linewise code for handles; this does the rest";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5495,7 +5495,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/chromatic/Modern-Perl;
       description = "Enable all of the features of Modern Perl with one import";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5508,7 +5508,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ CPANMeta ExtUtilsCBuilder ];
     meta = {
       description = "Build and install Perl modules";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5522,7 +5522,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP TestHarness ];
     meta = {
       description = "A tiny replacement for Module::Build";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5544,7 +5544,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ FileCopyRecursive CwdGuard CaptureTiny ];
     meta = {
       description = "A Module::Build class for building XS modules";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5557,7 +5557,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://dev.perl.org/;
       description = "What modules shipped with versions of perl";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5569,7 +5569,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Find and use installed modules in a (sub)category";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5584,7 +5584,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Loads one of several alternate underlying implementations for a module";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -5597,7 +5597,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestPod TestPodCoverage ];
     meta = {
       description = "Information about Perl modules";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5611,7 +5611,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ FileRemove LWPUserAgent ModuleScanDeps PARDist YAMLTiny ];
     meta = {
       description = "Standalone, extensible Perl module installer";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5624,7 +5624,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ModuleInstall ];
     meta = {
       description = "Declare author-only dependencies";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -5639,7 +5639,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ModuleInstall ];
     meta = {
       description = "Designate tests only run by module authors";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -5655,7 +5655,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ParamsUtil ];
     meta = {
       description = "Parse and examine a Perl distribution MANIFEST file";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5677,7 +5677,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ DevelFindPerl ];
     meta = {
       description = "Get the full path to a locally installed module";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5693,7 +5693,7 @@ let self = _self // overrides; _self = with self; {
     ];
     meta = {
       description = "Automatically give your module the ability to have plugins";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5715,7 +5715,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Runtime module handling";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5730,7 +5730,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/karenetheridge/Module-Runtime-Conflicts;
       description = "Provide information on conflicts for Module::Runtime";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5742,7 +5742,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Recursively scan Perl code for dependencies";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5755,7 +5755,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ ModuleBuild ];
     meta = {
       description = "Module name tools and transformations";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5781,7 +5781,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://mojolicio.us;
       description = "Real-time web framework";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -5795,7 +5795,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ImportInto ModuleRuntime RoleTiny strictures ];
     meta = {
       description = "Minimalist Object Orientation (with Moose compatiblity)";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5810,7 +5810,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://moose.perl.org/;
       description = "A postmodern object system for Perl 5";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = [ maintainers.eelco ];
       platforms   = stdenv.lib.platforms.linux;
     };
@@ -5835,7 +5835,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Moose SyntaxKeywordJunction autobox ];
     meta = {
       description = "Autoboxed wrappers for Native Perl datatypes";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5850,7 +5850,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/MooseX-ABC;
       description = "Abstract base classes for Moose";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -5877,7 +5877,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/MooseX-App-Cmd;
       description = "Mashes up MooseX::Getopt and App::Cmd";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -5902,7 +5902,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Moose ];
     meta = {
       description = "Extend your attribute interfaces (deprecated)";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -5931,7 +5931,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathTiny TryTiny namespaceautoclean ];
     meta = {
       description = "An abstract Moose role for setting attributes from a configfile";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -5947,7 +5947,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Moose MooseXGetopt MooseXTypesPathClass ];
     meta = {
       description = "Role for daemonizing your Moose based application";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5961,7 +5961,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Moose namespaceclean ];
     meta = {
       description = "Emulate Class::Accessor::Fast behavior using Moose attributes";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5976,7 +5976,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/moose/MooseX-Getopt;
       description = "A Moose role for processing command line options";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -5991,7 +5991,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/pshangov/moosex-has-options;
       description = "Succinct options for Moose";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -6008,7 +6008,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/kentfredric/MooseX-Has-Sugar;
       description = "Sugar Syntax for moose 'has' fields";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6023,7 +6023,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/karenetheridge/moosex-lazyrequire;
       description = "Required attributes which fail only when trying to use them";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6038,7 +6038,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/MooseX-MarkAsMethods/;
       description = "Mark overload code symbols as methods";
-      license = "lgpl_2_1";
+      license = stdenv.lib.licenses.lgpl21;
     };
   };
 
@@ -6053,7 +6053,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/karenetheridge/moosex-methodattributes;
       description = "Code attribute introspection";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6067,7 +6067,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ListMoreUtils Moose ];
     meta = {
       description = "Easy subclassing of non-Moose classes";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6082,7 +6082,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/moosex-oneargnew;
       description = "Teach ->new to accept single, non-hashref arguments";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6106,7 +6106,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DevelCaller Moose ParamsValidate SubExporter ];
     meta = {
       description = "An extension of Params::Validate using Moose's types";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6121,7 +6121,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://github.com/sartak/MooseX-Role-Parameterized/tree;
       description = "Roles with composition parameters";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6136,7 +6136,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/MooseX-Role-WithOverloading;
       description = "Roles which support overloading";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6196,7 +6196,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Moose namespaceautoclean ];
     meta = {
       description = "Make your object constructors blow up on unknown attributes";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -6232,7 +6232,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Organise your Moose types in libraries";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6273,7 +6273,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DateTime DateTimeXEasy Moose MooseXTypes MooseXTypesDateTime TimeDurationParse namespaceclean ];
     meta = {
       description = "Extensions to MooseX::Types::DateTime";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6290,7 +6290,7 @@ let self = _self // overrides; _self = with self; {
       platforms   = stdenv.lib.platforms.unix;
       homepage = https://github.com/moose/MooseX-Types-LoadableClass;
       description = "ClassName type constraint with coercion to load the class";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6303,7 +6303,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ClassMOP Moose MooseXTypes PathClass ];
     meta = {
       description = "A Path::Class type library for Moose";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6318,7 +6318,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/karenetheridge/moosex-types-path-tiny;
       description = "Path::Tiny types and coercions for Moose";
-      license = "apache";
+      license = stdenv.lib.licenses.asl20;
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -6333,7 +6333,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ MooseXTypes ParamsUtil ];
     meta = {
       description = "Moose types that check against Perl syntax";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6348,7 +6348,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/dagolden/moosex-types-stringlike;
       description = "Moose type constraints for strings or string-like objects";
-      license = "apache";
+      license = stdenv.lib.licenses.asl20;
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -6365,7 +6365,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/MooseX-Types-Structured;
       description = "MooseX::Types::Structured - Structured Type Constraints for Moose";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -6406,7 +6406,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ AnyMoose ];
     meta = {
       description = "Extend attribute interfaces for Mouse";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6430,7 +6430,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Mro::* interface compatibility for Perls < 5.9.5";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6469,7 +6469,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/moose/namespace-autoclean;
       description = "Keep imports out of your namespace";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6483,7 +6483,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/namespace-clean;
       description = "Keep imports and functions out of your namespace";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6556,7 +6556,7 @@ let self = _self // overrides; _self = with self; {
       [ ../development/perl-modules/net-amazon-s3-credentials-provider.patch ];
     meta = {
       description = "Use the Amazon S3 - Simple Storage Service";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
   };
@@ -6570,7 +6570,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ JSON ];
     meta = {
       description = "Manage Amazon S3 policies for HTTP POST forms";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -6587,7 +6587,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ClassAccessor ClassDataInheritable XMLLibXML ];
     meta = {
       description = "Advanced Message Queue Protocol (de)serialization and representation";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -6601,7 +6601,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Manipulate IPv4/IPv6 netblocks in CIDR notation";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.unix;
       maintainers = [ maintainers.bjornfor ];
     };
@@ -6618,7 +6618,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/metabrainz/CoverArtArchive;
       description = "Query the coverartarchive.org";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -6651,7 +6651,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Low-level HTTP connection (client)";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6685,7 +6685,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ClassAccessor ClassDataInheritable DigestHMAC DigestSHA1 LWPUserAgent URI ];
     meta = {
       description = "An implementation of the OAuth protocol";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6699,7 +6699,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ AnyEventRabbitMQ ConfigAny Coro JSONXS ListMoreUtils Moose MooseXAppCmd MooseXAttributeHelpers MooseXConfigFromFile ];
     meta = {
       description = "An Asynchronous and multi channel Perl AMQP client";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -6780,7 +6780,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://github.com/semifor/Net-Twitter-Lite;
       description = "A perl interface to the Twitter API";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6809,7 +6809,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ExceptionClass ];
     meta = {
       description = "Comprehensive inside-out object support module";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -6860,7 +6860,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Manage deprecation warnings for your distribution";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -6875,7 +6875,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/Package-Stash;
       description = "Routines for manipulating stashes";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6889,7 +6889,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/Package-Stash-XS;
       description = "Faster and more correct implementation of the Package::Stash API";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6911,7 +6911,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Simple, compact and correct param-checking functions";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6926,7 +6926,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Validate method/function parameters";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -6959,7 +6959,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/Perl-Toolchain-Gang/Parse-CPAN-Meta;
       description = "Parse META.yml and META.json CPAN metadata files";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6979,7 +6979,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Cross-platform path specification manipulation";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -6994,7 +6994,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://metacpan.org/release/Path-Tiny;
       description = "File path utility";
-      license = "apache";
+      license = stdenv.lib.licenses.asl20;
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -7027,7 +7027,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://perlcritic.com;
       description = "Critique Perl source code for best-practices";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7108,7 +7108,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/plack/Plack;
       description = "Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7122,7 +7122,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ClassMethodModifiers DataDump FileShareDir ModuleVersions Plack TextMicroTemplate ];
     meta = {
       description = "Display information about the current request/response";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -7139,7 +7139,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/Sweet-kid/Plack-Middleware-FixMissingBodyInRedirect;
       description = "Plack::Middleware which sets body for redirect response, if it's not already set";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7153,7 +7153,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/Plack-Middleware-MethodOverride/;
       description = "Override REST methods to Plack apps via POST";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7168,7 +7168,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/Sweet-kid/Plack-Middleware-RemoveRedundantBody;
       description = "Plack::Middleware which sets removes body for HTTP response if it's not required";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7181,7 +7181,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Plack ];
     meta = {
       description = "Supports app to run as a reverse proxy backend";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7194,7 +7194,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ HTTPMessage LWPUserAgent Plack TestTCP URI ];
     meta = {
       description = "Run HTTP tests on external live servers";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7208,7 +7208,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Clone IOString ListMoreUtils ParamsUtil TaskWeaken ];
     meta = {
       description = "Parse, Analyze and Manipulate Perl (without perl)";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
     doCheck = false;
   };
@@ -7222,7 +7222,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ListMoreUtils PPI TaskWeaken ];
     meta = {
       description = "Parse regular expressions";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7236,7 +7236,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ExceptionClass PPI Readonly TaskWeaken ];
     meta = {
       description = "Extensions to L<PPI|PPI>";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7285,7 +7285,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ FileFindRule FileFindRulePerl PPI PPIxRegexp ParamsUtil PerlCritic ];
     meta = {
       description = "Find a minimum required version of perl for Perl code";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7300,7 +7300,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/perl-prereqscanner;
       description = "A tool to scan your Perl code for its prerequisites";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7313,7 +7313,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ FileSlurp ];
     meta = {
       description = "Parse and manipulate Perl version strings";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7336,7 +7336,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/pod-coverage-trustpod;
       description = "Allow a module's pod to contain Pod::Coverage hints";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7351,7 +7351,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/pod-elemental;
       description = "Work with nestable Pod elements";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7366,7 +7366,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/pod-elemental-perlmunger;
       description = "A thing that takes a string of Perl and rewrites its documentation";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7387,7 +7387,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ MixinLinewise TestDeep ];
     meta = {
       description = "Read a POD document as a series of trivial events";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7415,7 +7415,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rwstauner/Pod-Markdown;
       description = "Convert POD to Markdown";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7447,7 +7447,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/pod-weaver;
       description = "Weave together a Pod document from an outline";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7489,7 +7489,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/Redis/;
       description = "Perl binding for Redis database";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -7542,7 +7542,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://jaldhar.github.com/REST-Utils;
       description = "Utility functions for REST applications";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -7576,7 +7576,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Moose MooseXRoleParameterized StringErrf TryTiny namespaceclean ];
     meta = {
       description = "A thing with a message method";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7590,7 +7590,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Moose ];
     meta = {
       description = "A thing with a list of tags";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7603,7 +7603,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestFatal ];
     meta = {
       description = "Roles, like a nouvelle cuisine portion size slice of Moose";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7629,7 +7629,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Call isa, can, does and DOES safely on things that may not be objects";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7649,7 +7649,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Lexically-scoped resource management";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7662,7 +7662,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/Scope-Upper/;
       description = "Act on upper scopes";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7692,7 +7692,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "07aiqkyi1p22drpcyrrmv7f8qq6fhrxh007achy2vryxyck1bp53";
     };
     meta = {
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -7715,7 +7715,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ClassInspector HTTPDaemon LWP TaskWeaken URI XMLParser ];
     meta = {
       description = "Perl's Web Services Toolkit";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -7740,7 +7740,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/software-license;
       description = "Packages that provide templated software licenses";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7781,7 +7781,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ HashMerge MROCompat Moo ];
     meta = {
       description = "Generate SQL from Perl data structures";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7843,7 +7843,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/miyagawa/Starman;
       description = "High-performance preforking PSGI/Plack web server";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7870,7 +7870,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement
       description = "Module of basic descriptive statistical functions";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7900,7 +7900,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://plackperl.org;
       description = "Temporary buffer to save bytes";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7913,7 +7913,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git;
       description = "Turn on strict and make all warnings fatal";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7947,7 +7947,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ParamsUtil StringFormatter SubExporter ];
     meta = {
       description = "A simple sprintf-like dialect";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -7973,7 +7973,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/string-flogger;
       description = "String munging for loggers";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8016,7 +8016,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Rewrite strings based on a set of known prefixes";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8051,7 +8051,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ SubExporter SubInstall ];
     meta = {
       description = "A module for when strings are too long to be displayed in..";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8065,7 +8065,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ PadWalker SubExporter TemplateToolkit ];
     meta = {
       description = "Use TT to interpolate lexical variables";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -8079,7 +8079,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "String::Util -- String processing utilities";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8093,7 +8093,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/sub-exporter;
       description = "A sophisticated exporter for custom-built routines";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8106,7 +8106,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ SubExporter SubName ];
     meta = {
       description = "Helper routines for using Sub::Exporter to build methods";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8120,7 +8120,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/sub-exporter-globexporter;
       description = "Export shared globs with Sub::Exporter collectors";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8133,7 +8133,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Only use Sub::Exporter if you need it";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8147,7 +8147,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/sub-exporter;
       description = "A sophisticated exporter for custom-built routines";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8168,7 +8168,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Install subroutines into packages easily";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8201,7 +8201,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/dagolden/sub-uplevel;
       description = "Apparently run a function in a higher stack frame";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8274,7 +8274,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/phaylon/syntax/wiki;
       description = "Activate syntax extensions";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8287,7 +8287,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ SubExporterProgressive TestRequires syntax ];
     meta = {
       description = "Perl6 style Junction operators in Perl5";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8312,7 +8312,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/Tap-Parser-Sourcehandler-pgTAP/;
       description = "Stream TAP from pgTAP test scripts";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
       maintainers = with maintainers; [ ocharles ];
     };
@@ -8359,7 +8359,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Ensure that a platform has weaken support";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8386,7 +8386,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       maintainers = with maintainers; [ eelco ];
       description = "Perl Template Toolkit Plugin for IO::All";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8438,7 +8438,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ AppConfig ];
     meta = {
       description = "Comprehensive template processing system";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8450,7 +8450,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Detect encoding of the current terminal";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8464,7 +8464,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ClassMethodMaker TermReadKey ];
     meta = {
       description = "Provide a progress meter on a standard terminal";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8477,7 +8477,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ IOInteractive TermProgressBar TestMockObject ];
     meta = {
       description = "";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8586,7 +8586,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CPANMetaCheck ];
     meta = {
       description = "Check for presence of dependencies";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8601,7 +8601,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/karenetheridge/Test-CleanNamespaces;
       description = "Check for uncleaned imports";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8613,7 +8613,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Validate your CPAN META.yml files";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -8638,7 +8638,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ TextDiff ];
     meta = {
       description = "Test strings and data structures and show differences if not ok";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8653,7 +8653,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/Test-DistManifest;
       description = "Author test that validates a package MANIFEST";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8666,7 +8666,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/Test-EOL;
       description = "Check the correct line endings in your project";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -8691,7 +8691,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://metacpan.org/release/Test-FailWarnings;
       description = "Add test failures if warnings are caught";
-      license = "apache";
+      license = stdenv.lib.licenses.asl20;
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -8707,7 +8707,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/test-fatal;
       description = "Incredibly simple helpers for testing code with exceptions";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8722,7 +8722,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/kentfredric/Test-File-ShareDir;
       description = "Create a Fake ShareDir for your modules for testing";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8736,7 +8736,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://testanything.org/;
       description = "Run Perl standard test scripts with statistics";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8761,7 +8761,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Traces memory leaks";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8843,7 +8843,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/creaktive/Test-Mojibake;
       description = "Check your source for encoding misbehavior";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8858,7 +8858,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ExceptionClass TestDeep TestDifferences TestException TestWarn ];
     meta = {
       description = "Most commonly needed test functions and features";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8870,7 +8870,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Check the presence of tabs in your project";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -8926,7 +8926,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/Test-Pod/;
       description = "Check for POD errors in files";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8950,7 +8950,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/Test-Pod-LinkCheck/;
       description = "Tests POD for invalid links";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8962,7 +8962,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Check file names portability";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8974,7 +8974,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Checks to see if the module can be loaded";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -8989,7 +8989,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/rjbs/Test-Routine;
       description = "Composable units of assertion";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -9023,7 +9023,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ PackageStash TestDeep TestTrap TieIxHash ];
     meta = {
       description = "Write tests in a declarative specification style";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9044,7 +9044,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Test your SYNOPSIS code";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9056,7 +9056,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Write tests, not scripts that run them";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -9071,7 +9071,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ TestSharedFork ];
     meta = {
       description = "Testing TCP program";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9091,7 +9091,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Unit testing without external dependencies";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -9120,7 +9120,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Perl extension to test methods for warnings";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9134,7 +9134,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/karenetheridge/Test-Warnings;
       description = "Test for warnings and the lack of them";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9146,7 +9146,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Test fallback behaviour in absence of modules";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -9162,7 +9162,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/petdance/test-www-mechanize;
       description = "Testing-specific WWW::Mechanize subclass";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -9176,7 +9176,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CatalystRuntime LWP Moose namespaceclean TestWWWMechanize WWWMechanize ];
     meta = {
       description = "Test::WWW::Mechanize for Catalyst";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9203,7 +9203,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Plack TestWWWMechanize TryTiny ];
     meta = {
       description = "Test PSGI programs using WWW::Mechanize";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9240,7 +9240,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Interface to read and parse BibTeX files";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9261,7 +9261,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ AlgorithmDiff ];
     meta = {
       description = "Perform diffs on files and record sets";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9281,7 +9281,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Framework for more readable interactive test scripts";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9304,7 +9304,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ aliased DevelPartialDump ListAllUtils Moose MooseXParamsValidate MooseXTypes MooseXTypesStructured namespaceautoclean SetObject SubExporter TestFatal ];
     meta = {
       description = "Spy on objects to achieve test doubles (mock testing)";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -9320,7 +9320,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ FileFindRule FileFindRulePerl PerlMinimumVersion YAMLTiny ];
     meta = {
       description = "Does your code require newer perl than you think?";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9332,7 +9332,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Micro template engine with Perl5 language";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -9370,7 +9370,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Simple eyecandy ASCII tables";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -9421,7 +9421,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DataDump ];
     meta = {
       description = "Trap exit codes, exceptions, output, etc.";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9434,7 +9434,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/gfx/p5-Test-Vars;
       description = "Detects unused variables";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9449,7 +9449,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/Test-Version/;
       description = "Check to see that version's in modules are sane";
-      license = "artistic_2";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 
@@ -9461,7 +9461,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Remove leading and/or trailing whitespace from strings";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -9517,7 +9517,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Cycle through a list of values via a scalar";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9529,7 +9529,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Ordered associative arrays for Perl";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9541,7 +9541,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Ordered hashes for Perl";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9571,7 +9571,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestPod TestPodCoverage ];
     meta = {
       description = "Rounded or exact English expression of durations";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9585,7 +9585,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ExporterLite ];
     meta = {
       description = "Parse string that represents time duration";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9607,7 +9607,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "An N-ary tree";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9620,7 +9620,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestException ];
     meta = {
       description = "A simple tree object";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9644,7 +9644,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://metacpan.org/release/Try-Tiny;
       description = "Minimal try/catch with proper preservation of $@";
-      license = "mit";
+      license = stdenv.lib.licenses.mit;
     };
   };
 
@@ -9665,7 +9665,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/chromatic/UNIVERSAL-isa;
       description = "Attempt to recover from people calling UNIVERSAL::isa as a function";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9677,7 +9677,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Require() modules from a variable";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9700,7 +9700,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Unicode Collation Algorithm";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9712,7 +9712,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Wrapper around ICU collation services";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -9728,7 +9728,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ MIMECharset ];
     meta = {
       description = "UAX #14 Unicode Line Breaking Algorithm";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9748,7 +9748,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Uniform Resource Identifiers (absolute and relative)";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9762,7 +9762,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/URI-Find;
       description = "Find URIs in arbitrary text";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9775,7 +9775,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ParamsValidate URI ];
     meta = {
       description = "Build a URI from a set of named parameters";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
@@ -9798,7 +9798,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Uniform Resource Identifiers (absolute and relative)";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9867,7 +9867,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/bestpractical/www-mechanize;
       description = "Handy web browsing in a Perl object";
-      license = "perl5";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9897,7 +9897,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ URI ];
     meta = {
       description = "Database of robots.txt-derived permissions";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9952,7 +9952,7 @@ let self = _self // overrides; _self = with self; {
     doCheck = false; # requires an X server
     meta = {
       description = "XCB bindings for X";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9966,7 +9966,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ XMLTokeParser ];
     meta = {
       description = "Recursive descent XML parsing";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -9999,7 +9999,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ FileSlurp XMLLibXML ];
     meta = {
       description = "XML::LibXML based XML::Simple clone";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -10100,7 +10100,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ XMLParser ];
     meta = {
       description = "Simplified interface to XML::Parser";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -10131,7 +10131,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ ExtUtilsDepends TestFatal Testuseok ];
     meta = {
       description = "XS pointer backed objects using sv_magic";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -10144,7 +10144,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = https://github.com/ingydotnet/yaml-pm/tree;
       description = "YAML Ain't Markup Language (tm)";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -10157,7 +10157,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       homepage = http://search.cpan.org/dist/YAML-Syck;
       description = "Fast, lightweight YAML loader and dumper";
-      license = "mit";
+      license = stdenv.lib.licenses.mit;
     };
   };
 
diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
index bb6be68fa9a54..3876476623bca 100644
--- a/pkgs/top-level/python-packages-generated.nix
+++ b/pkgs/top-level/python-packages-generated.nix
@@ -62,7 +62,7 @@ in
         Zope Version Control
         '';
       homepage = "http://pypi.python.org/pypi/Products.ZopeVersionControl";
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
     };
   };
 
@@ -764,7 +764,7 @@ in
         PlonePAS adapts the PluggableAuthService for use by Plone.
         '';
       homepage = "http://pypi.python.org/pypi/Products.PlonePAS";
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
     };
   };
 
@@ -1487,7 +1487,7 @@ in
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        
+
         '';
       homepage = "https://code.google.com/p/feedparser/";
       license = "";
@@ -1550,7 +1550,7 @@ in
         Automatically include ZCML
         '';
       homepage = "http://pypi.python.org/pypi/z3c.autoinclude";
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
     };
   };
 
@@ -2552,7 +2552,7 @@ in
         CMFDynamicViewFTI is a product for dynamic views in CMF.
         '';
       homepage = "http://pypi.python.org/pypi/Products.CMFDynamicViewFTI";
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
     };
   };
 
@@ -2674,7 +2674,7 @@ in
         Python-PostgreSQL Database Adapter
         '';
       homepage = "http://initd.org/psycopg/";
-      license = "GPL with exceptions or ZPL";
+      license = with stdenv.lib.licenses; [ lgpl3Plus zpt20 ];
     };
   };
 
@@ -3078,7 +3078,7 @@ in
         Global way of retrieving the currently active request.
         '';
       homepage = "http://pypi.python.org/pypi/zope.globalrequest";
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
     };
   };
 
@@ -3198,7 +3198,7 @@ in
         Caching infrastructure for web apps
         '';
       homepage = "UNKNOWN";
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
     };
   };
 
@@ -3758,7 +3758,7 @@ in
         Zope 2 integration for zope.globalrequest
         '';
       homepage = "http://pypi.python.org/pypi/five.globalrequest";
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
     };
   };
 
@@ -4486,7 +4486,7 @@ in
         Easily hook into the ZCML processing machinery
         '';
       homepage = "UNKNOWN";
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
     };
   };
 
@@ -4526,7 +4526,7 @@ in
         Add test information to .egg-info
         '';
       homepage = "http://pypi.python.org/pypi/eggtestinfo";
-      license = "PSF or ZPL";
+      license = with stdenv.lib.licenses; [ psfl zpt20 ];
     };
   };
 
@@ -4928,7 +4928,7 @@ in
         SecureMailHost is a reimplementation of the standard Zope2 MailHost with some security and usability enhancements.
         '';
       homepage = "http://svn.plone.org/svn/collective/SecureMailHost/trunk";
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
     };
   };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a05ac2742accf..5377ab20d6bc5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1342,7 +1342,7 @@ let
     meta = {
       homepage = "http://click.pocoo.org/";
       description = "Click is a Python package for creating beautiful command line interfaces in a composable way with as little code as necessary.";
-      license = "bsd, 3-clause";
+      license = stdenv.lib.licenses.bsd3;
     };
   };
 
@@ -4909,7 +4909,7 @@ let
     meta = {
       description = "A documentation builder";
       homepage = http://pypi.python.org/pypi/manuel;
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
     };
   };
 
@@ -5008,7 +5008,7 @@ let
     meta = {
       description = "An HTML/XML templating engine used by supervisor";
       homepage = https://github.com/supervisor/meld3;
-      license = "free-non-copyleft";
+      license = stdenv.lib.licenses.free;
     };
   };
 
@@ -6477,7 +6477,7 @@ let
 
     meta = {
       description = "PostgreSQL database adapter for the Python programming language";
-      license = "GPLv2/ZPL";
+      license = with stdenv.lib.licenses; [ gpl2 zpt20 ];
     };
   };
 
@@ -7638,7 +7638,7 @@ let
     meta = {
       description = "The next generation YAML parser and emitter for Python";
       homepage = http://pyyaml.org;
-      license = "free"; # !?
+      license = stdenv.lib.licenses.free; # !?
     };
   });
 
@@ -8156,21 +8156,21 @@ let
   runsnakerun = buildPythonPackage rec {
     name = "runsnakerun-2.0.4";
 
-  
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/R/RunSnakeRun/RunSnakeRun-2.0.4.tar.gz";
       md5 = "3220b5b89994baee70b1c24d7e42a306";
     };
-  
+
     propagatedBuildInputs = [ self.squaremap self.wxPython28 ];
-  
+
     meta = with stdenv.lib; {
       description = "GUI Viewer for Python profiling runs";
       homepage = http://www.vrplumber.com/programming/runsnakerun/;
       license = licenses.bsd3;
     };
   };
-  
+
   rtslib_fb = buildPythonPackage rec {
     version = "2.1.fb43";
     name = "rtslib-fb-${version}";
@@ -9359,7 +9359,7 @@ let
     meta = {
       description = "Transaction management";
       homepage = http://pypi.python.org/pypi/transaction;
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
     };
   };
 
@@ -9397,7 +9397,7 @@ let
      meta = {
        description = "A tool which computes a dependency graph between active Python eggs";
        homepage = http://thomas-lotze.de/en/software/eggdeps/;
-       license = "ZPL";
+       license = stdenv.lib.licenses.zpt20;
      };
    };
 
@@ -10005,7 +10005,7 @@ let
     meta = {
       description = "Structured Configuration Library";
       homepage = http://pypi.python.org/pypi/ZConfig;
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
       maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
   };
@@ -10023,7 +10023,7 @@ let
     meta = {
       description = "Inter-process locks";
       homepage =  http://www.python.org/pypi/zc.lockfile;
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
       maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
   };
@@ -10046,7 +10046,7 @@ let
     meta = {
       description = "A daemon process control library and tools for Unix-based systems";
       homepage = http://pypi.python.org/pypi/zdaemon;
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
       maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
   };
@@ -10097,7 +10097,7 @@ let
     meta = {
       description = "An object-oriented database for Python";
       homepage = http://pypi.python.org/pypi/ZODB3;
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
       maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
   };
@@ -10124,7 +10124,7 @@ let
     meta = {
       description = "An object-oriented database for Python";
       homepage = http://pypi.python.org/pypi/ZODB;
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
       maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
   };
@@ -10349,7 +10349,7 @@ let
     meta = {
       description = "An event publishing system";
       homepage = http://pypi.python.org/pypi/zope.event;
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
       maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
   };
@@ -10369,7 +10369,7 @@ let
      meta = {
        description = "Exception interfaces and implementations";
        homepage = http://pypi.python.org/pypi/zope.exceptions;
-       license = "ZPL";
+       license = stdenv.lib.licenses.zpt20;
        maintainers = [ stdenv.lib.maintainers.goibhniu ];
      };
    };
@@ -10584,7 +10584,7 @@ let
     meta = {
       description = "Zope testing helpers";
       homepage =  http://pypi.python.org/pypi/zope.testing;
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
       maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
   };
@@ -10606,7 +10606,7 @@ let
     meta = {
       description = "A flexible test runner with layer support";
       homepage = http://pypi.python.org/pypi/zope.testrunner;
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
       maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
   };
@@ -10644,7 +10644,7 @@ let
     meta = {
       description = "Zope.Interface";
       homepage = http://zope.org/Products/ZopeInterface;
-      license = "ZPL";
+      license = stdenv.lib.licenses.zpt20;
       maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
   };
-- 
cgit 1.4.1


From 6e8a9b81459a56d0613cd036a7abf9de38186dc4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 6 Nov 2014 00:43:38 +0000
Subject: wxmaxima: update from 13.04.2 to 14.09.0

---
 pkgs/applications/science/math/wxmaxima/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 75448b6965cda..06eceea65c95b 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -2,14 +2,14 @@
 
 let
   name    = "wxmaxima";
-  version = "13.04.2";
+  version = "14.09.0";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxMaxima-${version}.tar.gz";
-    sha256 = "1sylvr0kfdzxxc3qsb0c6ff3lg0bzm1ib5xh78wjgzykbnvjsd99";
+    url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxmaxima-${version}.tar.gz";
+    sha256 = "1wqiw9dgjc9vg94dqk4kif8xs7nlmn34xj3v4zm13fh1jihraksq";
   };
 
   buildInputs = [wxGTK maxima makeWrapper];
-- 
cgit 1.4.1


From 9a7143918bab8609338676e5053589099387cba1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 5 Nov 2014 22:03:10 -0800
Subject: libu2f-host: 0.0 -> 0.0.1

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

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix
index e2c92d5f10d08..fc76a13ad8e91 100644
--- a/pkgs/development/libraries/libu2f-host/default.nix
+++ b/pkgs/development/libraries/libu2f-host/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, json_c, hidapi }:
 
 stdenv.mkDerivation rec {
-  name = "libu2f-host-0.0";
+  name = "libu2f-host-0.0.1";
 
   src = fetchurl {
     url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz";
-    sha256 = "02pjald2j6syvxm5pszxcpqhpp7c80hblnzh6wrafkmpkpzi3rq5";
+    sha256 = "1cqgvbh2fim9r7pjazph64xnrhmsydqh8xrnxd4g16mc0k76s4mf";
   };
 
   buildInputs = [ pkgconfig json_c hidapi ];
-- 
cgit 1.4.1


From 782a12e450a58b815cd702c65da75855124d1572 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 6 Nov 2014 10:03:42 +0100
Subject: Revert "Update Liberation fonts"

This reverts commit e85f67f21563756be494ad938bdfc5bf068c7ef0. It makes
NixOS depend on Atlas, gfortran, numpy, etc. In particular nothing
importation should ever gepend on Atlas, because it's prone to random
build failures:

  http://hydra.nixos.org/build/16766850
---
 pkgs/data/fonts/redhat-liberation-fonts/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index f8dca0fd5a3de..81de83aecef36 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -1,20 +1,19 @@
-{stdenv, fetchurl, fontforge, python, pythonPackages}:
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "liberation-fonts-2.00.1";
+  name = "liberation-fonts-1.04";
+
   src = fetchurl {
     url = "https://fedorahosted.org/releases/l/i/liberation-fonts/${name}.tar.gz";
-    sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
+    sha256 = "189i6pc4jqhhmsb9shi8afg9af9crpmz9bnlldhqaxavr1bhj38f";
   };
 
-  buildInputs = [fontforge python pythonPackages.fonttools];
-
   installPhase = ''
     mkdir -p $out/share/fonts/truetype
-    cp -v $( find . -name '*.ttf') $out/share/fonts/truetype
+    cp -v *.ttf $out/share/fonts/truetype
 
     mkdir -p "$out/doc/${name}"
-    cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
+    cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}"
   '';
 
   meta = {
-- 
cgit 1.4.1