Merge recent master into x-updates

Hydra: ?compare=1142825 Conflicts (easy): pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
parent 91b53aaebc fb565f1a4e
commit 6295a3ca36
1391 changed files with 6647 additions and 5597 deletions
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
      battery and thermal information.
    '';
    homepage = http://sourceforge.net/projects/acpiclient/;
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
    platforms = platforms.linux;
    maintainers = maintainers.mornfall;
  };
--- a/pkgs/os-specific/linux/acpitool/default.nix
+++ b/pkgs/os-specific/linux/acpitool/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  meta = {
    description = "A small, convenient command-line ACPI client with a lot of features";
    homepage = http://freeunix.dyndns.org:8000/site2/acpitool.shtml;
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
    maintainers = [ stdenv.lib.maintainers.guibert ];
  };
 }
--- a/pkgs/os-specific/linux/afuse/default.nix
+++ b/pkgs/os-specific/linux/afuse/default.nix
@@ -13,9 +13,8 @@ stdenv.mkDerivation {
  meta = { 
    description = "Automounter in userspace";
    homepage = http://sourceforge.net/projects/afuse;
-    license = "GPL-v2";
+    license = stdenv.lib.licenses.gpl2;
    maintainers = [ stdenv.lib.maintainers.marcweber ];
    platforms = stdenv.lib.platforms.linux;
  };
 }
-
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jackaudio ? null }:
+{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jack2 ? null }:

 stdenv.mkDerivation rec {
  name = "alsa-plugins-1.0.28";
@@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
  buildInputs =
    [ pkgconfig alsaLib libogg ]
    ++ lib.optional (pulseaudio != null) pulseaudio
-    ++ lib.optional (jackaudio != null) jackaudio;
+    ++ lib.optional (jack2 != null) jack2;

  meta = with lib; {
    description = "Various plugins for ALSA";
    homepage = http://alsa-project.org/;
-    license = licenses.gpl2;
+    license = licenses.lgpl21;
    maintainers = [maintainers.marcweber];
    platforms = platforms.linux;
  };
--- a/pkgs/os-specific/linux/audit/default.nix
+++ b/pkgs/os-specific/linux/audit/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Audit Library";
    homepage = "http://people.redhat.com/sgrubb/audit/";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/os-specific/linux/autofs/autofs-v5.nix
+++ b/pkgs/os-specific/linux/autofs/autofs-v5.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
  meta = { 
    description="Kernel based automounter";
    homepage="http://www.linux-consulting.com/Amd_AutoFS/autofs.html";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    executables = [ "automount" ];
  };
 }
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
    description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    maintainers = with stdenv.lib.maintainers; [viric];
    platforms = with stdenv.lib.platforms; linux;
  };
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
    description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    maintainers = with stdenv.lib.maintainers; [viric];
    platforms = with stdenv.lib.platforms; linux;
  };
--- a/pkgs/os-specific/linux/blcr/default.nix
+++ b/pkgs/os-specific/linux/blcr/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
  meta = {
    description = "Berkeley Lab Checkpoint/Restart for Linux (BLCR)";
    homepage = https://ftg.lbl.gov/projects/CheckpointRestart/;
-    license = "GPL2";
+    license = stdenv.lib.licenses.gpl2;
    platforms = stdenv.lib.platforms.linux;
    maintainers = with stdenv.lib.maintainers; [
      z77z
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -28,6 +28,10 @@ let
  nixConfig = ''
    CONFIG_PREFIX "$out"
    CONFIG_INSTALL_NO_USR y
+
+    # Use the external mount.cifs program.
+    CONFIG_FEATURE_MOUNT_CIFS n
+    CONFIG_FEATURE_MOUNT_HELPERS y
  '';

  staticConfig = stdenv.lib.optionalString enableStatic ''
@@ -49,8 +53,8 @@ stdenv.mkDerivation rec {
    ${configParser}
    cat << EOF | parseconfig
    ${staticConfig}
-    ${extraConfig}
    ${nixConfig}
+    ${extraConfig}
    $extraCrossConfig
    EOF
    make oldconfig
@@ -70,7 +74,7 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Tiny versions of common UNIX utilities in a single small executable";
    homepage = http://busybox.net/;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    maintainers = with stdenv.lib.maintainers; [viric];
    platforms = with stdenv.lib.platforms; linux;
  };
--- a/pkgs/os-specific/linux/cryptodev/default.nix
+++ b/pkgs/os-specific/linux/cryptodev/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Device that allows access to Linux kernel cryptographic drivers";
    homepage = http://home.gna.org/cryptodev-linux/;
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
  };
 }
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://code.google.com/p/cryptsetup/;
    description = "LUKS for dm-crypt";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    maintainers = with stdenv.lib.maintainers; [ viric chaoflow ];
    platforms = with stdenv.lib.platforms; linux;
  };
--- a/pkgs/os-specific/linux/disk-indicator/default.nix
+++ b/pkgs/os-specific/linux/disk-indicator/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
      Small program for Linux that will turn your Scroll, Caps or Num Lock LED
      or LED on your ThinkPad laptop into a hard disk activity indicator.
    '';
-    license = "GPLv3";
+    license = stdenv.lib.licenses.gpl3;
    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/os-specific/linux/dstat/default.nix
+++ b/pkgs/os-specific/linux/dstat/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://dag.wieers.com/home-made/dstat/;
    description = "Versatile resource statistics tool";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    platforms = stdenv.lib.platforms.linux;
    maintainers = [ ];
  };
--- a/pkgs/os-specific/linux/frandom/default.nix
+++ b/pkgs/os-specific/linux/frandom/default.nix
@@ -40,8 +40,7 @@ stdenv.mkDerivation rec {
  meta = {
    description = "A very fast random number generator kernel module";
    homepage = http://frandom.sourceforge.net/;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
  };
 }
-
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = https://code.google.com/p/google-authenticator/;
    description = "Two-step verification, with pam module";
-    license = "ASL2.0";
+    license = stdenv.lib.licenses.asl20;
  };
 }
--- a/pkgs/os-specific/linux/hibernate/default.nix
+++ b/pkgs/os-specific/linux/hibernate/default.nix
@@ -38,7 +38,7 @@ in
 	it into "hibernation".  It works both with Linux swsusp and Tux-on-Ice.
      '';

-      license = "GPLv2+";
+      license = stdenv.lib.licenses.gpl2Plus;
      homepage = http://www.tuxonice.net/;
    };
  }
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
  meta = {
    homepage = "https://fedorahosted.org/hwdata/";
    description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
    description = "A better i7 (and now i3, i5) reporting tool for Linux";
    homepage = http://code.google.com/p/i7z;
    repositories.git = https://github.com/ajaiantilal/i7z.git;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
  };
 }
-
--- a/pkgs/os-specific/linux/i810switch/default.nix
+++ b/pkgs/os-specific/linux/i810switch/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation {
  meta = {
    description = "A utility for switching between the LCD and external VGA display on Intel graphics cards";
    homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html";
-    license = "GPL2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
--- a/pkgs/os-specific/linux/jujuutils/default.nix
+++ b/pkgs/os-specific/linux/jujuutils/default.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation {
  meta = {
    homepage = "http://code.google.com/p/jujuutils/";
    description = "Utilities around FireWire devices connected to a Linux computer";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:

 import ./generic.nix (args // rec {
-  version = "3.10.48";
+  version = "3.10.50";
  extraMeta.branch = "3.10";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "14gz998vr9jb9blbk60phq3hwnl2yipd6fykkl5bd8gai5wph2l3";
+    sha256 = "1ay7hscaa4nyvpa4l10y8himyj5fp25n63nxvrccqqqir3b8l1gz";
  };

  features.iwlwifi = true;
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:

 import ./generic.nix (args // rec {
-  version = "3.12.24";
+  version = "3.12.25";
  extraMeta.branch = "3.12";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "01y9sz90d4l12m3f7gjmnasck85c2dqx74hwyccw5jk04r5pm2mx";
+    sha256 = "16jdqhhi7z6jkprz90cb48cd479zsqlrn9j3yp2xcyqp05nc7n2p";
  };

  features.iwlwifi = true;
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:

 import ./generic.nix (args // rec {
-  version = "3.14.12";
+  version = "3.14.14";
  extraMeta.branch = "3.14";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1pzshv7cj87v5na7paqka9v8mbqn04q25r241fha56sm7ilxbnap";
+    sha256 = "0w9qp0jmfsrg9msgi6ab39kbz69id3xwnqvlgd9k4v6ka5bk7062";
  };

  features.iwlwifi = true;
--- a/pkgs/os-specific/linux/kernel/linux-3.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.15.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:

 import ./generic.nix (args // rec {
-  version = "3.15.5";
+  version = "3.15.7";
  extraMeta.branch = "3.15";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "09j0ga3nc90fbfl9g3i8x9vp70hq7ddnnlbcazahrz4vn6mngqv2";
+    sha256 = "034q34gib9jqfiydnqf5i827ns07apmkh2j48vbakdwydvzzv6fj";
  };

  features.iwlwifi = true;
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:

 import ./generic.nix (args // rec {
-  version = "3.4.98";
+  version = "3.4.100";
  extraMeta.branch = "3.4";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0kkd6q80w4rh1sjdd4j5a2fmib4mjwhsf5fm555jl2w3zsy0kr45";
+    sha256 = "170q4ay8kxf45b3932fpms37w4fh9h7pdiwc5wr64drg5j356pds";
  };

  kernelPatches = args.kernelPatches ++
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -198,7 +198,7 @@ let
            " (with patches: "
            + stdenv.lib.concatStrings (stdenv.lib.intersperse ", " (map (x: x.name) kernelPatches))
            + ")");
-        license = "GPLv2";
+        license = stdenv.lib.licenses.gpl2;
        homepage = http://www.kernel.org/;
        repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;
        maintainers = [
--- a/pkgs/os-specific/linux/keyutils/default.nix
+++ b/pkgs/os-specific/linux/keyutils/default.nix
@@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  name = "keyutils-1.5.9";
-  
+
  src = fetchurl {
    url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2";
    sha256 = "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  '';

  installPhase = "make install DESTDIR=$out";
-  
+
  meta = with stdenv.lib; {
    homepage = http://people.redhat.com/dhowells/keyutils/;
    description = "Tools used to control the Linux kernel key management system";
--- a/pkgs/os-specific/linux/latencytop/default.nix
+++ b/pkgs/os-specific/linux/latencytop/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://latencytop.org;
    description = "Tool to show kernel reports on latencies (LATENCYTOP option)";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    maintainers = [ stdenv.lib.maintainers.viric ];
    platforms = stdenv.lib.platforms.linux;
  };
--- a/pkgs/os-specific/linux/ldm/default.nix
+++ b/pkgs/os-specific/linux/ldm/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {

  meta = {
    description = "A lightweight device mounter, with libudev as only dependency";
-    license = "MIT";
+    license = stdenv.lib.licenses.mit;

    platforms = stdenv.lib.platforms.linux;
    maintainers = [ stdenv.lib.maintainers.the-kenny ];
--- a/pkgs/os-specific/linux/libcap-ng/default.nix
+++ b/pkgs/os-specific/linux/libcap-ng/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
    description = "Library for working with POSIX capabilities";
    homepage = http://people.redhat.com/sgrubb/libcap-ng/;
    platforms = stdenv.lib.platforms.linux;
-    license = "LGPLv2.1";
+    license = stdenv.lib.licenses.lgpl21;
  };
 }
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
    homepage = http://userspace.selinuxproject.org;
    platforms = platforms.linux;
    maintainers = [ maintainers.phreedom ];
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
--- a/pkgs/os-specific/linux/lsiutil/default.nix
+++ b/pkgs/os-specific/linux/lsiutil/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://www.lsi.com/;
    description = "LSI Logic Fusion MPT command line management tool";
-    license = "unfree";
+    license = stdenv.lib.licenses.unfree;
  };
 }
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/pkgs/os-specific/linux/net-tools/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://www.tazenda.demon.co.uk/phil/net-tools/;
    description = "A set of tools for controlling the network subsystem in Linux";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/os-specific/linux/netatop/default.nix
+++ b/pkgs/os-specific/linux/netatop/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
  meta = {
    description = "Network monitoring module for atop";
    homepage = http://www.atoptool.nl/downloadnetatop.php;
-    license = "GPL2";
+    license = stdenv.lib.licenses.gpl2;
    platforms = stdenv.lib.platforms.linux;
    maintainers = with stdenv.lib.maintainers; [viric];
  };
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
    '';

    homepage = http://nfs.sourceforge.net/;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;

    platforms = stdenv.lib.platforms.linux;
    maintainers = [ stdenv.lib.maintainers.ludo ];
--- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://www.nvidia.com/object/unix.html;
    description = "X.org driver and kernel module for Legacy NVIDIA graphics cards";
-    license = "unfree";
+    license = stdenv.lib.licenses.unfree;
  };
 }
--- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://www.nvidia.com/object/unix.html;
    description = "X.org driver and kernel module for NVIDIA graphics cards";
-    license = "unfree";
+    license = stdenv.lib.licenses.unfree;
  };
 }
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
  
  meta = {
    description = "A high performance, transport independent, multi-platform implementation of RFC3720";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
    homepage = http://www.open-iscsi.org;
    broken = true;
  };
--- a/pkgs/os-specific/linux/otpw/default.nix
+++ b/pkgs/os-specific/linux/otpw/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://www.cl.cam.ac.uk/~mgk25/otpw.html;
    description = "A one-time password login package";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
  };
 }
--- a/pkgs/os-specific/linux/pam_usb/default.nix
+++ b/pkgs/os-specific/linux/pam_usb/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://pamusb.org/;
    description = "Authentication using USB Flash Drives";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
--- a/pkgs/os-specific/linux/pcmciautils/default.nix
+++ b/pkgs/os-specific/linux/pcmciautils/default.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
      the PCMCIA subsystem to behave (almost) as every other
      hotpluggable bus system.
    ";
-    license = "GPL2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
--- a/pkgs/os-specific/linux/pm-utils/default.nix
+++ b/pkgs/os-specific/linux/pm-utils/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://pm-utils.freedesktop.org/wiki/;
    description = "A small collection of scripts that handle suspend and resume on behalf of HAL";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/os-specific/linux/pmount/default.nix
+++ b/pkgs/os-specific/linux/pmount/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://pmount.alioth.debian.org/;
    description = "Mount removable devices as normal user";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/os-specific/linux/pmtools/default.nix
+++ b/pkgs/os-specific/linux/pmtools/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://www.lesswatts.org/projects/acpi/utilities.php;
    description = "Linux ACPI utilities";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;

    platforms = stdenv.lib.platforms.linux;
    maintainers = [ stdenv.lib.maintainers.simons ];
--- a/pkgs/os-specific/linux/pommed/default.nix
+++ b/pkgs/os-specific/linux/pommed/default.nix
@@ -74,6 +74,6 @@ stdenv.mkDerivation rec {
  meta = {
    description = "A tool to handle hotkeys on Apple laptop keyboards";
    homepage = http://www.technologeek.org/projects/pommed/index.html;
-    license = "gplv2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

  meta = {
    description = "Analyze power consumption on Intel-based laptops";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    maintainers = [ stdenv.lib.maintainers.chaoflow ];
    platforms = stdenv.lib.platforms.linux;
  };
--- a/pkgs/os-specific/linux/psmouse-alps/default.nix
+++ b/pkgs/os-specific/linux/psmouse-alps/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
  meta = {
    description = "ALPS dlkm driver with all known touchpads";
    homepage = http://www.dahetral.com/public-download/alps-psmouse-dlkm-for-3-2-and-3-5/view;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    platforms = stdenv.lib.platforms.linux;
    maintainers = with stdenv.lib.maintainers; [viric];
  };
--- a/pkgs/os-specific/linux/radeontools/default.nix
+++ b/pkgs/os-specific/linux/radeontools/default.nix
@@ -24,9 +24,9 @@ stdenv.mkDerivation {
    cp radeontool lightwatch.pl $out/bin
  '';

-  meta = { 
+  meta = {
    description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards";
    homepage = http://fdd.com/software/radeon/;
-    license = "ZLIB";
+    license = stdenv.lib.licenses.zlib;
  };
 }
--- a/pkgs/os-specific/linux/setools/default.nix
+++ b/pkgs/os-specific/linux/setools/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
  meta = {
    description = "SELinux Tools";
    homepage = "http://oss.tresys.com/projects/setools/";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://sebastien.godard.pagesperso-orange.fr/;
    description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
    platforms = stdenv.lib.platforms.linux;
    maintainers = [ stdenv.lib.maintainers.eelco ];
  };
--- a/pkgs/os-specific/linux/tunctl/default.nix
+++ b/pkgs/os-specific/linux/tunctl/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://tunctl.sourceforge.net/;
    description = "Utility to set up and maintain TUN/TAP network interfaces";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -96,6 +96,6 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://www.uclibc.org/;
    description = "A small implementation of the C library";
-    license = "LGPLv2";
+    license = stdenv.lib.licenses.lgpl2;
  };
 }
--- a/pkgs/os-specific/linux/usermount/default.nix
+++ b/pkgs/os-specific/linux/usermount/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
  meta = {
    homepage = https://github.com/tom5760/usermount;
    description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus.";
-    license = "MIT";
+    license = stdenv.lib.licenses.mit;
    platforms = stdenv.lib.platforms.linux;
    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
  };
--- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
@@ -44,7 +44,6 @@ stdenv.mkDerivation {

    description = "An Xorg driver for multitouch trackpads";

-    license = "gplv2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
-
--- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
@@ -45,7 +45,6 @@ stdenv.mkDerivation {

    description = "Brings multitouch gestures to the Linux desktop";

-    license = "gplv2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
-