makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse source
This commit is contained in:
lassulus 2020-03-17 21:04:36 +01:00
parent 23cba7672c 3493cd74a1
commit c2685109c0
3 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
krebs/5pkgs/simple/irc-announce/default.nix
View file

@ -24,7 +24,12 @@ pkgs.writeDashBin "irc-announce" ''
# echo2 and cat2 are used output to both, stdout and stderr # echo2 and cat2 are used output to both, stdout and stderr
# This is used to see what we send to the irc server. (debug output) # This is used to see what we send to the irc server. (debug output)
echo2() { echo "$*"; echo "$*" >&2; } echo2() { echo "$*"; echo "$*" >&2; }
cat2() { (read x ; echo "$x" ; echo "$x" >&2) } cat2() {
while read -r line; do
echo "$line"
echo "$line" >&2
done
}
# privmsg_cat transforms stdin to a privmsg # privmsg_cat transforms stdin to a privmsg
privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; } privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; }

3
krebs/krops.nix
View file

@ -31,7 +31,8 @@
}; };
}; };
stockholm.file = toString ../.; stockholm.file = toString ../.;
stockholm-version.pipe = toString (pkgs.writeDash "${name}-version" '' stockholm-version.pipe =
toString (pkgs.writers.writeDash "${name}-version" ''
set -efu set -efu
cd ${lib.escapeShellArg stockholm.file} cd ${lib.escapeShellArg stockholm.file}
V=$(${pkgs.coreutils}/bin/date +%y.%m) V=$(${pkgs.coreutils}/bin/date +%y.%m)

2
submodules/krops

@ -1 +1 @@
Subproject commit f1b7112ac3cbe090e96f2c82c525b6db69b82034 Subproject commit ed9fc6658226b1525bc008205d76276f0054c6c5