about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2020-03-24 16:00:48 +0000
committerJörg Thalheim <joerg@thalheim.io>2020-03-25 07:33:02 +0000
commit216c58a2ad170d135599592599d5461ec899f357 (patch)
tree0ad353467cc20d4ecd3784961df1a73b9f093410 /pkgs
parent8e8efc7ace2c120f5ad17e4c62787bcba103b4df (diff)
downloadnixlib-216c58a2ad170d135599592599d5461ec899f357.tar
nixlib-216c58a2ad170d135599592599d5461ec899f357.tar.gz
nixlib-216c58a2ad170d135599592599d5461ec899f357.tar.bz2
nixlib-216c58a2ad170d135599592599d5461ec899f357.tar.lz
nixlib-216c58a2ad170d135599592599d5461ec899f357.tar.xz
nixlib-216c58a2ad170d135599592599d5461ec899f357.tar.zst
nixlib-216c58a2ad170d135599592599d5461ec899f357.zip
nodePackages: fix broken update script
The computed path was wrong and references within the file where
wrong as well due to the temporary directory.
Diffstat (limited to 'pkgs')
-rwxr-xr-xpkgs/development/node-packages/generate.sh14
-rw-r--r--pkgs/development/node-packages/shell-generate.nix8
2 files changed, 5 insertions, 17 deletions
diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh
index 3b1626f9afb3..66a51721ac81 100755
--- a/pkgs/development/node-packages/generate.sh
+++ b/pkgs/development/node-packages/generate.sh
@@ -1,15 +1,11 @@
 #!/usr/bin/env nix-shell
-#! nix-shell shell-generate.nix -i bash
+#! nix-shell -p nodePackages.node2nix -i bash
 set -eu -o pipefail
 
-cd "$NODE_NIXPKGS_PATH/pkgs/development/node-packages"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+cd ${DIR}
 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 -
diff --git a/pkgs/development/node-packages/shell-generate.nix b/pkgs/development/node-packages/shell-generate.nix
deleted file mode 100644
index aa635b2a81e3..000000000000
--- a/pkgs/development/node-packages/shell-generate.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ nixpkgs ? import ../../.. {} }:
-with nixpkgs;
-mkShell {
-  buildInputs = [
-    bash nodePackages.node2nix
-  ];
-  NODE_NIXPKGS_PATH = builtins.toString ../../../.;
-}