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

Merge remote-tracking branch 'ni/master' into HEAD

Browse Source
This commit is contained in:
lassulus 2017-04-14 11:27:00 +02:00
commit c435b72af6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
krebs/5pkgs/htgen/default.nix
View File

@ -1,26 +1,26 @@
{ bash, coreutils, gnused, stdenv, fetchgit, ucspi-tcp }: { coreutils, dash, fetchgit, gnused, stdenv, ucspi-tcp }:
with import <stockholm/lib>; with import <stockholm/lib>;
let let
version = "1.2"; version = "1.2.2";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "htgen-${version}"; name = "htgen-${version}";
src = fetchgit { src = fetchgit {
url = "http://cgit.krebsco.de/htgen"; url = "http://cgit.krebsco.de/htgen";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "0y7gi4r32dvc18a4nnkr74sbq4glqcmf1q6lfj8fpgj82lg16zc6"; sha256 = "0a8vn35vq6pxgk6d3d2cjp0vdxzq9nqf0zgkvnd6668v4cmdf91b";
}; };
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
{ {
echo '#! ${bash}/bin/bash' echo '#! ${dash}/bin/dash'
echo 'export PATH=${makeBinPath [ echo 'export PATH=${makeBinPath [
ucspi-tcp
coreutils coreutils
gnused gnused
ucspi-tcp
]}''${PATH+":$PATH"}' ]}''${PATH+":$PATH"}'
cat htgen sed 's:^Server=htgen$:&/${version}:' htgen
} > $out/bin/htgen } > $out/bin/htgen
chmod +x $out/bin/htgen chmod +x $out/bin/htgen
cp -r examples $out cp -r examples $out

2
tv/2configs/default.nix
View File

@ -14,7 +14,7 @@ with import <stockholm/lib>;
stockholm.file = "/home/tv/stockholm"; stockholm.file = "/home/tv/stockholm";
nixpkgs.git = { nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs; url = https://github.com/NixOS/nixpkgs;
ref = "7ad99e9fc8c1977f4d51ba8531386fce7276d300"; # nixos-17.03 ref = "5acb454e2ad3e3783e63b86a9a31e800d2507e66"; # nixos-17.03
}; };
} // optionalAttrs host.secure { } // optionalAttrs host.secure {
secrets-master.file = "/home/tv/secrets/master"; secrets-master.file = "/home/tv/secrets/master";