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

This commit is contained in:
Robin Gloster
2016-05-30 19:39:34 +00:00
711 changed files with 49079 additions and 11672 deletions
+3 -3
View File
@@ -4,9 +4,9 @@
}@args:
import ./nodejs.nix (args // rec {
version = "4.3.1";
version = "4.4.4";
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
sha256 = "0wzf5sirbph5kaik3pm9i2dxbjwqh5qlnqn71azrsv0vhs7dbqk1";
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
sha256 = "055i4wcc5sfqv7ksdxwbxpy4v1qc16lkzgbyhx46cnhl072fv71c";
};
})
+3 -3
View File
@@ -4,9 +4,9 @@
}@args:
import ./nodejs.nix (args // rec {
version = "5.11.0";
version = "5.11.1";
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
sha256 = "14ayv5rgagc6lj7fil0bdbzwj2qxj5picw802rfmmpj9kqdb0hgg";
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
sha256 = "07v60mhswj77m7516zakj3p1py7ixa5jbgj0m7zlr9vygrrc66zi";
};
})
+2 -2
View File
@@ -6,7 +6,7 @@
import ./nodejs.nix (args // rec {
version = "6.2.0";
src = fetchurl {
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.gz";
sha256 = "1fcldsnkk6px5fms405j9z2yv6mmscin5x7sma8bdavqgn283zgw";
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
sha256 = "14p4ah9gsgifj25g2akp7kyqhnqvq726n74h4rfj7wnidxhgwcw6";
};
})