From 0730ee02f84f9357433cd2aa71b0332c82c62a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 2 Dec 2020 10:31:31 +0100
Subject: [PATCH] utillinux -> util-linux

---
 default.nix                              | 2 +-
 lib/expressions/CompositionExpression.js | 2 +-
 nix/node-env.nix                         | 8 ++++----
 tests/default-v10.nix                    | 2 +-
 tests/default-v12.nix                    | 2 +-
 tests/grunt/default.nix                  | 2 +-
 tests/lockfile-v2/default.nix            | 2 +-
 tests/lockfile/default.nix               | 2 +-
 tests/scoped/default.nix                 | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/default.nix b/default.nix
index 3291583..499c92a 100644
--- a/default.nix
+++ b/default.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ./nix/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/lib/expressions/CompositionExpression.js b/lib/expressions/CompositionExpression.js
index 1c29746..5fd220b 100644
--- a/lib/expressions/CompositionExpression.js
+++ b/lib/expressions/CompositionExpression.js
@@ -105,7 +105,7 @@ CompositionExpression.prototype.toNixAST = function() {
                     paramExpr: {
                         stdenv: new nijs.NixInherit("pkgs"),
                         python2: new nijs.NixInherit("pkgs"),
-                        utillinux: new nijs.NixInherit("pkgs"),
+                        util-linux: new nijs.NixInherit("pkgs"),
                         libtool: new nijs.NixIf({
                             ifExpr: new nijs.NixAttrReference({
                                 attrSetExpr: new nijs.NixExpression("pkgs"),
diff --git a/nix/node-env.nix b/nix/node-env.nix
index 415dbcd..27effd6 100644
--- a/nix/node-env.nix
+++ b/nix/node-env.nix
@@ -1,6 +1,6 @@
 # This file originates from node2nix
 
-{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
+{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
 
 let
   python = if nodejs ? python then nodejs.python else python2;
@@ -396,7 +396,7 @@ let
     stdenv.mkDerivation ({
       name = "node_${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ]
-        ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+        ++ stdenv.lib.optional (stdenv.isLinux) util-linux
         ++ stdenv.lib.optional (stdenv.isDarwin) libtool
         ++ buildInputs;
 
@@ -470,7 +470,7 @@ let
         name = "node-dependencies-${name}-${version}";
 
         buildInputs = [ tarWrapper python nodejs ]
-          ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+          ++ stdenv.lib.optional (stdenv.isLinux) util-linux
           ++ stdenv.lib.optional (stdenv.isDarwin) libtool
           ++ buildInputs;
 
@@ -537,7 +537,7 @@ let
     stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
 
-      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
       buildCommand = ''
         mkdir -p $out/bin
         cat > $out/bin/shell <<EOF
diff --git a/tests/default-v10.nix b/tests/default-v10.nix
index 12d53e9..ff1d046 100644
--- a/tests/default-v10.nix
+++ b/tests/default-v10.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../nix/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/tests/default-v12.nix b/tests/default-v12.nix
index cb103f2..d698a2f 100644
--- a/tests/default-v12.nix
+++ b/tests/default-v12.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../nix/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/tests/grunt/default.nix b/tests/grunt/default.nix
index 0ec62be..cc475fb 100644
--- a/tests/grunt/default.nix
+++ b/tests/grunt/default.nix
@@ -10,7 +10,7 @@ let
     inherit (pkgs) fetchurl fetchgit;
   });
   nodeEnv = import ../../nix/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/tests/lockfile-v2/default.nix b/tests/lockfile-v2/default.nix
index 5992902..1c1d7a0 100644
--- a/tests/lockfile-v2/default.nix
+++ b/tests/lockfile-v2/default.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../nix/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/tests/lockfile/default.nix b/tests/lockfile/default.nix
index 5992902..1c1d7a0 100644
--- a/tests/lockfile/default.nix
+++ b/tests/lockfile/default.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../nix/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/tests/scoped/default.nix b/tests/scoped/default.nix
index 5992902..1c1d7a0 100644
--- a/tests/scoped/default.nix
+++ b/tests/scoped/default.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../nix/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };