treewide: remove references to nodejs-10_x

nodejs-10_x was dropped by https://github.com/NixOS/nixpkgs/pull/175637
This commit is contained in:
Mario Rodas
2022-06-09 04:20:00 +00:00
committed by Florian Brandes
parent 5dcfe6af72
commit 323bbd44c7
7 changed files with 7 additions and 7 deletions

View File

@@ -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 curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package-lock.json -o package-lock.json
node2nix \ node2nix \
--nodejs-10 \ --nodejs-12 \
--node-env ../../../../development/node-packages/node-env.nix \ --node-env ../../../../development/node-packages/node-env.nix \
--development \ --development \
--input package.json \ --input package.json \

View File

@@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
let let
nodeEnv = import ../../../../development/node-packages/node-env.nix { nodeEnv = import ../../../../development/node-packages/node-env.nix {

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix #! nix-shell -i bash -p nodePackages.node2nix
exec node2nix --nodejs-10 \ exec node2nix --nodejs-12 \
--input node-packages.json \ --input node-packages.json \
--output node-packages-generated.nix \ --output node-packages-generated.nix \
--supplement-input supplement.json \ --supplement-input supplement.json \

View File

@@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
let let
globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix { globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix {

View File

@@ -6,7 +6,7 @@
cryptpadSrc=$(nix eval '(import ../../../.. {}).cryptpad.src' --raw) cryptpadSrc=$(nix eval '(import ../../../.. {}).cryptpad.src' --raw)
echo "cryptpad src: $cryptpadSrc" echo "cryptpad src: $cryptpadSrc"
nix-shell -I nixpkgs=../../../.. -p '(nodePackages.override { nodejs = nodejs-10_x; }).bower2nix' --run "bower2nix $cryptpadSrc/bower.json bower-packages.nix" nix-shell -I nixpkgs=../../../.. -p '(nodePackages.override { nodejs = nodejs-12_x; }).bower2nix' --run "bower2nix $cryptpadSrc/bower.json bower-packages.nix"
set -euo pipefail set -euo pipefail

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix #! nix-shell -i bash -p nodePackages.node2nix
node2nix --nodejs-10 -i deps.json \ node2nix --nodejs-12 -i deps.json \
--no-copy-node-env \ --no-copy-node-env \
-e ../../../development/node-packages/node-env.nix -c node.nix -e ../../../development/node-packages/node-env.nix -c node.nix

View File

@@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
let let
nodeEnv = import ../../../development/node-packages/node-env.nix { nodeEnv = import ../../../development/node-packages/node-env.nix {