From cd268ca24967733172dbe5c3fe62fefbbdf80e44 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 18 Feb 2020 14:57:16 +0100
Subject: krebs krops: use upstream writers

---
 krebs/krops.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'krebs')

diff --git a/krebs/krops.nix b/krebs/krops.nix
index 1f439f622..608e46df1 100644
--- a/krebs/krops.nix
+++ b/krebs/krops.nix
@@ -31,18 +31,19 @@
       };
     };
     stockholm.file = toString ../.;
-    stockholm-version.pipe = toString (pkgs.writeDash "${name}-version" ''
-      set -efu
-      cd ${lib.escapeShellArg stockholm.file}
-      V=$(${pkgs.coreutils}/bin/date +%y.%m)
-      if test -d .git; then
-        V=$V.git.$(${pkgs.git}/bin/git describe --always --dirty)
-        case $V in (*-dirty)
-          V=$V@''${HOSTNAME-$(${pkgs.nettools}/bin/hostname)}
-        esac
-      fi
-      printf %s "$V"
-    '');
+    stockholm-version.pipe =
+      toString (pkgs.writers.writeDash "${name}-version" ''
+        set -efu
+        cd ${lib.escapeShellArg stockholm.file}
+        V=$(${pkgs.coreutils}/bin/date +%y.%m)
+        if test -d .git; then
+          V=$V.git.$(${pkgs.git}/bin/git describe --always --dirty)
+          case $V in (*-dirty)
+            V=$V@''${HOSTNAME-$(${pkgs.nettools}/bin/hostname)}
+          esac
+        fi
+        printf %s "$V"
+      '');
   };
 
   source ={ test }: lib.evalSource [
-- 
cgit v1.2.3


From 86fe7dcad6658a4b363ea38bae1f0bd8632022de Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 26 Feb 2020 19:37:26 +0100
Subject: nixpkgs: c49da64 -> b7bbc6d

---
 krebs/nixpkgs.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs')

diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 769bacbe0..e0b37d1fc 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/NixOS/nixpkgs-channels",
-  "rev": "c49da6435f314e04fc58ca29807221817ac2ac6b",
-  "date": "2020-02-07T12:52:16+01:00",
-  "sha256": "17zsqhaf098bvcfarnq0h9601z6smkfd1kz1px6xfg6xqfmr80r7",
+  "rev": "b7bbc6d37878ed00b6467b574b02e840279f7d3d",
+  "date": "2020-02-26T11:51:29+01:00",
+  "sha256": "02q10jgi6m0vak3amb50ifw1pj82i17hs0npdkig7lsp8w3is7jq",
   "fetchSubmodules": false
 }
-- 
cgit v1.2.3


From 12eb826002182c2c3ca0084b2620f8395e3b8bc1 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 26 Feb 2020 19:37:54 +0100
Subject: nixpkgs-unstable: 100012e -> 55beed9

---
 krebs/nixpkgs-unstable.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs')

diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json
index 20bb6c107..1600d6f4a 100644
--- a/krebs/nixpkgs-unstable.json
+++ b/krebs/nixpkgs-unstable.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/NixOS/nixpkgs-channels",
-  "rev": "100012e55bc2a82fc680cba31a426ad38ead6fab",
-  "date": "2020-01-12T00:04:23+00:00",
-  "sha256": "0cvnx852n0krci9hi1rpcldx1kcpmvi5ihf2awvwfayvzp4wic8z",
+  "rev": "55beed9922c2f6b030af61ca7e33bd47850c68f2",
+  "date": "2020-02-26T03:53:16-05:00",
+  "sha256": "0jxkb3bl7axa6vmfsfdfx4mxv6wx0pc8iiwgrw2qh8wxhlhbylks",
   "fetchSubmodules": false
 }
-- 
cgit v1.2.3


From 3493cd74a1f6942566fbad4b89f4d3c84f964868 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 17 Mar 2020 20:06:22 +0100
Subject: irc-announce: fix more portable cat2

---
 krebs/5pkgs/simple/irc-announce/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/simple/irc-announce/default.nix b/krebs/5pkgs/simple/irc-announce/default.nix
index dea30a056..a90814aa9 100644
--- a/krebs/5pkgs/simple/irc-announce/default.nix
+++ b/krebs/5pkgs/simple/irc-announce/default.nix
@@ -24,7 +24,12 @@ 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() { (read x ; echo "$x" ; echo "$x" >&2) }
+  cat2() {
+    while read -r line; do
+      echo "$line"
+      echo "$line" >&2
+    done
+  }
 
   # privmsg_cat transforms stdin to a privmsg
   privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; }
-- 
cgit v1.2.3