treewide: node*.nix remove references to nodejs-12_x

main
ajs124 2 years ago
parent 9d8c5fee6b
commit c4b8828630
  1. 2
      pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
  2. 2
      pkgs/applications/networking/cluster/spacegun/node-composition.nix
  3. 2
      pkgs/applications/version-management/cz-cli/node-composition.nix
  4. 2
      pkgs/development/compilers/elm/packages/node-composition.nix
  5. 2
      pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix
  6. 4
      pkgs/development/web/cypress/cypress-example-kitchensink/default.nix
  7. 2
      pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix
  8. 2
      pkgs/development/web/newman/node-composition.nix
  9. 2
      pkgs/misc/base16-builder/generate.sh
  10. 2
      pkgs/misc/base16-builder/node-packages.nix
  11. 2
      pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
  12. 2
      pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
  13. 2
      pkgs/servers/psitransfer/node-composition.nix
  14. 2
      pkgs/servers/web-apps/whitebophir/node-packages.nix
  15. 4
      pkgs/tools/graphics/ldgallery/viewer/default.nix
  16. 2
      pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
  17. 2
      pkgs/tools/networking/airfield/deps.sh
  18. 2
      pkgs/tools/networking/airfield/node.nix

@ -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 \

@ -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 {

@ -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 {

@ -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 {

@ -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 {

@ -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
];

@ -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 \

@ -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 {

@ -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 \

@ -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 {

@ -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 \

@ -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 {

@ -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 {

@ -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 {

@ -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 {

@ -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 {

@ -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

@ -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 {

Loading…
Cancel
Save