summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-04-14 11:27:00 +0200
committerlassulus <lass@lassul.us>2017-04-14 11:27:00 +0200
commitc435b72af6ab8fc22a5d982fd30f3457b1bde675 (patch)
treee964520a930ab2126e4fe3df07257d28b998c9a6
parentf7d1171b1acc0a345d0c8241ae0101b3d0e1de18 (diff)
parentb268e0ef9c7b471ae467e97c8e2e0b8f769124bc (diff)
Merge remote-tracking branch 'ni/master' into HEAD
-rw-r--r--krebs/5pkgs/htgen/default.nix12
-rw-r--r--tv/2configs/default.nix2
2 files changed, 7 insertions, 7 deletions
diff --git a/krebs/5pkgs/htgen/default.nix b/krebs/5pkgs/htgen/default.nix
index c6dc6e9ae..0fca8bdf2 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.2";
+ version = "1.2.2";
in stdenv.mkDerivation {
name = "htgen-${version}";
src = fetchgit {
url = "http://cgit.krebsco.de/htgen";
rev = "refs/tags/v${version}";
- sha256 = "0y7gi4r32dvc18a4nnkr74sbq4glqcmf1q6lfj8fpgj82lg16zc6";
+ 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/tv/2configs/default.nix b/tv/2configs/default.nix
index 8125a27ee..cbbd5c439 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
stockholm.file = "/home/tv/stockholm";
nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs;
- ref = "7ad99e9fc8c1977f4d51ba8531386fce7276d300"; # nixos-17.03
+ ref = "5acb454e2ad3e3783e63b86a9a31e800d2507e66"; # nixos-17.03
};
} // optionalAttrs host.secure {
secrets-master.file = "/home/tv/secrets/master";