b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #177006 from marsam/remove-nodejs-10_x-references

Browse source 
treewide: remove references to nodejs-10_x
This commit is contained in:
Domen Kožar 2022-06-09 11:19:03 -05:00 committed by GitHub
parent 395c8b9b02 42550027d8
commit 2618eeadb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
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
node2nix \
--nodejs-10 \
--nodejs-12 \
--node-env ../../../../development/node-packages/node-env.nix \
--development \
--input package.json \

2
pkgs/applications/networking/cluster/spacegun/node-composition.nix
View file

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

2
pkgs/misc/base16-builder/generate.sh
View file

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

2
pkgs/misc/base16-builder/node-packages.nix generated
View file

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

2
pkgs/servers/web-apps/cryptpad/generate.sh
View file

@ -6,7 +6,7 @@
cryptpadSrc=$(nix eval '(import ../../../.. {}).cryptpad.src' --raw)
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

2
pkgs/tools/networking/airfield/deps.sh
View file

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

2
pkgs/tools/networking/airfield/node.nix
View file

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