k: utillinux -> util-linux

This commit is contained in:
lassulus 2022-09-27 12:26:37 +02:00
parent c3bc2f79d5
commit e2285620bb
7 changed files with 11 additions and 11 deletions

View File

@ -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";
};

View File

@ -82,7 +82,7 @@ let
gnused
openssh
rsync
utillinux
util-linux
];
restartIfChanged = false;
serviceConfig = rec {

View File

@ -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

View File

@ -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
''

View File

@ -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

View File

@ -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

View File

@ -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) ":")