From 216c58a2ad170d135599592599d5461ec899f357 Mon Sep 17 00:00:00 2001
From: Jörg Thalheim <joerg@thalheim.io>
Date: Tue, 24 Mar 2020 16:00:48 +0000
Subject: nodePackages: fix broken update script

The computed path was wrong and references within the file where
wrong as well due to the temporary directory.
---
 pkgs/development/node-packages/generate.sh        | 14 +++++---------
 pkgs/development/node-packages/shell-generate.nix |  8 --------
 2 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/node-packages/shell-generate.nix

(limited to 'pkgs')

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 ../../../.;
-}
-- 
cgit 1.4.1