From 18c2b52314f99e877aef5c44f8fdca0fe9ee4ea7 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 5 Jun 2019 23:48:42 +0200 Subject: node2nix: 1.6.0 -> 1.7.0 and regenerate all Nix expressions, introduce nodePackages_12_x attribute set --- pkgs/development/node-packages/composition-v10.nix | 2 +- pkgs/development/node-packages/composition-v12.nix | 17 + pkgs/development/node-packages/composition-v8.nix | 2 +- pkgs/development/node-packages/default-v12.nix | 16 + pkgs/development/node-packages/default-v6.nix | 23 - pkgs/development/node-packages/generate.sh | 1 + pkgs/development/node-packages/node-env.nix | 152 +- .../node-packages/node-packages-v10.nix | 1698 ++++++------ .../node-packages/node-packages-v12.json | 6 + .../node-packages/node-packages-v12.nix | 2780 ++++++++++++++++++++ .../node-packages/node-packages-v6.json | 9 - .../development/node-packages/node-packages-v6.nix | 2623 ------------------ .../development/node-packages/node-packages-v8.nix | 59 +- 13 files changed, 3880 insertions(+), 3508 deletions(-) create mode 100644 pkgs/development/node-packages/composition-v12.nix create mode 100644 pkgs/development/node-packages/default-v12.nix delete mode 100644 pkgs/development/node-packages/default-v6.nix create mode 100644 pkgs/development/node-packages/node-packages-v12.json create mode 100644 pkgs/development/node-packages/node-packages-v12.nix delete mode 100644 pkgs/development/node-packages/node-packages-v6.json delete mode 100644 pkgs/development/node-packages/node-packages-v6.nix (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 9f723a6da47..fa4b4c3be56 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.6.0. Do not edit! +# This file has been generated by node2nix 1.7.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 new file mode 100644 index 00000000000..880d72efd35 --- /dev/null +++ b/pkgs/development/node-packages/composition-v12.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages-v12.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix index 7ca3e6b925a..7fcc3f81133 100644 --- a/pkgs/development/node-packages/composition-v8.nix +++ b/pkgs/development/node-packages/composition-v8.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/default-v12.nix b/pkgs/development/node-packages/default-v12.nix new file mode 100644 index 00000000000..c5db060989e --- /dev/null +++ b/pkgs/development/node-packages/default-v12.nix @@ -0,0 +1,16 @@ +{ pkgs, nodejs, stdenv }: + +let + nodePackages = import ./composition-v12.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; +in +nodePackages // { + node2nix = nodePackages.node2nix.override { + buildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} + ''; + }; +} diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix deleted file mode 100644 index 878672d32e2..00000000000 --- a/pkgs/development/node-packages/default-v6.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ pkgs, nodejs, stdenv }: - -let - nodePackages = import ./composition-v6.nix { - inherit pkgs nodejs; - inherit (stdenv.hostPlatform) system; - }; -in -nodePackages // { - pnpm = nodePackages.pnpm.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; - postInstall = let - pnpmLibPath = stdenv.lib.makeBinPath [ - nodejs.passthru.python - nodejs - ]; - in '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix PATH : ${pnpmLibPath} - done - ''; - }; -} diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 3df201dd96e..5975cc8966b 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -6,3 +6,4 @@ 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 720e0cc0850..670556bf271 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 <