diff options
Diffstat (limited to 'nixpkgs/pkgs/development/web/nodejs')
-rw-r--r-- | nixpkgs/pkgs/development/web/nodejs/nodejs.nix | 8 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/web/nodejs/v10.nix | 11 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/web/nodejs/v12.nix | 11 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/web/nodejs/v13.nix | 11 |
4 files changed, 25 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/nixpkgs/pkgs/development/web/nodejs/nodejs.nix index dce8479d219..5eeed80007b 100644 --- a/nixpkgs/pkgs/development/web/nodejs/nodejs.nix +++ b/nixpkgs/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 @@ -139,11 +139,11 @@ in meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; - homepage = https://nodejs.org; + homepage = "https://nodejs.org"; license = licenses.mit; maintainers = with maintainers; [ goibhniu gilligan cko ]; 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/nixpkgs/pkgs/development/web/nodejs/v10.nix b/nixpkgs/pkgs/development/web/nodejs/v10.nix index 815b569a7eb..612cccbe877 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v10.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v10.nix @@ -1,10 +1,13 @@ -{ 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; - version = "10.19.0"; - sha256 = "0sginvcsf7lrlzsnpahj4bj1f673wfvby8kaxgvzlrbb7sy229v2"; + version = "10.20.1"; + sha256 = "14pljmfr0dkj6y63j0qzj173kdpbbs4v1g4v56hyv2k09jh8h7zf"; } diff --git a/nixpkgs/pkgs/development/web/nodejs/v12.nix b/nixpkgs/pkgs/development/web/nodejs/v12.nix index 3fa5216ccf8..14b64094efa 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v12.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -1,10 +1,13 @@ -{ 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; - version = "12.16.1"; - sha256 = "0ba1dla31z6i31z3723l74nky1v04irwbl3iaqmi0iicl1dq958a"; + version = "12.16.2"; + sha256 = "0y5yd6h13fr34byi7h5xdjaivgcxiz0ykcmpk9nm5ra01b54fp2m"; } diff --git a/nixpkgs/pkgs/development/web/nodejs/v13.nix b/nixpkgs/pkgs/development/web/nodejs/v13.nix index c5e3f7c4bdb..1f32c660f89 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v13.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v13.nix @@ -1,10 +1,13 @@ -{ 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; - version = "13.11.0"; - sha256 = "07r9xwjmiip9zmgfq77f3av3p93adc5cphj07idph1l8ws1j2h75"; + version = "13.13.0"; + sha256 = "0wy7d2alli59gwl73hpaf3bz1wxkkcw5yjsgyz42695fz86p64b7"; } |