diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
| commit | f8d481754cf842ca6e6ac1427ce0f571f5a44108 (patch) | |
| tree | 70e702285987429aed275e0d5e2dc15c050e1f8c /pkgs/development/web | |
| parent | 9fbc20e2f89bc045efac7ade41949a2c2d571dec (diff) | |
| parent | 3cd63ade1614d4c581735ffb0cebe181bf87dfc8 (diff) | |
| download | nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.gz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.bz2 nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.lz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.xz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.zst nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.zip | |
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/grails/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v0_10.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v6.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 5b9e27b4829f..ef8ac133b2c3 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; - buildPhase = "true"; + dontBuild = true; installPhase = '' mkdir -p "$out" diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix index 3196153b6047..9845aa3bf8c8 100644 --- a/pkgs/development/web/nodejs/v0_10.nix +++ b/pkgs/development/web/nodejs/v0_10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares +{ stdenv, lib, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares , pkgconfig, runCommand, which, libtool # apple frameworks @@ -20,10 +20,10 @@ let }) // ({ cares = c-ares; }); - sharedConfigureFlags = name: [ + sharedConfigureFlags = name: let drv = builtins.getAttr name deps; in [ "--shared-${name}" - "--shared-${name}-includes=${builtins.getAttr name deps}/include" - "--shared-${name}-libpath=${builtins.getAttr name deps}/lib" + "--shared-${name}-includes=${lib.getDev drv}/include" + "--shared-${name}-libpath=${lib.getLib drv}/lib" ]; inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms; diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index ffb25f0ed59c..7ce41e3fcdfe 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -4,9 +4,9 @@ }@args: import ./nodejs.nix (args // rec { - version = "6.0.0"; + version = "6.2.0"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.gz"; - sha256 = "0cpw7ng193jgfbw2g1fd0kcglmjjkbj4xb89g00z8zz0lj0nvdbd"; + sha256 = "1fcldsnkk6px5fms405j9z2yv6mmscin5x7sma8bdavqgn283zgw"; }; }) |