From 5c90f820443c7817ab29aabe0262ca82c94de59a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 9 Dec 2025 00:23:23 +0100
Subject: nixpkgs: 25.05 -> 25.11

---
 pkgs/simple/editor-input.nix           | 2 +-
 pkgs/simple/fzmenu/default.nix         | 4 ++--
 pkgs/simple/hc.nix                     | 4 ++--
 pkgs/simple/pinentry-urxvt/default.nix | 2 +-
 pkgs/simple/q/default.nix              | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/simple/editor-input.nix b/pkgs/simple/editor-input.nix
index 536084d..0591f2f 100644
--- a/pkgs/simple/editor-input.nix
+++ b/pkgs/simple/editor-input.nix
@@ -1,7 +1,7 @@
 { pkgs }:
 pkgs.writeDashBin "editor-input" ''
   exec \
-  ${pkgs.utillinux}/bin/setsid -f \
+  ${pkgs.util-linux}/bin/setsid -f \
   ${pkgs.with-tmpdir}/bin/with-tmpdir -t editor-input.XXXXXXXX \
   ${pkgs.writeDash "editor-input.sh" ''
     f=$TMPDIR/input
diff --git a/pkgs/simple/fzmenu/default.nix b/pkgs/simple/fzmenu/default.nix
index d11a988..9a9bda6 100644
--- a/pkgs/simple/fzmenu/default.nix
+++ b/pkgs/simple/fzmenu/default.nix
@@ -27,7 +27,7 @@ pkgs.runCommand "fzmenu" {
         (pkgs.pass.withExtensions (ext: [
           ext.pass-otp
         ]))
-        pkgs.utillinux
+        pkgs.util-linux
         pkgs.xsel
         pkgs.xvkbd
         terminal
@@ -44,7 +44,7 @@ pkgs.runCommand "fzmenu" {
         (pkgs.pass.withExtensions (ext: [
           ext.pass-otp
         ]))
-        pkgs.utillinux
+        pkgs.util-linux
         pkgs.xsel
         pkgs.xvkbd
         terminal
diff --git a/pkgs/simple/hc.nix b/pkgs/simple/hc.nix
index 086445e..15550dc 100644
--- a/pkgs/simple/hc.nix
+++ b/pkgs/simple/hc.nix
@@ -1,5 +1,5 @@
 { fetchgit, lib, makeWrapper, stdenv
-, coreutils, findutils, gawk, gnugrep, qrencode, texlive, utillinux, zbar
+, coreutils, findutils, gawk, gnugrep, qrencode, texlive, util-linux, zbar
 }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
         gnugrep
         qrencode
         texlive.combined.scheme-full
-        utillinux
+        util-linux
         zbar
       ]}
   '';
diff --git a/pkgs/simple/pinentry-urxvt/default.nix b/pkgs/simple/pinentry-urxvt/default.nix
index 808d00a..e79b09f 100644
--- a/pkgs/simple/pinentry-urxvt/default.nix
+++ b/pkgs/simple/pinentry-urxvt/default.nix
@@ -51,7 +51,7 @@ in
       trap cleanup EXIT
 
       cleanup() {
-        ${pkgs.utillinux}/bin/kill -- $(${pkgs.coreutils}/bin/cat "$displayers")
+        ${pkgs.util-linux}/bin/kill -- $(${pkgs.coreutils}/bin/cat "$displayers")
         rm "$displayers"
         rm "$screenshot"
       }
diff --git a/pkgs/simple/q/default.nix b/pkgs/simple/q/default.nix
index ca4a466..5944dd9 100644
--- a/pkgs/simple/q/default.nix
+++ b/pkgs/simple/q/default.nix
@@ -17,11 +17,11 @@ let
   in /* sh */ ''
     cols=$(${pkgs.ncurses}/bin/tput cols)
     if test $cols -ge ${toString (need_width 3)}; then
-      ${pkgs.utillinux}/bin/cal --color=always -mw3
+      ${pkgs.util-linux}/bin/cal --color=always -mw3
     elif test $cols -ge ${toString (need_width 2)}; then
-      ${pkgs.utillinux}/bin/cal --color=always -mw -n 2
+      ${pkgs.util-linux}/bin/cal --color=always -mw -n 2
     elif test $cols -ge ${toString (need_width 1)}; then
-      ${pkgs.utillinux}/bin/cal --color=always -mw1
+      ${pkgs.util-linux}/bin/cal --color=always -mw1
     else
       :
     fi |
-- 
cgit v1.2.3