Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

k: utillinux -> util-linux

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
krebs/2configs/reaktor2.nix
View File

@ -52,7 +52,7 @@ let
PATH = makeBinPath [ PATH = makeBinPath [
pkgs.coreutils # XXX env, touch pkgs.coreutils # XXX env, touch
pkgs.jq # XXX sed pkgs.jq # XXX sed
pkgs.utillinux # XXX flock pkgs.util-linux # XXX flock
]; ];
state_file = "${stateDir}/tell.json"; state_file = "${stateDir}/tell.json";
}; };
@ -107,7 +107,7 @@ let
PATH = makeBinPath [ PATH = makeBinPath [
pkgs.coreutils # XXX date, env pkgs.coreutils # XXX date, env
pkgs.jq # XXX sed pkgs.jq # XXX sed
pkgs.utillinux # XXX flock pkgs.util-linux # XXX flock
]; ];
state_file = "${stateDir}/tell.txt"; state_file = "${stateDir}/tell.txt";
}; };

2
krebs/3modules/backup.nix
View File

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

2
krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh
View File

@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
set -euf set -euf
# require flock from util-linux (pkgs.utillinux) # require flock from util-linux (pkgs.util-linux)
if test "${FLOCK-}" != "$state_file"; then if test "${FLOCK-}" != "$state_file"; then
exec env FLOCK="$state_file" flock "$state_file" "$0" "$@" exec env FLOCK="$state_file" flock "$state_file" "$0" "$@"
fi fi

4
krebs/5pkgs/simple/dic/default.nix
View File

@ -1,5 +1,5 @@
{ fetchgit, lib, stdenv { fetchgit, lib, stdenv
, coreutils, curl, gnugrep, gnused, utillinux , coreutils, curl, gnugrep, gnused, util-linux
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -23,7 +23,7 @@ stdenv.mkDerivation {
curl curl
gnused gnused
gnugrep gnugrep
utillinux util-linux
]; ];
in in
'' ''

2
krebs/5pkgs/simple/htgen-cyberlocker/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
pkgs.gnugrep pkgs.gnugrep
pkgs.jq pkgs.jq
pkgs.nix pkgs.nix
pkgs.utillinux pkgs.util-linux
]} ]}
echo STATEDIR=${shell.escape "\${STATEDIR-$HOME}"} echo STATEDIR=${shell.escape "\${STATEDIR-$HOME}"}
cat $src/htgen-cyberlocker cat $src/htgen-cyberlocker

4
krebs/5pkgs/simple/htgen-imgur/default.nix
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 { stdenv.mkDerivation rec {
pname = "htgen-imgur"; pname = "htgen-imgur";
version = "1.0.0"; version = "1.0.0";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
findutils findutils
gnugrep gnugrep
jq jq
nix utillinux nix util-linux
]} ]}
echo STATEDIR=${stockholm.lib.shell.escape "\${STATEDIR-$HOME}"} echo STATEDIR=${stockholm.lib.shell.escape "\${STATEDIR-$HOME}"}
cat $src/htgen-imgur cat $src/htgen-imgur

4
krebs/5pkgs/simple/withGetopt.nix
View File

@ -1,4 +1,4 @@
{ coreutils, quote, stockholm, utillinux, writeDash }: { coreutils, quote, stockholm, util-linux, writeDash }:
with stockholm.lib; with stockholm.lib;
opt-spec: cmd-spec: let opt-spec: cmd-spec: let
@ -46,7 +46,7 @@ in writeDash wrapper-name ''
WITHGETOPT_ORIG_ARGS=$(${quote}/bin/quote "$@") WITHGETOPT_ORIG_ARGS=$(${quote}/bin/quote "$@")
export WITHGETOPT_ORIG_ARGS export WITHGETOPT_ORIG_ARGS
args=$(${utillinux}/bin/getopt \ args=$(${util-linux}/bin/getopt \
-l ${shell.escape -l ${shell.escape
(concatMapStringsSep "," (concatMapStringsSep ","
(opt: opt.long + optionalString (!opt.switch) ":") (opt: opt.long + optionalString (!opt.switch) ":")