diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-04-07 14:45:55 +0300 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2020-04-07 15:33:49 +0300 |
| commit | 75fa5ad17cb30cb105282a1a8cfe8fb805d42d8e (patch) | |
| tree | 188f8e25a90cf7dae1591371fb4c539a6647c813 | |
| parent | f601ab37c2fb7e5f65989a92df383bcd6942567a (diff) | |
| download | nixpkgs-75fa5ad17cb30cb105282a1a8cfe8fb805d42d8e.tar nixpkgs-75fa5ad17cb30cb105282a1a8cfe8fb805d42d8e.tar.gz nixpkgs-75fa5ad17cb30cb105282a1a8cfe8fb805d42d8e.tar.bz2 nixpkgs-75fa5ad17cb30cb105282a1a8cfe8fb805d42d8e.tar.lz nixpkgs-75fa5ad17cb30cb105282a1a8cfe8fb805d42d8e.tar.xz nixpkgs-75fa5ad17cb30cb105282a1a8cfe8fb805d42d8e.tar.zst nixpkgs-75fa5ad17cb30cb105282a1a8cfe8fb805d42d8e.zip | |
nodejs: pin python versions and use python3 when possible
| -rw-r--r-- | pkgs/development/web/nodejs/nodejs.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v10.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v12.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v13.nix | 7 |
4 files changed, 18 insertions, 9 deletions
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index dce8479d219..ce872fbcb5e 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser +{ stdenv, fetchurl, openssl, python, zlib, libuv, utillinux, http-parser , pkgconfig, which # Updater dependencies , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell @@ -55,7 +55,7 @@ in buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] ++ [ zlib libuv openssl http-parser icu ]; - nativeBuildInputs = [ which utillinux pkgconfig python2 ] + nativeBuildInputs = [ which utillinux pkgconfig python ] ++ optionals stdenv.isDarwin [ xcbuild ]; configureFlags = let @@ -145,5 +145,5 @@ in platforms = platforms.linux ++ platforms.darwin; }; - passthru.python = python2; # to ensure nodeEnv uses the same version + passthru.python = python; # to ensure nodeEnv uses the same version } diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 815b569a7eb..eb39446400c 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -1,7 +1,10 @@ -{ callPackage, openssl, enableNpm ? true }: +{ callPackage, openssl, icu, python2, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; + buildNodejs = callPackage ./nodejs.nix { + inherit openssl icu; + python = python2; + }; in buildNodejs { inherit enableNpm; diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 3fa5216ccf8..5fe8d431717 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -1,7 +1,10 @@ -{ callPackage, openssl, icu, enableNpm ? true }: +{ callPackage, openssl, icu, python2, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; + buildNodejs = callPackage ./nodejs.nix { + inherit openssl icu; + python = python2; + }; in buildNodejs { inherit enableNpm; diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index 8676214b50b..0728e7fc70f 100644 --- a/pkgs/development/web/nodejs/v13.nix +++ b/pkgs/development/web/nodejs/v13.nix @@ -1,7 +1,10 @@ -{ callPackage, openssl, icu, enableNpm ? true }: +{ callPackage, openssl, icu, python3, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; + buildNodejs = callPackage ./nodejs.nix { + inherit openssl icu; + python = python3; + }; in buildNodejs { inherit enableNpm; |