Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	pkgs/stdenv/generic/default.nix

lib/licenses.nix

@@ -1,319 +1,400 @@
 let
+
+  lib = import ./default.nix;
+
   spdx = lic: lic // {
-      url = "http://spdx.org/licenses/${lic.shortName}";
+    url = "http://spdx.org/licenses/${lic.spdxId}";
-    };
+  };
+
 in
 
-rec {
+lib.mapAttrs (n: v: v // { shortName = n; }) rec {
   /* License identifiers from spdx.org where possible.
    * If you cannot find your license here, then look for a similar license or
    * 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 {
-    shortName = "AGPL-3.0";
+    spdxId = "AGPL-3.0";
     fullName = "GNU Affero General Public License v3.0";
   };
 
   agpl3Plus = {
-    shortName = "AGPL-3.0+";
     fullName = "GNU Affero General Public License v3.0 or later";
     inherit (agpl3) url;
   };
 
+  amazonsl = {
+    fullName = "Amazon Software License";
+    url = http://aws.amazon.com/asl/;
+    free = false;
+  };
+
   amd = {
-    shortName = "amd";
     fullName = "AMD License Agreement";
     url = http://developer.amd.com/amd-license-agreement/;
   };
 
   apsl20 = spdx {
-    shortName = "APSL-2.0";
+    spdxId = "APSL-2.0";
     fullName = "Apple Public Source License 2.0";
   };
 
+  artistic1 = spdx {
+    spdxId = "Artistic-1.0";
+    fullName = "Artistic License 1.0";
+  };
+
   artistic2 = spdx {
-    shortName = "Artistic-2.0";
+    spdxId = "Artistic-2.0";
     fullName = "Artistic License 2.0";
   };
 
   asl20 = spdx {
-    shortName = "Apache-2.0";
+    spdxId = "Apache-2.0";
     fullName = "Apache License 2.0";
   };
 
   boost = spdx {
-    shortName = "BSL-1.0";
+    spdxId = "BSL-1.0";
     fullName = "Boost Software License 1.0";
   };
 
   bsd2 = spdx {
-    shortName = "BSD-2-Clause";
+    spdxId = "BSD-2-Clause";
     fullName = ''BSD 2-clause "Simplified" License'';
   };
 
   bsd3 = spdx {
-    shortName = "BSD-3-Clause";
+    spdxId = "BSD-3-Clause";
     fullName = ''BSD 3-clause "New" or "Revised" License'';
   };
 
   bsdOriginal = spdx {
-    shortName = "BSD-4-Clause";
+    spdxId = "BSD-4-Clause";
     fullName = ''BSD 4-clause "Original" or "Old" License'';
   };
 
   cc0 = spdx {
-    shortName = "CC0-1.0";
+    spdxId = "CC0-1.0";
-    fullName = ''Creative Commons Zero v1.0 Universal'';
+    fullName = "Creative Commons Zero v1.0 Universal";
   };
 
   cc-by-30 = spdx {
-    shortName = "CC-BY-3.0";
+    spdxId = "CC-BY-3.0";
     fullName = "Creative Commons Attribution 3.0";
   };
 
   cc-by-sa-30 = spdx {
-    shortName = "CC-BY-SA-3.0";
+    spdxId = "CC-BY-SA-3.0";
     fullName = "Creative Commons Attribution Share Alike 3.0";
   };
 
   cc-by-40 = spdx {
-    shortName = "CC-BY-4.0";
+    spdxId = "CC-BY-4.0";
     fullName = "Creative Commons Attribution 4.0";
   };
 
   cddl = spdx {
-    shortName = "CDDL-1.0";
+    spdxId = "CDDL-1.0";
     fullName = "Common Development and Distribution License 1.0";
   };
 
   cecill20 = spdx {
-    shortName = "CECILL-2.0";
+    spdxId = "CECILL-2.0";
     fullName = "CeCILL Free Software License Agreement v2.0";
   };
 
   cecill-b = spdx {
-    shortName = "CECILL-B";
+    spdxId = "CECILL-B";
     fullName  = "CeCILL-B Free Software License Agreement";
   };
 
   cecill-c = spdx {
-    shortName = "CECILL-C";
+    spdxId = "CECILL-C";
     fullName  = "CeCILL-C Free Software License Agreement";
   };
 
   cpl10 = spdx {
-    shortName = "CPL-1.0";
+    spdxId = "CPL-1.0";
     fullName = "Common Public License 1.0";
   };
 
   epl10 = spdx {
-    shortName = "EPL-1.0";
+    spdxId = "EPL-1.0";
     fullName = "Eclipse Public License 1.0";
   };
 
-  free = "free";
+  free = {
+    fullName = "Unspecified free software license";
+  };
+
+  gpl1Plus = spdx {
+    spdxId = "GPL-1.0+";
+    fullName = "GNU General Public License v1.0 or later";
+  };
 
   gpl2 = spdx {
-    shortName = "GPL-2.0";
+    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 = {
-    shortName = "GPL-2.0-with-OSS";
     fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)";
     url = http://www.mysql.com/about/legal/licensing/foss-exception;
   };
 
   gpl2Plus = spdx {
-    shortName = "GPL-2.0+";
+    spdxId = "GPL-2.0+";
     fullName = "GNU General Public License v2.0 or later";
   };
 
   gpl3 = spdx {
-    shortName = "GPL-3.0";
+    spdxId = "GPL-3.0";
     fullName = "GNU General Public License v3.0 only";
   };
 
   gpl3Plus = spdx {
-    shortName = "GPL-3.0+";
+    spdxId = "GPL-3.0+";
     fullName = "GNU General Public License v3.0 or later";
   };
 
   gpl3ClasspathPlus = {
-    shortName = "GPL-3.0+-with-classpath-exception";
     fullName = "GNU General Public License v3.0 or later (with Classpath exception)";
     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 = {
-    shortName = "INRIA-NCLA";
     fullName  = "INRIA Non-Commercial License Agreement";
     url       = "http://compcert.inria.fr/doc/LICENSE";
   };
 
   ipa = spdx {
-    shortName = "IPA";
+    spdxId = "IPA";
     fullName = "IPA Font License";
   };
 
   ipl10 = spdx {
-    shortName = "IPL-1.0";
+    spdxId = "IPL-1.0";
     fullName = "IBM Public License v1.0";
   };
 
   isc = spdx {
-    shortName = "ISC";
+    spdxId = "ISC";
     fullName = "ISC License";
   };
 
   lgpl2 = spdx {
-    shortName = "LGPL-2.0";
+    spdxId = "LGPL-2.0";
     fullName = "GNU Library General Public License v2 only";
   };
 
   lgpl2Plus = spdx {
-    shortName = "LGPL-2.0+";
+    spdxId = "LGPL-2.0+";
     fullName = "GNU Library General Public License v2 or later";
   };
 
   lgpl21 = spdx {
-    shortName = "LGPL-2.1";
+    spdxId = "LGPL-2.1";
     fullName = "GNU Library General Public License v2.1 only";
   };
 
   lgpl21Plus = spdx {
-    shortName = "LGPL-2.1+";
+    spdxId = "LGPL-2.1+";
     fullName = "GNU Library General Public License v2.1 or later";
   };
 
   lgpl3 = spdx {
-    shortName = "LGPL-3.0";
+    spdxId = "LGPL-3.0";
     fullName = "GNU Lesser General Public License v3.0 only";
   };
 
   lgpl3Plus = spdx {
-    shortName = "LGPL-3.0+";
+    spdxId = "LGPL-3.0+";
     fullName = "GNU Lesser General Public License v3.0 or later";
   };
 
   libpng = spdx {
-    shortName = "Libpng";
+    spdxId = "Libpng";
     fullName = "libpng License";
   };
 
-  libtiff = {
+  libtiff = spdx {
-    shortName = "libtiff";
+    spdxId = "libtiff";
-    fullName = "libtiff license";
+    fullName = "libtiff License";
-    url = https://fedoraproject.org/wiki/Licensing/libtiff;
   };
 
   llgpl21 = {
-    shortName = "LLGPL-2.1";
     fullName = "Lisp LGPL; GNU Lesser General Public License version 2.1 with Franz Inc. preamble for clarification of LGPL terms in context of Lisp";
     url = http://opensource.franz.com/preamble.html;
   };
 
+  lppl12 = spdx {
+    spdxId = "LPPL-1.2";
+    fullName = "LaTeX Project Public License v1.2";
+  };
+
   lpl-102 = spdx {
-    shortName = "LPL-1.02";
+    spdxId = "LPL-1.02";
     fullName = "Lucent Public License v1.02";
   };
 
   # spdx.org does not (yet) differentiate between the X11 and Expat versions
   # for details see http://en.wikipedia.org/wiki/MIT_License#Various_versions
   mit = spdx {
-    shortName = "MIT";
+    spdxId = "MIT";
     fullName = "MIT License";
   };
 
   mpl11 = spdx {
-    shortName = "MPL-1.1";
+    spdxId = "MPL-1.1";
     fullName = "Mozilla Public License 1.1";
   };
 
   mpl20 = spdx {
-    shortName = "MPL-2.0";
+    spdxId = "MPL-2.0";
     fullName = "Mozilla Public License 2.0";
   };
 
   msrla = {
-    shortName = "MSR-LA";
     fullName  = "Microsoft Research License Agreement";
     url       = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt";
   };
 
   ncsa = spdx {
-    shortName = "NCSA";
+    spdxId = "NCSA";
     fullName  = "University of Illinois/NCSA Open Source License";
   };
 
   ofl = spdx {
-    shortName = "OFL-1.1";
+    spdxId = "OFL-1.1";
     fullName = "SIL Open Font License 1.1";
   };
 
   openssl = spdx {
-    shortName = "OpenSSL";
+    spdxId = "OpenSSL";
     fullName = "OpenSSL License";
   };
 
+  php301 = spdx {
+    spdxId = "PHP-3.01";
+    fullName = "PHP License v3.01";
+  };
+
   postgresql = spdx {
-    shortName = "PostgreSQL";
+    spdxId = "PostgreSQL";
     fullName = "PostgreSQL License";
   };
 
   psfl = spdx {
-    shortName = "Python-2.0";
+    spdxId = "Python-2.0";
     fullName = "Python Software Foundation License version 2";
     #url = http://docs.python.org/license.html;
   };
 
   publicDomain = {
-    shortName = "Public Domain";
+    fullName = "Public Domain";
-    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 {
-    shortName = "Sleepycat";
+    spdxId = "Sleepycat";
-    fullName  = "Sleepycat License";
+    fullName = "Sleepycat License";
   };
 
-  tcltk = {
+  tcltk = spdx {
-    shortName = "Tcl/Tk";
+    spdxId = "TCL";
-    fullName = "Tcl/Tk license";
+    fullName = "TCL/TK License";
-    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 = {
+  unlicense = spdx {
-    shortName = "Unlicense";
+    spdxId = "Unlicense";
-    fullName = "Unlicense";
+    fullName = "The Unlicense";
-    url = http://unlicense.org/;
+  };
+
+  vsl10 = spdx {
+    spdxId = "VSL-1.0";
+    fullName = "Vovida Software License v1.0";
+  };
+
+  w3c = spdx {
+    spdxId = "W3C";
+    fullName = "W3C Software Notice and License";
   };
 
   wadalab = {
-    shortName = "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 {
-    shortName = "Zlib";
+    spdxId = "Zlib";
     fullName = "zlib License";
   };
 
   zpt20 = spdx { # FIXME: why zpt* instead of zpl*
-    shortName = "ZPL-2.0";
+    spdxId = "ZPL-2.0";
     fullName = "Zope Public License 2.0";
   };
 
   zpt21 = spdx {
-    shortName = "ZPL-2.1";
+    spdxId = "ZPL-2.1";
     fullName = "Zope Public License 2.1";
   };
 

nixos/modules/programs/ssmtp.nix

@@ -20,6 +20,7 @@ in
     networking.defaultMailServer = {
 
       directDelivery = mkOption {
+        type = types.bool;
         default = false;
         example = true;
         description = ''
@@ -35,6 +36,7 @@ in
       };
 
       hostName = mkOption {
+        type = types.str;
         example = "mail.example.org";
         description = ''
           The host name of the default mail server to use to deliver
@@ -42,7 +44,17 @@ in
         '';
       };
 
+      root = mkOption {
+        type = types.str;
+        default = "";
+        example = "root@example.org";
+        description = ''
+          The e-mail to which mail for users with UID < 1000 is forwarded.
+        '';
+      };
+
       domain = mkOption {
+        type = types.str;
         default = "";
         example = "example.org";
         description = ''
@@ -51,6 +63,7 @@ in
       };
 
       useTLS = mkOption {
+        type = types.bool;
         default = false;
         example = true;
         description = ''
@@ -60,6 +73,7 @@ in
       };
 
       useSTARTTLS = mkOption {
+        type = types.bool;
         default = false;
         example = true;
         description = ''
@@ -70,6 +84,7 @@ in
       };
 
       authUser = mkOption {
+        type = types.str;
         default = "";
         example = "foo@example.org";
         description = ''
@@ -78,6 +93,7 @@ in
       };
 
       authPass = mkOption {
+        type = types.str;
         default = "";
         example = "correctHorseBatteryStaple";
         description = ''
@@ -96,6 +112,7 @@ in
       ''
         MailHub=${cfg.hostName}
         FromLineOverride=YES
+        ${if cfg.root != "" then "root=${cfg.root}" else ""}
         ${if cfg.domain != "" then "rewriteDomain=${cfg.domain}" else ""}
         UseTLS=${if cfg.useTLS then "YES" else "NO"}
         UseSTARTTLS=${if cfg.useSTARTTLS then "YES" else "NO"}

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 ];
   };

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;
   };

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 ];

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;
   };
 }

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;
   };
 }

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 ];

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
   };
 })

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;
   };
 }

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;
   };
 }

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;

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,23 +6,18 @@ stdenv.mkDerivation rec {
   name = "geeqie-${version}";
   version = "1.2";
 
-  src = fetchgit {
+  src = fetchurl {
-    url = "git://gitorious.org/geeqie/geeqie.git";
+    url = mirror://debian/pool/main/g/geeqie/geeqie_1.2.orig.tar.gz;
-    rev = "refs/tags/v${version}";
+    sha256 = "0wkcpyh3f6ig36x1q6h9iqgq225w37visip48m72j8rpghmv1rn3";
-    sha256 = "1h9w0jrcqcp5jjgmks5pvpppnfxhcd1s3vqlyb3qyil2wfk8n8wp";
   };
 
-  configureFlags = [
+  configureFlags = [ "--enable-gps" ];
-    "--enable-gps"
-  ];
 
-  configurePhase = ''
+  preConfigure = "./autogen.sh";
-    ./autogen.sh $configureFlags --prefix="$out"
-  '';
 
   buildInputs = [
     autoconf automake libtool pkgconfig gtk libpng exiv2 lcms intltool gettext
-    libchamplain
+    #libchamplain
   ];
 
   postInstall = ''

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;
   };
 }

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";

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;
   };
 }
-

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";
   };

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 ];
   };
 }

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";
+    rev = "refs/tags/v${version}";
-    sha256 = "1yj4jvjwv73a02p8a0yip8q39znlhfc9zdr19zm1zik2k4h62c2l";
+    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];
+    maintainers = [ maintainers.koral ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }

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;
+  };
+}

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";

pkgs/applications/misc/vue/default.nix

@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , jre, unzip
   , ...}:
 builderDefsPackage
-(a :  
+(a :
-let 
+let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+  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.stdenv.shell}' >> "$out/bin/vue"
-    echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$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
-

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;
   };

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;
   };

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;

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;
   };
 }

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.";

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;
   };
 }

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;

pkgs/applications/science/logic/cvc3/default.nix

@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , flex, bison, gmp, perl
   , ...}:
 builderDefsPackage
-(a :  
+(a :
-let 
+let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+  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
-

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;
   };

pkgs/applications/science/logic/satallax/default.nix

@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , sbcl, zlib
   , ...}:
 builderDefsPackage
-(a :  
+(a :
-let 
+let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+  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
-

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;
   };

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";
+    url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxmaxima-${version}.tar.gz";
-    sha256 = "1sylvr0kfdzxxc3qsb0c6ff3lg0bzm1ib5xh78wjgzykbnvjsd99";
+    sha256 = "1wqiw9dgjc9vg94dqk4kif8xs7nlmn34xj3v4zm13fh1jihraksq";
   };
 
   buildInputs = [wxGTK maxima makeWrapper];

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;
   };

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

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;
   };
 }

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 ];
   };
 }
-

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 ];
   };
 }
-

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 ];
     };

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;
   };
 }

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;
   };
 }

pkgs/data/fonts/clearlyU/default.nix

@@ -21,5 +21,6 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A Unicode font";
+    maintainers = [stdenv.lib.maintainers.raskin];
   };
 }

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 = [ ];

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/;
 

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 = {
@@ -38,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/;
 

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

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 ];
   };

pkgs/data/fonts/ucs-fonts/default.nix

@@ -34,5 +34,6 @@ wrapFonts (stdenv.mkDerivation {
 
   meta = {
     description = "Unicode bitmap fonts";
+    maintainers = [stdenv.lib.maintainers.raskin];
   };
 })

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 ];
   };
 }

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 ];
   };
 }

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/;
   };
 }

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;
   };
 }

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;
   };
 }

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 ?
   };
 }

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";
   };
 

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";
   };
 

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;

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;
   };

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 ];
   };
 }

pkgs/development/interpreters/kona/default.nix

@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , fetchgit
   , ...}:
 builderDefsPackage
-(a :  
+(a :
-let 
+let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+  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
-

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 ];

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";
   };

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;

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;

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;

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;

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;

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
-

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
-

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
-

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;
   };
 
 }

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 ];

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 = {

pkgs/development/libraries/celt/0.7.nix

@@ -1,9 +1,9 @@
 x@{builderDefsPackage
   , ...}:
 builderDefsPackage
-(a :  
+(a :
-let 
+let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+  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
-

pkgs/development/libraries/celt/default.nix

@@ -1,9 +1,9 @@
 x@{builderDefsPackage
   , ...}:
 builderDefsPackage
-(a :  
+(a :
-let 
+let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+  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
-

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;
   };
 }

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 = [ ];
   };
 }

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 ];
   };

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;
   };
 }

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;
   };
 }
-

pkgs/development/libraries/gsm/default.nix

@@ -1,9 +1,9 @@
 x@{builderDefsPackage
   , ...}:
 builderDefsPackage
-(a :  
+(a :
-let 
+let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+  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
-

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;
+  };
+})

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 = [ ];
   };

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;
   };
 }

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;
   };
 }

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 ];
   };

pkgs/development/libraries/libffi/default.nix

@@ -47,10 +47,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;
   };
 }
-

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;
   };

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 ];
   };
 }

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;
   };
 }

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;
   };
 }

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;
   };

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;

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;
   };

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;
   };

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;
   };

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;
   };

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 ];