about summary refs log tree commit diff
path: root/pkgs/development/web/nodejs
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-10-21 06:01:21 +0000
committerGitHub <noreply@github.com>2021-10-21 06:01:21 +0000
commit54a42ab84624e64ad5a1f34daa9559d148970f95 (patch)
treec0aa5530f5b54164314562f1acdcf263856cb1bf /pkgs/development/web/nodejs
parent872437b0f00c78710781d47fab8aba054ad70f0b (diff)
parent3897b34444c325967e4da83033539fc7f37cc489 (diff)
downloadnixlib-54a42ab84624e64ad5a1f34daa9559d148970f95.tar
nixlib-54a42ab84624e64ad5a1f34daa9559d148970f95.tar.gz
nixlib-54a42ab84624e64ad5a1f34daa9559d148970f95.tar.bz2
nixlib-54a42ab84624e64ad5a1f34daa9559d148970f95.tar.lz
nixlib-54a42ab84624e64ad5a1f34daa9559d148970f95.tar.xz
nixlib-54a42ab84624e64ad5a1f34daa9559d148970f95.tar.zst
nixlib-54a42ab84624e64ad5a1f34daa9559d148970f95.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/development/web/nodejs')
-rw-r--r--pkgs/development/web/nodejs/nodejs.nix2
-rw-r--r--pkgs/development/web/nodejs/v16.nix4
-rw-r--r--pkgs/development/web/nodejs/v17.nix13
3 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 86332bf7b69c..7b88b0f8fd37 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -139,7 +139,7 @@ in
     meta = {
       description = "Event-driven I/O framework for the V8 JavaScript engine";
       homepage = "https://nodejs.org";
-      changelog = "https://github.com/nodejs/node/blob/v${version}/doc/changelogs/CHANGELOG_V${majorVersion}.md#${version}";
+      changelog = "https://github.com/nodejs/node/releases/tag/v${version}";
       license = licenses.mit;
       maintainers = with maintainers; [ goibhniu gilligan cko marsam ];
       platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix
index 698108a42b60..9cbe093c7a39 100644
--- a/pkgs/development/web/nodejs/v16.nix
+++ b/pkgs/development/web/nodejs/v16.nix
@@ -8,7 +8,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "16.11.1";
-    sha256 = "0y32mdv8zs35la2bny8d9rxjvj1vr8z079ji1g6ajc2yw96pyn37";
+    version = "16.12.0";
+    sha256 = "1b3bschfa7946jwyqp3nmbdv7ap3rl4p7h50b9bac08981m0lqjz";
     patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
   }
diff --git a/pkgs/development/web/nodejs/v17.nix b/pkgs/development/web/nodejs/v17.nix
new file mode 100644
index 000000000000..e417582b16a9
--- /dev/null
+++ b/pkgs/development/web/nodejs/v17.nix
@@ -0,0 +1,13 @@
+{ callPackage, python3, enableNpm ? true }:
+
+let
+  buildNodejs = callPackage ./nodejs.nix {
+    python = python3;
+  };
+in
+buildNodejs {
+  inherit enableNpm;
+  version = "17.0.1";
+  sha256 = "071lhqbn103rnn8avqmqwnn2k4yqgcymx624f23k8z6bfbw81i3f";
+  patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
+}