summary refs log tree commit diff
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2022-07-04 03:25:01 +0200
committerajs124 <git@ajs124.de>2022-07-04 15:33:57 +0200
commitc4b88286304b7b48b1e58922790fc279241536ca (patch)
treebbafd643c64e3c32894d9936900168f27545ffe6
parent9d8c5fee6b5e587a52a9eb39ba84715fcff2ca24 (diff)
downloadnixpkgs-c4b88286304b7b48b1e58922790fc279241536ca.tar
nixpkgs-c4b88286304b7b48b1e58922790fc279241536ca.tar.gz
nixpkgs-c4b88286304b7b48b1e58922790fc279241536ca.tar.bz2
nixpkgs-c4b88286304b7b48b1e58922790fc279241536ca.tar.lz
nixpkgs-c4b88286304b7b48b1e58922790fc279241536ca.tar.xz
nixpkgs-c4b88286304b7b48b1e58922790fc279241536ca.tar.zst
nixpkgs-c4b88286304b7b48b1e58922790fc279241536ca.zip
treewide: node*.nix remove references to nodejs-12_x
-rw-r--r--pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh2
-rw-r--r--pkgs/applications/networking/cluster/spacegun/node-composition.nix2
-rw-r--r--pkgs/applications/version-management/cz-cli/node-composition.nix2
-rw-r--r--pkgs/development/compilers/elm/packages/node-composition.nix2
-rw-r--r--pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix2
-rw-r--r--pkgs/development/web/cypress/cypress-example-kitchensink/default.nix4
-rwxr-xr-xpkgs/development/web/cypress/cypress-example-kitchensink/regen-nix2
-rw-r--r--pkgs/development/web/newman/node-composition.nix2
-rwxr-xr-xpkgs/misc/base16-builder/generate.sh2
-rw-r--r--pkgs/misc/base16-builder/node-packages.nix2
-rwxr-xr-xpkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh2
-rw-r--r--pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix2
-rw-r--r--pkgs/servers/psitransfer/node-composition.nix2
-rw-r--r--pkgs/servers/web-apps/whitebophir/node-packages.nix2
-rw-r--r--pkgs/tools/graphics/ldgallery/viewer/default.nix4
-rw-r--r--pkgs/tools/graphics/ldgallery/viewer/node-composition.nix2
-rwxr-xr-xpkgs/tools/networking/airfield/deps.sh2
-rw-r--r--pkgs/tools/networking/airfield/node.nix2
18 files changed, 20 insertions, 20 deletions
diff --git a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
index 389229e04f2..3d1b470edfc 100644
--- a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
+++ b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
@@ -6,7 +6,7 @@ curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db
 curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package-lock.json -o package-lock.json
 
 node2nix \
-  --nodejs-12 \
+  --nodejs-16 \
   --node-env ../../../../development/node-packages/node-env.nix \
   --development \
   --input package.json \
diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix
index 02fdb925fb1..0c0b678d98f 100644
--- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix
+++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
 
 let
   nodeEnv = import ../../../../development/node-packages/node-env.nix {
diff --git a/pkgs/applications/version-management/cz-cli/node-composition.nix b/pkgs/applications/version-management/cz-cli/node-composition.nix
index 53bdef1f986..4dfddf3e5bc 100644
--- a/pkgs/applications/version-management/cz-cli/node-composition.nix
+++ b/pkgs/applications/version-management/cz-cli/node-composition.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
 
 let
   nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index 8fd8c0ffcce..bbb39db07b7 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
 
 let
   nodeEnv = import ../../../node-packages/node-env.nix {
diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix
index 653dbe4a257..af8e9164909 100644
--- a/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix
+++ b/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
 
 let
   nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix
index 86fec895000..a98493ab20e 100644
--- a/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix
+++ b/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix
@@ -1,6 +1,6 @@
 { callPackage
 , cypress
-, nodejs-12_x
+, nodejs-14_x
 , # FIXME: duplicated from ./regen-nix. node2nix should expose this
   nodePackages
 , xorg
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   passthru.fc = fontConfigEtc;
   nativeBuildInputs = [
     cypress
-    nodejs-12_x
+    nodejs-14_x
     xorg.xorgserver
     nodePackages.jsonplaceholder
   ];
diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix
index 86061211d7b..ba35dafe526 100755
--- a/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix
+++ b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix
@@ -3,7 +3,7 @@
 #!nix-shell -i bash
 
 node2nix \
-  --nodejs-12 \
+  --nodejs-16 \
   --input $src/package.json \
   --lock $src/package-lock.json \
   --composition cypress-example-kitchensink.nix \
diff --git a/pkgs/development/web/newman/node-composition.nix b/pkgs/development/web/newman/node-composition.nix
index 64326c6b216..f929727d59d 100644
--- a/pkgs/development/web/newman/node-composition.nix
+++ b/pkgs/development/web/newman/node-composition.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
 
 let
   nodeEnv = import ./node-env.nix {
diff --git a/pkgs/misc/base16-builder/generate.sh b/pkgs/misc/base16-builder/generate.sh
index 1d06b6230db..fb13a70bc67 100755
--- a/pkgs/misc/base16-builder/generate.sh
+++ b/pkgs/misc/base16-builder/generate.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash -p nodePackages.node2nix
-exec node2nix --nodejs-12 \
+exec node2nix --nodejs-16 \
      --input node-packages.json \
      --output node-packages-generated.nix \
      --supplement-input supplement.json \
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
index 006429c9ed4..dacf1581ada 100644
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ b/pkgs/misc/base16-builder/node-packages.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
 
 let
   globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix {
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
index 1fceed1c72c..06245937bcb 100755
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
@@ -6,7 +6,7 @@ curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.11.0
 curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.11.0/package-lock.json -o package-lock.json
 
 node2nix \
-  --nodejs-12 \
+  --nodejs-16 \
   --node-env ../../../development/node-packages/node-env.nix \
   --development \
   --input package.json \
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
index 9f0040e2f44..f9a1999f36d 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/servers/psitransfer/node-composition.nix b/pkgs/servers/psitransfer/node-composition.nix
index 749d685105d..1de33eb05b8 100644
--- a/pkgs/servers/psitransfer/node-composition.nix
+++ b/pkgs/servers/psitransfer/node-composition.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
 
 let
   nodeEnv = import ../../development/node-packages/node-env.nix {
diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.nix b/pkgs/servers/web-apps/whitebophir/node-packages.nix
index 0961603968e..862d2234009 100644
--- a/pkgs/servers/web-apps/whitebophir/node-packages.nix
+++ b/pkgs/servers/web-apps/whitebophir/node-packages.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/graphics/ldgallery/viewer/default.nix b/pkgs/tools/graphics/ldgallery/viewer/default.nix
index f4cebde8607..c47abd91f2a 100644
--- a/pkgs/tools/graphics/ldgallery/viewer/default.nix
+++ b/pkgs/tools/graphics/ldgallery/viewer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgs, nodejs-12_x, pandoc, CoreServices }:
+{ lib, stdenv, fetchFromGitHub, pkgs, nodejs-14_x, pandoc, CoreServices }:
 
 with lib;
 
@@ -18,7 +18,7 @@ let
     inherit (stdenv.hostPlatform) system;
 
     # some native node dependencies still require NodeJS 12 with Python 2
-    nodejs = nodejs-12_x;
+    nodejs = nodejs-14_x;
   };
 
   nodePkg = nodePackages.package.override {
diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
index 02fdb925fb1..0c0b678d98f 100644
--- a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
+++ b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
 
 let
   nodeEnv = import ../../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/networking/airfield/deps.sh b/pkgs/tools/networking/airfield/deps.sh
index 81767110283..a880801d1a9 100755
--- a/pkgs/tools/networking/airfield/deps.sh
+++ b/pkgs/tools/networking/airfield/deps.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash -p nodePackages.node2nix
 
-node2nix --nodejs-12 -i deps.json \
+node2nix --nodejs-16 -i deps.json \
   --no-copy-node-env \
   -e ../../../development/node-packages/node-env.nix -c node.nix
diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix
index 9f0040e2f44..f9a1999f36d 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/pkgs/tools/networking/airfield/node.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {