diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-05 13:06:02 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-05 13:06:02 -0700 |
| commit | d605663ae287ea0f0bfc2e802ae276ab720da71e (patch) | |
| tree | c4eae3b9be5c196b51b788aedab2f3a7dc2b5bb1 /pkgs/development/web | |
| parent | 236366019187b5fbe568764ade67ae034cac796e (diff) | |
| parent | 2d1aafef553ce7fbb854def7fd20a7e799b653c4 (diff) | |
| download | nixlib-d605663ae287ea0f0bfc2e802ae276ab720da71e.tar nixlib-d605663ae287ea0f0bfc2e802ae276ab720da71e.tar.gz nixlib-d605663ae287ea0f0bfc2e802ae276ab720da71e.tar.bz2 nixlib-d605663ae287ea0f0bfc2e802ae276ab720da71e.tar.lz nixlib-d605663ae287ea0f0bfc2e802ae276ab720da71e.tar.xz nixlib-d605663ae287ea0f0bfc2e802ae276ab720da71e.tar.zst nixlib-d605663ae287ea0f0bfc2e802ae276ab720da71e.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/iojs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/default.nix | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index 8c90e421944f..6fef81300aba 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }: let - version = "2.3.1"; + version = "2.3.3"; inherit (stdenv.lib) optional maintainers licenses platforms; in stdenv.mkDerivation { name = "iojs-${version}"; src = fetchurl { url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; - sha256 = "1vkahs7ky551gl52l8j8f2w8ajasjblqqmhird5ll87wccx8w6f2"; + sha256 = "12fdz0as1sa34bq4a701qwrznpn7y1wq0yxlr5yw494ifchfm103"; }; prePatch = '' diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 2f5e4160923a..f0598f735596 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -42,9 +42,6 @@ in stdenv.mkDerivation { patches = if stdenv.isDarwin then [ ./no-xcode.patch ] else null; - postPatch = if stdenv.isDarwin then '' - (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch}) - '' else null; preBuild = if stdenv.isDarwin then '' patchShebangs . |