public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nodejs: pin python versions and use python3 when possible

Browse Source
This commit is contained in:
Doron Behar 2020-04-07 14:45:55 +03:00
parent f601ab37c2
commit 75fa5ad17c
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/web/nodejs/nodejs.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser { stdenv, fetchurl, openssl, python, zlib, libuv, utillinux, http-parser
, pkgconfig, which , pkgconfig, which
# Updater dependencies # Updater dependencies
, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell
@ -55,7 +55,7 @@ in
buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
++ [ zlib libuv openssl http-parser icu ]; ++ [ zlib libuv openssl http-parser icu ];
nativeBuildInputs = [ which utillinux pkgconfig python2 ] nativeBuildInputs = [ which utillinux pkgconfig python ]
++ optionals stdenv.isDarwin [ xcbuild ]; ++ optionals stdenv.isDarwin [ xcbuild ];
configureFlags = let configureFlags = let
@ -145,5 +145,5 @@ in
platforms = platforms.linux ++ platforms.darwin; 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
} }

7
pkgs/development/web/nodejs/v10.nix
View File

@ -1,7 +1,10 @@
{ callPackage, openssl, enableNpm ? true }: { callPackage, openssl, icu, python2, enableNpm ? true }:
let let
buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; buildNodejs = callPackage ./nodejs.nix {
inherit openssl icu;
python = python2;
};
in in
buildNodejs { buildNodejs {
inherit enableNpm; inherit enableNpm;

7
pkgs/development/web/nodejs/v12.nix
View File

@ -1,7 +1,10 @@
{ callPackage, openssl, icu, enableNpm ? true }: { callPackage, openssl, icu, python2, enableNpm ? true }:
let let
buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; buildNodejs = callPackage ./nodejs.nix {
inherit openssl icu;
python = python2;
};
in in
buildNodejs { buildNodejs {
inherit enableNpm; inherit enableNpm;

7
pkgs/development/web/nodejs/v13.nix
View File

@ -1,7 +1,10 @@
{ callPackage, openssl, icu, enableNpm ? true }: { callPackage, openssl, icu, python3, enableNpm ? true }:
let let
buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; buildNodejs = callPackage ./nodejs.nix {
inherit openssl icu;
python = python3;
};
in in
buildNodejs { buildNodejs {
inherit enableNpm; inherit enableNpm;