k: utillinux -> util-linux

7 files changed, 11 insertions, 11 deletions

diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 233fe2fd7..f5041a59d 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -52,7 +52,7 @@ let
               PATH = makeBinPath [
                 pkgs.coreutils # XXX env, touch
                 pkgs.jq # XXX sed
-                pkgs.utillinux # XXX flock
+                pkgs.util-linux # XXX flock
               ];
               state_file = "${stateDir}/tell.json";
             };
@@ -107,7 +107,7 @@ let
               PATH = makeBinPath [
                 pkgs.coreutils # XXX date, env
                 pkgs.jq # XXX sed
-                pkgs.utillinux # XXX flock
+                pkgs.util-linux # XXX flock
               ];
               state_file = "${stateDir}/tell.txt";
             };
diff --git a/krebs/3modules/backup.nix b/krebs/3modules/backup.nix
index 4a88582a2..c1d4d7211 100644
--- a/krebs/3modules/backup.nix
+++ b/krebs/3modules/backup.nix
@@ -82,7 +82,7 @@ let
           gnused
           openssh
           rsync
-          utillinux
+          util-linux
         ];
         restartIfChanged = false;
         serviceConfig = rec {
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh b/krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh
index c21dc8776..6978e38c6 100755
--- a/krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh
+++ b/krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -euf
 
-# require flock from util-linux (pkgs.utillinux)
+# require flock from util-linux (pkgs.util-linux)
 if test "${FLOCK-}" != "$state_file"; then
   exec env FLOCK="$state_file" flock "$state_file" "$0" "$@"
 fi
diff --git a/krebs/5pkgs/simple/dic/default.nix b/krebs/5pkgs/simple/dic/default.nix
index 1825e4ee7..39402c012 100644
--- a/krebs/5pkgs/simple/dic/default.nix
+++ b/krebs/5pkgs/simple/dic/default.nix
@@ -1,5 +1,5 @@
 { fetchgit, lib, stdenv
-, coreutils, curl, gnugrep, gnused, utillinux
+, coreutils, curl, gnugrep, gnused, util-linux
 }:
 
 stdenv.mkDerivation {
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
         curl
         gnused
         gnugrep
-        utillinux
+        util-linux
       ];
     in
     ''
diff --git a/krebs/5pkgs/simple/htgen-cyberlocker/default.nix b/krebs/5pkgs/simple/htgen-cyberlocker/default.nix
index c7d7ebfd8..c4f37131d 100644
--- a/krebs/5pkgs/simple/htgen-cyberlocker/default.nix
+++ b/krebs/5pkgs/simple/htgen-cyberlocker/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
         pkgs.gnugrep
         pkgs.jq
         pkgs.nix
-        pkgs.utillinux
+        pkgs.util-linux
       ]}
       echo STATEDIR=${shell.escape "\${STATEDIR-$HOME}"}
       cat $src/htgen-cyberlocker
diff --git a/krebs/5pkgs/simple/htgen-imgur/default.nix b/krebs/5pkgs/simple/htgen-imgur/default.nix
index f429ff7a6..e6b60be49 100644
--- a/krebs/5pkgs/simple/htgen-imgur/default.nix
+++ b/krebs/5pkgs/simple/htgen-imgur/default.nix
@@ -1,4 +1,4 @@
-{ attr, coreutils, exiv2, findutils, gnugrep, jq, nix, stockholm, utillinux, stdenv }:
+{ attr, coreutils, exiv2, findutils, gnugrep, jq, nix, stockholm, util-linux, stdenv }:
 stdenv.mkDerivation rec {
   pname = "htgen-imgur";
   version = "1.0.0";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
         findutils
         gnugrep
         jq
-        nix utillinux
+        nix util-linux
       ]}
       echo STATEDIR=${stockholm.lib.shell.escape "\${STATEDIR-$HOME}"}
       cat $src/htgen-imgur
diff --git a/krebs/5pkgs/simple/withGetopt.nix b/krebs/5pkgs/simple/withGetopt.nix
index 7f17a5934..57fe433af 100644
--- a/krebs/5pkgs/simple/withGetopt.nix
+++ b/krebs/5pkgs/simple/withGetopt.nix
@@ -1,4 +1,4 @@
-{ coreutils, quote, stockholm, utillinux, writeDash }:
+{ coreutils, quote, stockholm, util-linux, writeDash }:
 with stockholm.lib;
 
 opt-spec: cmd-spec: let
@@ -46,7 +46,7 @@ in writeDash wrapper-name ''
   WITHGETOPT_ORIG_ARGS=$(${quote}/bin/quote "$@")
   export WITHGETOPT_ORIG_ARGS
 
-  args=$(${utillinux}/bin/getopt \
+  args=$(${util-linux}/bin/getopt \
       -l ${shell.escape
             (concatMapStringsSep ","
               (opt: opt.long + optionalString (!opt.switch) ":")