diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-06-09 18:01:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-09 18:01:58 +0000 |
| commit | 1a1be0c727016b1cafb66650d832ffed3442c785 (patch) | |
| tree | 19a3433230b4ff7a8c13213fe124844cd4cae0f3 /pkgs/misc | |
| parent | d07b20daf3b496bfd9121c67eefb504e26ca7ac6 (diff) | |
| parent | c26b313084ba43e4a190d52973597ab870394cc1 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc')
| -rwxr-xr-x | pkgs/misc/base16-builder/generate.sh | 2 | ||||
| -rw-r--r-- | pkgs/misc/base16-builder/node-packages.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/base16-builder/generate.sh b/pkgs/misc/base16-builder/generate.sh index 3fcfb5bcbc06e..1d06b6230dbb0 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-10 \ +exec node2nix --nodejs-12 \ --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 459157b82a4c7..006429c9ed447 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-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: let globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix { |