Revert "nodePackages: regenerate with node2nix 1.9.0"

3 files changed, 13 insertions, 21 deletions

diff --git a/pkgs/tools/graphics/ldgallery/viewer/generate.sh b/pkgs/tools/graphics/ldgallery/viewer/generate.sh
index f115fb11d9b9..0874051b6765 100755
--- a/pkgs/tools/graphics/ldgallery/viewer/generate.sh
+++ b/pkgs/tools/graphics/ldgallery/viewer/generate.sh
@@ -24,7 +24,11 @@ node2nix \
   --input ./package.json \
   --lock ./package-lock.json \
   --output node-packages.nix \
-  --composition node-composition.nix \
-  --no-copy-node-env
+  --composition node-composition.nix
 
 rm package.json package-lock.json
+
+# Temporary quickfix to accomodate for the util-linux package rename.
+# See https://github.com/svanderburg/node2nix/issues/213
+git restore :/pkgs/development/node-packages/node-env.nix
+sed -i 's/utillinux/util-linux/g' node-composition.nix
diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
index aaf54a05c884..55566aafc585 100644
--- a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
+++ b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix b/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix
index ce00bdfd0971..9946ce0e63c6 100644
--- a/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix
+++ b/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -13252,7 +13252,7 @@ let
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      homepage = "https://ldgallery.pacien.org/";
+      homepage = https://ldgallery.pacien.org/;
       license = "AGPL-3";
     };
     production = false;
@@ -13266,16 +13266,4 @@ in
   tarball = nodeEnv.buildNodeSourceDist args;
   package = nodeEnv.buildNodePackage args;
   shell = nodeEnv.buildNodeShell args;
-  nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
-    src = stdenv.mkDerivation {
-      name = args.name + "-package-json";
-      src = nix-gitignore.gitignoreSourcePure [
-        "*"
-        "!package.json"
-        "!package-lock.json"
-      ] args.src;
-      dontBuild = true;
-      installPhase = "mkdir -p $out; cp -r ./* $out;";
-    };
-  });
 }