diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-09-08 18:24:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-09-08 18:24:58 +0200 |
| commit | 82797f98f2917e164db8691b516ed7f354b40ff4 (patch) | |
| tree | 4f901da1992cb81e6dd1a259c3c1087afe710699 /pkgs/development/web | |
| parent | 1e389c976cc5326b08bd166785e643364bb2d8b4 (diff) | |
| parent | 152ae27aac2a78acee996eb035ef2b40e58bbf9d (diff) | |
| download | nixlib-82797f98f2917e164db8691b516ed7f354b40ff4.tar nixlib-82797f98f2917e164db8691b516ed7f354b40ff4.tar.gz nixlib-82797f98f2917e164db8691b516ed7f354b40ff4.tar.bz2 nixlib-82797f98f2917e164db8691b516ed7f354b40ff4.tar.lz nixlib-82797f98f2917e164db8691b516ed7f354b40ff4.tar.xz nixlib-82797f98f2917e164db8691b516ed7f354b40ff4.tar.zst nixlib-82797f98f2917e164db8691b516ed7f354b40ff4.zip | |
Merge branch 'staging' into modular-stdenv
Conflicts: pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/stdenv/linux/default.nix
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/nodejs/build-node-package.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 84b0da1674c4..ca3439df4c46 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -8,7 +8,7 @@ let npmFlags = concatStringsSep " " (map (v: "--${v}") flags); sources = runCommand "node-sources" {} '' - tar --no-same-owner -xf ${nodejs.src} + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} mv *node* $out ''; diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index c53cee4a20e3..1b3d4950e377 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -6,7 +6,7 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = "0.10.29"; + version = "0.10.30"; # !!! Should we also do shared libuv? deps = { @@ -30,7 +30,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "0pdib215ldypc149ad03wlfj0i8fwdfydd4q2hd7ry35yw0rsds7"; + sha256 = "1li5hs8dada2lj9j82xas39kr1fs0wql9qbly5p2cpszgwqbvz1x"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); |