From 286fc7045b3ad8dea36386d8de4a1fc59fd70c80 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 4 Mar 2017 22:49:24 +0100
Subject: git-hooks.irc-announce: simplify file structure

---
 krebs/5pkgs/git-hooks/default.nix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/git-hooks/default.nix b/krebs/5pkgs/git-hooks/default.nix
index 9355a878..3b9d1b3b 100644
--- a/krebs/5pkgs/git-hooks/default.nix
+++ b/krebs/5pkgs/git-hooks/default.nix
@@ -1,13 +1,10 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 
-with lib;
-
-let
-  out = {
-    inherit irc-announce;
-  };
+with import <stockholm/lib>;
 
+{
   # TODO irc-announce should return a derivation
+  #      but it cannot because krebs.git.repos.*.hooks :: attrsOf str
   irc-announce = { nick, channel, server, port ? 6667, verbose ? false, branches ? [] }: ''
     #! /bin/sh
     set -euf
@@ -99,7 +96,7 @@ let
     done
 
     if test -n "''${message-}"; then
-      exec ${irc-announce-script} \
+      exec ${pkgs.irc-announce}/bin/irc-announce \
         "$server" \
         "$port" \
         "$nick" \
@@ -107,6 +104,4 @@ let
         "$message"
     fi
   '';
-
-  irc-announce-script = "${pkgs.irc-announce}/bin/irc-announce";
-in out
+}
-- 
cgit v1.2.3


From b690768e28170cd0227f5132ca39451a43cf573f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 4 Mar 2017 22:49:44 +0100
Subject: git-hooks.irc-announce: append .r to cgit_endpoint

---
 krebs/5pkgs/git-hooks/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/git-hooks/default.nix b/krebs/5pkgs/git-hooks/default.nix
index 3b9d1b3b..4017b873 100644
--- a/krebs/5pkgs/git-hooks/default.nix
+++ b/krebs/5pkgs/git-hooks/default.nix
@@ -34,7 +34,7 @@ with import <stockholm/lib>;
     port=${toString port}
 
     host=$nick
-    cgit_endpoint=http://cgit.$host
+    cgit_endpoint=http://cgit.$host.r
 
     empty=0000000000000000000000000000000000000000
 
-- 
cgit v1.2.3