From 90a3a1910433cc678d6b55943dd2936b637a3b59 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Thu, 16 Mar 2017 20:56:08 +0100
Subject: htgen: init

---
 krebs/5pkgs/htgen/default.nix | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 krebs/5pkgs/htgen/default.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/htgen/default.nix b/krebs/5pkgs/htgen/default.nix
new file mode 100644
index 000000000..86e9f2b65
--- /dev/null
+++ b/krebs/5pkgs/htgen/default.nix
@@ -0,0 +1,30 @@
+{ bash, coreutils, gnused, stdenv, fetchgit, script ? "", ucspi-tcp }:
+with import <stockholm/lib>;
+let
+  version = "1.0";
+in stdenv.mkDerivation {
+  name = "htgen-${version}";
+
+  src = fetchgit {
+    url = "http://cgit.krebsco.de/htgen";
+    rev = "refs/v1.0";
+    sha256 = "15z451f57ddaxm21dlqqx2kavzyqx4sgnnzz4ql6vl237979g09s";
+  };
+
+  installPhase = ''
+    find
+    mkdir -p $out/bin
+    {
+      echo '#! ${bash}/bin/bash'
+      echo 'export PATH=${makeBinPath [
+        ucspi-tcp
+        coreutils
+        gnused
+      ]}'
+      sed -n '/^reply_404$/q;p' < htgen
+      printf '%s' ${shell.escape script}
+      echo 'reply_404'
+    } > $out/bin/htgen
+    chmod +x $out/bin/htgen
+  '';
+}
-- 
cgit v1.2.3


From e599c372bfa590e898812ed59284724881a76d98 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Thu, 16 Mar 2017 21:53:05 +0100
Subject: htgen: 1.0 -> 1.1

---
 krebs/5pkgs/htgen/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/htgen/default.nix b/krebs/5pkgs/htgen/default.nix
index 86e9f2b65..f9dfeb3d1 100644
--- a/krebs/5pkgs/htgen/default.nix
+++ b/krebs/5pkgs/htgen/default.nix
@@ -1,18 +1,17 @@
-{ bash, coreutils, gnused, stdenv, fetchgit, script ? "", ucspi-tcp }:
+{ bash, coreutils, gnused, stdenv, fetchgit, ucspi-tcp }:
 with import <stockholm/lib>;
 let
-  version = "1.0";
+  version = "1.1";
 in stdenv.mkDerivation {
   name = "htgen-${version}";
 
   src = fetchgit {
     url = "http://cgit.krebsco.de/htgen";
-    rev = "refs/v1.0";
-    sha256 = "15z451f57ddaxm21dlqqx2kavzyqx4sgnnzz4ql6vl237979g09s";
+    rev = "refs/tags/v${version}";
+    sha256 = "1zxj0fv9vdrqyl3x2hgq7a6xdlzpclf93akygysrzsqk9wjapp4z";
   };
 
   installPhase = ''
-    find
     mkdir -p $out/bin
     {
       echo '#! ${bash}/bin/bash'
@@ -20,11 +19,10 @@ in stdenv.mkDerivation {
         ucspi-tcp
         coreutils
         gnused
-      ]}'
-      sed -n '/^reply_404$/q;p' < htgen
-      printf '%s' ${shell.escape script}
-      echo 'reply_404'
+      ]}''${PATH+":$PATH"}'
+      cat htgen
     } > $out/bin/htgen
     chmod +x $out/bin/htgen
+    cp -r examples $out
   '';
 }
-- 
cgit v1.2.3


From 12161121598deeb8467d50a25b540e436de9b0c1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 24 Mar 2017 13:01:58 +0100
Subject: k 5 at-cacher-ng: bump to version 2

---
 krebs/5pkgs/apt-cacher-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/apt-cacher-ng/default.nix b/krebs/5pkgs/apt-cacher-ng/default.nix
index 53736dcfb..e3986713b 100644
--- a/krebs/5pkgs/apt-cacher-ng/default.nix
+++ b/krebs/5pkgs/apt-cacher-ng/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "apt-cacher-ng-${version}";
-  version = "0.9.3.2";
+  version = "2";
 
   src = fetchurl {
     url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
-    sha256 = "1bvng9mwrggvc93q2alj0x72i56wifnjs2dsycr17mapsv0f2gnc";
+    sha256 = "0bkc3012vinridl5ch46pwnxjalymx4wf6nxax64nm7bdkcj9azf";
   };
 
   NIX_LDFLAGS = "-lpthread";
-- 
cgit v1.2.3