Merge remote-tracking branch 'lass/master'

8 files changed, 12 insertions, 12 deletions

diff --git a/krebs/5pkgs/simple/K_belwagen.nix b/krebs/5pkgs/simple/K_belwagen.nix
index 80d377b0c..2f64bb09d 100644
--- a/krebs/5pkgs/simple/K_belwagen.nix
+++ b/krebs/5pkgs/simple/K_belwagen.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     pkgs.jack1
-    pkgs.pkgconfig
+    pkgs.pkg-config
   ];
 
   patchPhase = ''
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/cac-api/default.nix b/krebs/5pkgs/simple/cac-api/default.nix
index 5f37f6682..59cd36cde 100644
--- a/krebs/5pkgs/simple/cac-api/default.nix
+++ b/krebs/5pkgs/simple/cac-api/default.nix
@@ -1,5 +1,5 @@
 { fetchgit, lib, stdenv
-, bc, cac-cert, coreutils, curl, dash, gnugrep, gnused, inotifyTools, jq, ncurses, openssh, sshpass
+, bc, cac-cert, coreutils, curl, dash, gnugrep, gnused, inotify-tools, jq, ncurses, openssh, sshpass
 }:
 
 stdenv.mkDerivation {
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
       curl
       gnugrep
       gnused
-      inotifyTools
+      inotify-tools
       jq
       ncurses
       openssh
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/fzfmenu/default.nix b/krebs/5pkgs/simple/fzfmenu/default.nix
index f208f6a3e..4527ad90b 100644
--- a/krebs/5pkgs/simple/fzfmenu/default.nix
+++ b/krebs/5pkgs/simple/fzfmenu/default.nix
@@ -48,7 +48,7 @@ pkgs.writeDashBin "fzfmenu" ''
     exec 4>&1
     export FZFMENU_INPUT_FD=3
     export FZFMENU_OUTPUT_FD=4
-    exec ${pkgs.rxvt_unicode}/bin/urxvt \
+    exec ${pkgs.rxvt-unicode}/bin/urxvt \
         -name ${cfg.appName} \
         -title ${shell.escape cfg.windowTitle} \
         -e "$0" "$@"
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) ":")