From a81091baf194443e71730db19f517c1802fff0b3 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 22 Nov 2016 18:55:28 +0100
Subject: blessings: 1.0.0 -> 1.1.0

---
 krebs/5pkgs/haskell-overrides/blessings.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/haskell-overrides/blessings.nix b/krebs/5pkgs/haskell-overrides/blessings.nix
index 5fb57a332..f852b4a44 100644
--- a/krebs/5pkgs/haskell-overrides/blessings.nix
+++ b/krebs/5pkgs/haskell-overrides/blessings.nix
@@ -1,11 +1,11 @@
 { mkDerivation, base, fetchgit, stdenv }:
-mkDerivation {
+mkDerivation rec {
   pname = "blessings";
-  version = "1.0.0";
+  version = "1.1.0";
   src = fetchgit {
     url = http://cgit.ni.krebsco.de/blessings;
-    rev = "25a510dcb38ea9158e9969d56eb66cb1b860ab5f";
-    sha256 = "0xg329h1y68ndg4w3m1jp38pkg3gqg7r19q70gqqj4mswb6qcrqc";
+    rev = "refs/tags/v${version}";
+    sha256 = "1k908zap3694fcxdk4bb29s54b0lhdh557y10ybjskfwnym7szn1";
   };
   libraryHaskellDepends = [ base ];
   doHaddock = false;
-- 
cgit v1.2.3


From 6c6d705629f0bd9174db9714de5c84ec695dd843 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 24 Nov 2016 22:07:28 +0100
Subject: painload: 8df031f -> c113487

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

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/painload/default.nix b/krebs/5pkgs/painload/default.nix
index 10fd379c0..136ec4394 100644
--- a/krebs/5pkgs/painload/default.nix
+++ b/krebs/5pkgs/painload/default.nix
@@ -2,6 +2,6 @@
 
 fetchgit {
   url = https://github.com/krebscode/painload;
-  rev = "8df031f810a2776d8c43b03a9793cb49398bd33b";
-  sha256 = "03md5k6fmz0j1ny22iw96dzq7cvijbz24ii85i0h2dhcychdp650";
+  rev = "c113487f73713a03b1a139b22bb34b86234d0495";
+  sha256 = "1irxklnmvm8wsa70ypjahkr8rfqq7357vcy8r0x1sfncs1hy6gr6";
 }
-- 
cgit v1.2.3


From ce34ab4268927d3e93f627b8d61fdc151a01f1aa Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 24 Nov 2016 23:12:13 +0100
Subject: github-hosts-sync: add nettools for painload-8df031f's use of
 hostname

---
 krebs/5pkgs/github-hosts-sync/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/github-hosts-sync/default.nix b/krebs/5pkgs/github-hosts-sync/default.nix
index bc4c58bb0..cdfed468c 100644
--- a/krebs/5pkgs/github-hosts-sync/default.nix
+++ b/krebs/5pkgs/github-hosts-sync/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation {
         git
         gnugrep
         gnused
+        nettools
         openssh
         socat
       ]);
-- 
cgit v1.2.3


From d59facd88c7d33d0ac125eb93392d2a67b46aea4 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 25 Nov 2016 00:15:13 +0100
Subject: writeOut: add support for text checking

---
 krebs/5pkgs/builders.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/builders.nix b/krebs/5pkgs/builders.nix
index 5860b9a15..77055d16a 100644
--- a/krebs/5pkgs/builders.nix
+++ b/krebs/5pkgs/builders.nix
@@ -91,6 +91,7 @@ rec {
 
     writers.text =
       { path
+      , check ? null
       , executable ? false
       , mode ? if executable then "0755" else "0644"
       , text
@@ -102,6 +103,9 @@ rec {
         var = "file_${hashString "sha1" path}";
         val = text;
         install = /* sh */ ''
+          ${optionalString (check != null) /* sh */ ''
+            ${check} ''$${var}Path
+          ''}
           ${pkgs.coreutils}/bin/install -m ${mode} -D ''$${var}Path $out${path}
         '';
       };
-- 
cgit v1.2.3


From b3c6e9a2bde5d1c911d1bb17ca3218acab7285b8 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 25 Nov 2016 00:17:57 +0100
Subject: writeBash*: use shellcheck (for warnings only)

---
 krebs/5pkgs/builders.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/builders.nix b/krebs/5pkgs/builders.nix
index 77055d16a..49d04be4d 100644
--- a/krebs/5pkgs/builders.nix
+++ b/krebs/5pkgs/builders.nix
@@ -37,7 +37,17 @@ rec {
       };
     };
 
-  writeBash = makeScriptWriter "${pkgs.bash}/bin/bash";
+  writeBash = name: text:
+    assert (with types; either absolute-pathname filename).check name;
+    pkgs.writeOut (baseNameOf name) {
+      ${optionalString (types.absolute-pathname.check name) name} = {
+        check = pkgs.writeDash "shellcheck.sh" ''
+          ${pkgs.haskellPackages.ShellCheck}/bin/shellcheck "$1" || :
+        '';
+        executable = true;
+        text = "#! ${pkgs.bash}/bin/bash\n${text}";
+      };
+    };
 
   writeBashBin = name:
     assert types.filename.check name;
-- 
cgit v1.2.3


From 9bae4d80c83bbea14671fbbffe3c3faaa56dbba8 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 25 Nov 2016 23:58:28 +0100
Subject: dic: 1.0.0 -> 1.0.1

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

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/dic/default.nix b/krebs/5pkgs/dic/default.nix
index ea70f34d7..963786f0c 100644
--- a/krebs/5pkgs/dic/default.nix
+++ b/krebs/5pkgs/dic/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = http://cgit.ni.krebsco.de/dic;
-    rev = "refs/tags/v1.0.0";
-    sha256 = "0f3f5dqpw5y79p2k68qw6jdlkrnapqs3nvnc41zwacyhgppiww0k";
+    rev = "refs/tags/v1.0.1";
+    sha256 = "1686mba1z4m7vq70w26qpl00z1cz286c9bya9ql36g6w2pbcs8d3";
   };
 
   phases = [
-- 
cgit v1.2.3