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
@@ -34,7 +34,7 @@ buildPythonPackage (rec {
  meta = with stdenv.lib; {
    homepage = http://buildbot.net/;

-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;

    description = "Continuous integration system that automates the build/test cycle";

@@ -52,7 +52,7 @@ buildPythonPackage (rec {
  meta = with stdenv.lib; {
    homepage = http://buildbot.net/;

-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;

    # Of course, we don't really need that on NixOS.  :-)
    description = "Continuous integration system that automates the build/test cycle";
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {

  meta = {
    description = "Simple wrapper around make to colorize the output";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
@@ -41,7 +41,7 @@ stdenv.mkDerivation {

    homepage = http://www.gnu.org/software/make/;

-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
    maintainers = [ stdenv.lib.maintainers.ludo ];
  };
 }
@@ -56,7 +56,7 @@ stdenv.mkDerivation {

    homepage = http://www.gnu.org/software/make/;

-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
    maintainers = [ stdenv.lib.maintainers.ludo ];
    platforms = stdenv.lib.platforms.all;
  };
@@ -42,7 +42,7 @@ stdenv.mkDerivation {

    homepage = http://www.gnu.org/software/make/;

-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
    maintainers = [ stdenv.lib.maintainers.ludo ];
    platforms = stdenv.lib.platforms.all;
  };
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
      build-by-convention behavior.
    '';
    homepage = http://www.gradle.org/;
-    license = "ASL2.0";
+    license = stdenv.lib.licenses.asl20;
  };
 }
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
  meta = {
    homepage = "http://scons.org/";
    description = "An improved, cross-platform substitute for Make";
-    license = "MIT";
+    license = stdenv.lib.licenses.mit;
    longDescription = ''
      SCons is an Open Source software construction tool. Think of
      SCons as an improved, cross-platform substitute for the classic