diff options
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 389229e04f242..3d1b470edfcdf 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 02fdb925fb1b0..0c0b678d98f22 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 53bdef1f98646..4dfddf3e5bcaf 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 8fd8c0ffcce3c..bbb39db07b714 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 653dbe4a257a7..af8e916490903 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 86fec8950002f..a98493ab20e15 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 86061211d7b3c..ba35dafe5269e 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 64326c6b21602..f929727d59d62 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 1d06b6230dbb0..fb13a70bc6795 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 006429c9ed447..dacf1581ada01 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 1fceed1c72c1c..06245937bcb27 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 9f0040e2f4465..f9a1999f36d73 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 749d685105d57..1de33eb05b838 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 0961603968eac..862d223400999 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 f4cebde86070b..c47abd91f2a05 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 02fdb925fb1b0..0c0b678d98f22 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 81767110283fc..a880801d1a917 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 9f0040e2f4465..f9a1999f36d73 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 { |