Merge branch 'master' into staging

Hydra nixpkgs: ?compare=1286624
2016-08-07 11:35:28 +02:00
parent 3659e44f98 f7f8de64f4
commit 03e32315a5
1229 changed files with 6400 additions and 2848 deletions
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
    description = "Build automation tool (used primarily for Java projects)";
    homepage = http://maven.apache.org/;
    license = licenses.asl20;
+    platforms = platforms.unix;
  };
 }
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
    description = "Build tool that builds code quickly and reliably";
    license = stdenv.lib.licenses.asl20;
    maintainers = [ stdenv.lib.maintainers.philandstuff ];
+    platforms = [ "x86_64-linux" ];
  };
 }
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Simple wrapper around make to colorize the output";
    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
  };
 }
@@ -7,4 +7,8 @@ stdenv.mkDerivation {
    md5 = "0bbd1df101bc0294d440471e50feca71";
  };
  patches = [./log.patch];
+
+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }
@@ -43,5 +43,6 @@ stdenv.mkDerivation {

    license = stdenv.lib.licenses.gpl2Plus;
    maintainers = [ ];
+    platforms = stdenv.lib.platforms.unix;
  };
 }
@@ -31,4 +31,8 @@ stdenv.mkDerivation rec {
      . $out/Library/GNUstep/Makefiles/GNUstep.sh
    EOF
  '';
+
+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }
@@ -47,6 +47,7 @@ rec {
      '';
      homepage = http://www.gradle.org/;
      license = stdenv.lib.licenses.asl20;
+      platforms = stdenv.lib.platforms.unix;
    };
  };

@@ -2,10 +2,10 @@

 stdenv.mkDerivation rec {
  name = "icmake-${version}";
-  version = "8.01.00";
+  version = "9.00.00";

  src = fetchFromGitHub {
-    sha256 = "1vgjywbc4w1agkakfndr2qf0z0ncxisihdv8sz9ipry9f170np39";
+    sha256 = "028rxx4ygy0z48m30m5pdach7kcp41swchhs8i15wag1mppllcy2";
    rev = version;
    repo = "icmake";
    owner = "fbb-git";
@@ -24,5 +24,6 @@ stdenv.mkDerivation {
    homepage = http://public.perforce.com/wiki/Jam;
    license = stdenv.lib.licenses.free;
    description = "Just Another Make";
+    platforms = stdenv.lib.platforms.linux;
  };
 }
@@ -7,4 +7,8 @@ stdenv.mkDerivation {
    md5 = "167fd4e0eea4f49def01984ec203289b";
  };
  builder = ./builder.sh;
+
+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }