From ce731718eda4266bf09d45434d98418f5efd195a Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Mon, 28 Sep 2015 01:10:35 +0200
Subject: irc-announce: optimize diff --stat renderer

---
 tv/4lib/git.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'tv')

diff --git a/tv/4lib/git.nix b/tv/4lib/git.nix
index fe6401728..6f3654356 100644
--- a/tv/4lib/git.nix
+++ b/tv/4lib/git.nix
@@ -178,10 +178,7 @@ let
               $id2..$id
 
           git diff --stat $id2..$id \
-            | sed '
-                  $!s/+/'$(green '&')'/g
-                  $!s/-/'$(red   '&')'/g
-                '
+            | sed '$!s/\(+*\)\(-*\)$/'$(green '\1')$(red '\2')'/'
         )
 
       done
-- 
cgit v1.2.3


From ffa024c95025862d4498faed453ae34ca02b7582 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Mon, 28 Sep 2015 01:18:44 +0200
Subject: irc-announce: omit $GIT_SSH_USER

---
 tv/4lib/git.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'tv')

diff --git a/tv/4lib/git.nix b/tv/4lib/git.nix
index 6f3654356..f99bcc967 100644
--- a/tv/4lib/git.nix
+++ b/tv/4lib/git.nix
@@ -114,6 +114,12 @@ let
         gnused
       ])}
 
+      green()  { printf '\x0303,99%s\x0F' "$1"; }
+      red()    { printf '\x0304,99%s\x0F' "$1"; }
+      orange() { printf '\x0307,99%s\x0F' "$1"; }
+      pink()   { printf '\x0313,99%s\x0F' "$1"; }
+      gray()   { printf '\x0314,99%s\x0F' "$1"; }
+
       nick=${escapeShellArg nick}
       channel=${escapeShellArg channel}
       server=${escapeShellArg server}
@@ -163,15 +169,10 @@ let
 
         #$host $GIT_SSH_REPO $ref $link
         message="''${message+$message
-      }$GIT_SSH_USER $receive_mode $link"
+      }$(pink push) $link $(gray "($receive_mode)")"
 
         message=''${message+$message
       }$(
-          green()  { printf '\x0303,99%s\x0F' "$1"; }
-          red()    { printf '\x0304,99%s\x0F' "$1"; }
-          orange() { printf '\x0307,99%s\x0F' "$1"; }
-          gray()   { printf '\x0314,99%s\x0F' "$1"; }
-
           git log \
               --format="$(orange %h) %s $(gray '(%ar)')" \
               --reverse \
-- 
cgit v1.2.3


From ac49bcab3d7776b2e17475fbaaa927b1a7d1c279 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Mon, 28 Sep 2015 01:29:36 +0200
Subject: irc-announce: add add_message

---
 tv/4lib/git.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'tv')

diff --git a/tv/4lib/git.nix b/tv/4lib/git.nix
index f99bcc967..748b77269 100644
--- a/tv/4lib/git.nix
+++ b/tv/4lib/git.nix
@@ -120,6 +120,12 @@ let
       pink()   { printf '\x0313,99%s\x0F' "$1"; }
       gray()   { printf '\x0314,99%s\x0F' "$1"; }
 
+      unset message
+      add_message() {
+        message="''${message+$message
+      }$*"
+      }
+
       nick=${escapeShellArg nick}
       channel=${escapeShellArg channel}
       server=${escapeShellArg server}
@@ -130,7 +136,6 @@ let
 
       empty=0000000000000000000000000000000000000000
 
-      unset message
       while read oldrev newrev ref; do
 
         if [ $oldrev = $empty ]; then
@@ -168,11 +173,9 @@ let
         esac
 
         #$host $GIT_SSH_REPO $ref $link
-        message="''${message+$message
-      }$(pink push) $link $(gray "($receive_mode)")"
+        add_message $(pink push) $link $(gray "($receive_mode)")
 
-        message=''${message+$message
-      }$(
+        add_message "$(
           git log \
               --format="$(orange %h) %s $(gray '(%ar)')" \
               --reverse \
@@ -180,7 +183,7 @@ let
 
           git diff --stat $id2..$id \
             | sed '$!s/\(+*\)\(-*\)$/'$(green '\1')$(red '\2')'/'
-        )
+        )"
 
       done
 
-- 
cgit v1.2.3


From 3b3291ed7da3542ab2f0018a9a0fc6737eaf412c Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 1 Oct 2015 14:24:15 +0200
Subject: wu nixpkgs: bd84eba -> e916273

---
 tv/1systems/wu.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv')

diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 17394df25..e54aed056 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -11,7 +11,7 @@ with lib;
   krebs.build.source = {
     git.nixpkgs = {
       url = https://github.com/NixOS/nixpkgs;
-      rev = "bd84ebaa1e0359f41350e053ed24592b169b5714";
+      rev = "e916273209560b302ab231606babf5ce1c481f08";
     };
     dir.secrets = {
       host = config.krebs.hosts.wu;
-- 
cgit v1.2.3