diff options
author | makefu <github@syntax-fehler.de> | 2017-04-17 13:15:13 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2017-04-17 13:15:13 +0200 |
commit | 35c7e1c37545dd96c90d54191ba835eb0ceeac8e (patch) | |
tree | 65db0a2d770654f555fcac74c8e457261054df5d /krebs/5pkgs | |
parent | 9d7e9bf4a9630bb763d7d7bff7880c70405c7ea3 (diff) | |
parent | b6a4df7e398c7b4d7dc4f56d2eded22a79fee30f (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/5pkgs')
-rw-r--r-- | krebs/5pkgs/htgen/default.nix | 12 | ||||
-rw-r--r-- | krebs/5pkgs/irc-announce/default.nix | 2 | ||||
-rw-r--r-- | krebs/5pkgs/realwallpaper/default.nix | 8 |
3 files changed, 9 insertions, 13 deletions
diff --git a/krebs/5pkgs/htgen/default.nix b/krebs/5pkgs/htgen/default.nix index f9dfeb3d..0fca8bdf 100644 --- a/krebs/5pkgs/htgen/default.nix +++ b/krebs/5pkgs/htgen/default.nix @@ -1,26 +1,26 @@ -{ bash, coreutils, gnused, stdenv, fetchgit, ucspi-tcp }: +{ coreutils, dash, fetchgit, gnused, stdenv, ucspi-tcp }: with import <stockholm/lib>; let - version = "1.1"; + version = "1.2.2"; in stdenv.mkDerivation { name = "htgen-${version}"; src = fetchgit { url = "http://cgit.krebsco.de/htgen"; rev = "refs/tags/v${version}"; - sha256 = "1zxj0fv9vdrqyl3x2hgq7a6xdlzpclf93akygysrzsqk9wjapp4z"; + sha256 = "0a8vn35vq6pxgk6d3d2cjp0vdxzq9nqf0zgkvnd6668v4cmdf91b"; }; installPhase = '' mkdir -p $out/bin { - echo '#! ${bash}/bin/bash' + echo '#! ${dash}/bin/dash' echo 'export PATH=${makeBinPath [ - ucspi-tcp coreutils gnused + ucspi-tcp ]}''${PATH+":$PATH"}' - cat htgen + sed 's:^Server=htgen$:&/${version}:' htgen } > $out/bin/htgen chmod +x $out/bin/htgen cp -r examples $out diff --git a/krebs/5pkgs/irc-announce/default.nix b/krebs/5pkgs/irc-announce/default.nix index e1f4919d..6eb725b7 100644 --- a/krebs/5pkgs/irc-announce/default.nix +++ b/krebs/5pkgs/irc-announce/default.nix @@ -24,7 +24,7 @@ pkgs.writeDashBin "irc-announce" '' # 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) echo2() { echo "$*"; echo "$*" >&2; } - cat2() { tee /dev/stderr; } + cat2() { awk '{print;print > "/dev/stderr"}'; } # privmsg_cat transforms stdin to a privmsg privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; } diff --git a/krebs/5pkgs/realwallpaper/default.nix b/krebs/5pkgs/realwallpaper/default.nix index 4fea977e..dec2dada 100644 --- a/krebs/5pkgs/realwallpaper/default.nix +++ b/krebs/5pkgs/realwallpaper/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchgit { url = https://github.com/Lassulus/realwallpaper; - rev = "c2778c3c235fc32edc8115d533a0d0853ab101c5"; - sha256 = "0yhbjz19zk8sj5dsvccm6skkqq2vardn1yi70qmd5li7qvp17mvs"; + rev = "b8408cfb295b6ce5b965309b30358ca6c6409efd"; + sha256 = "0yyl8hhqshw9bx04xs8glvir3c0qzvfrwzmbvyg318mnz5xalcl0"; }; phases = [ @@ -15,10 +15,6 @@ stdenv.mkDerivation { ]; buildInputs = [ - xplanet - imagemagick - curl - file ]; installPhase = '' |