Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/development/web/csslint/default.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "checks CSS for syntax errors and other problems";
+    description = "Checks CSS for syntax errors and other problems";
     longDescription = ''
       CSSLint is a tool to help point out problems with your CSS
       code. It does basic syntax checking as well as applying a set of

pkgs/development/web/minify/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "minify-${version}";
+  version = "v2.0.0";
+  rev = "41f3effd65817bac8acea89d49b3982211803a4d";
+
+  goPackagePath = "github.com/tdewolff/minify";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "tdewolff";
+    repo = "minify";
+    sha256 = "15d9ivg1a9v9c2n0a9pfw74952xhd4vqgx8d60dhvif9lx1d8wlq";
+  };
+
+  goDeps = ./deps.json;
+}

pkgs/development/web/minify/deps.json

@@ -0,0 +1,15 @@
+[
+    {
+        "include": "../../libs.json",
+        "packages": [
+            "github.com/tdewolff/buffer",
+            "github.com/tdewolff/parse",
+            "github.com/tdewolff/strconv",
+            "github.com/dustin/go-humanize",
+            "github.com/fsnotify/fsnotify",
+            "github.com/matryer/try",
+            "github.com/ogier/pflag",
+            "golang.org/x/sys"
+        ]
+    }
+]

pkgs/development/web/nodejs/nodejs.nix

@@ -2,6 +2,7 @@
 , pkgconfig, runCommand, which, libtool
 , version
 , src
+, preBuild ? ""
 , ...
 }:
 
@@ -25,9 +26,7 @@ let
 
 in stdenv.mkDerivation {
 
-  inherit version;
-
-  inherit src;
+  inherit version src preBuild;
 
   name = "nodejs-${version}";
 

pkgs/development/web/nodejs/v4.nix

@@ -4,9 +4,9 @@
 }@args:
 
 import ./nodejs.nix (args // rec {
-  version = "4.4.4";
+  version = "4.4.6";
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
-    sha256 = "055i4wcc5sfqv7ksdxwbxpy4v1qc16lkzgbyhx46cnhl072fv71c";
+    sha256 = "0f6bbfbea525469c91932b1aac35e0810e6bcda96f1c720e42a433942ee66106";
   };
 })

pkgs/development/web/nodejs/v6.nix

@@ -4,9 +4,13 @@
 }@args:
 
 import ./nodejs.nix (args // rec {
-  version = "6.2.0";
+  version = "6.2.2";
   src = fetchurl {
     url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-    sha256 = "14p4ah9gsgifj25g2akp7kyqhnqvq726n74h4rfj7wnidxhgwcw6";
+    sha256 = "2dfeeddba750b52a528b38a1c31e35c1fb40b19cf28fbf430c3c8c7a6517005a";
   };
+  preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+    sed -i -e "s|tr1/type_traits|type_traits|g" \
+      -e "s|std::tr1|std|" src/util.h
+  '';
 })

pkgs/development/web/remarkjs/default.nix

@@ -62,5 +62,6 @@ in stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.rickynils ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.mit;
+    broken = true;
   };
 }