From 16cd7627cdb55ed7b4477f48d393fd30a38b9978 Mon Sep 17 00:00:00 2001 From: ivann Date: Fri, 28 Feb 2020 09:05:53 +0100 Subject: [PATCH 1/2] nodePackages: remove duplicate trailing path $NODE_NIXPKGS_PATH already points to /pkgs/development/node-packages, appending it again makes the path erroneous. --- pkgs/development/node-packages/generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 3b1626f9afb32..195be7c93fdba 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -2,7 +2,7 @@ #! nix-shell shell-generate.nix -i bash set -eu -o pipefail -cd "$NODE_NIXPKGS_PATH/pkgs/development/node-packages" +cd "$NODE_NIXPKGS_PATH" rm -f ./node-env.nix for version in 10 12 13; do tmpdir=$(mktemp -d) From 83b457beae4d4b2acf96966f3385ab9fcc3523c4 Mon Sep 17 00:00:00 2001 From: ivann Date: Sun, 1 Mar 2020 19:51:14 +0100 Subject: [PATCH 2/2] nodePackages: generate without a tmpdir --- pkgs/development/node-packages/generate.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 195be7c93fdba..38ae8daf6fd0b 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -5,11 +5,6 @@ set -eu -o pipefail cd "$NODE_NIXPKGS_PATH" rm -f ./node-env.nix for version in 10 12 13; do - tmpdir=$(mktemp -d) - node2nix --nodejs-$version -i node-packages-v$version.json -o $tmpdir/node-packages-v$version.nix -c $tmpdir/composition-v$version.nix - if [ $? -eq 0 ]; then - mv $tmpdir/node-packages-v$version.nix . - mv $tmpdir/composition-v$version.nix . - fi + node2nix --nodejs-$version -i node-packages-v$version.json -o node-packages-v$version.nix -c composition-v$version.nix done cd -