From fae732edb11876800db7b9f1eebbc7c553a9c99b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 5 Jul 2019 11:01:52 +0100 Subject: nodePackages: Regenerate node packages for nodejs 10 & 12 --- pkgs/development/node-packages/composition-v10.nix | 2 +- pkgs/development/node-packages/composition-v12.nix | 4 +- pkgs/development/node-packages/default-v10.nix | 9 - pkgs/development/node-packages/generate.sh | 1 - pkgs/development/node-packages/node-env.nix | 152 +- .../node-packages/node-packages-v10.json | 48 +- .../node-packages/node-packages-v10.nix | 25476 +++++++++++-------- .../node-packages/node-packages-v12.nix | 36 +- 8 files changed, 14596 insertions(+), 11132 deletions(-) (limited to 'pkgs/development/node-packages') diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix index fa4b4c3be56..9f723a6da47 100644 --- a/pkgs/development/node-packages/composition-v10.nix +++ b/pkgs/development/node-packages/composition-v10.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.7.0. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix index 880d72efd35..4f05009f3ef 100644 --- a/pkgs/development/node-packages/composition-v12.nix +++ b/pkgs/development/node-packages/composition-v12.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.7.0. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index 50b33f7effd..8a479924d46 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -7,15 +7,6 @@ let }; in nodePackages // { - aws-azure-login = nodePackages.aws-azure-login.override { - PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "true"; - - buildInputs = [ pkgs.makeWrapper ]; - postInstall = '' - wrapProgram "$out/bin/aws-azure-login" --set PUPPETEER_EXECUTABLE_PATH "${pkgs.chromium}/bin/chromium" - ''; - }; - bower2nix = nodePackages.bower2nix.override { buildInputs = [ pkgs.makeWrapper ]; postInstall = '' diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 5975cc8966b..dafbcb17f7e 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -4,6 +4,5 @@ set -eu -o pipefail rm -f node-env.nix -node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix node2nix --nodejs-12 -i node-packages-v12.json -o node-packages-v12.nix -c composition-v12.nix diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 670556bf271..720e0cc0850 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -11,7 +11,7 @@ let cat > $out/bin/tar <