diff options
| author | Domen Kožar <domen@dev.si> | 2022-06-09 11:19:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-09 11:19:03 -0500 |
| commit | 2618eeadb208f39a7ca7f7b21fd16215641ef834 (patch) | |
| tree | bef98b042c2a86e8a58c1e312de929f564f8f95e /pkgs/tools | |
| parent | 395c8b9b02f290591522fbd16ccd983431dd22fd (diff) | |
| parent | 42550027d89ce743b1c104cbf2a192d059186b92 (diff) | |
| download | nixpkgs-2618eeadb208f39a7ca7f7b21fd16215641ef834.tar nixpkgs-2618eeadb208f39a7ca7f7b21fd16215641ef834.tar.gz nixpkgs-2618eeadb208f39a7ca7f7b21fd16215641ef834.tar.bz2 nixpkgs-2618eeadb208f39a7ca7f7b21fd16215641ef834.tar.lz nixpkgs-2618eeadb208f39a7ca7f7b21fd16215641ef834.tar.xz nixpkgs-2618eeadb208f39a7ca7f7b21fd16215641ef834.tar.zst nixpkgs-2618eeadb208f39a7ca7f7b21fd16215641ef834.zip | |
Merge pull request #177006 from marsam/remove-nodejs-10_x-references
treewide: remove references to nodejs-10_x
Diffstat (limited to 'pkgs/tools')
| -rwxr-xr-x | pkgs/tools/networking/airfield/deps.sh | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/airfield/node.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/networking/airfield/deps.sh b/pkgs/tools/networking/airfield/deps.sh index f33ec8e2ab5..81767110283 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-10 -i deps.json \ +node2nix --nodejs-12 -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 e6ff9b78d38..9f0040e2f44 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-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { |