From 1fcc20aa493161f52e02952800fc29f1c3ee9033 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 26 Jun 2016 19:20:11 +0200
Subject: k 5 git-hooks: add option for branches

---
 krebs/5pkgs/git-hooks/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/git-hooks/default.nix b/krebs/5pkgs/git-hooks/default.nix
index c8e8c8f53..6f2cb8b6a 100644
--- a/krebs/5pkgs/git-hooks/default.nix
+++ b/krebs/5pkgs/git-hooks/default.nix
@@ -8,13 +8,14 @@ let
   };
 
   # TODO irc-announce should return a derivation
-  irc-announce = { nick, channel, server, port ? 6667, verbose ? false }: ''
+  irc-announce = { nick, channel, server, port ? 6667, verbose ? false, branches ? [] }: ''
     #! /bin/sh
     set -euf
 
     export PATH=${makeBinPath (with pkgs; [
       coreutils
       git
+      gnugrep
       gnused
     ])}
 
@@ -54,6 +55,12 @@ let
 
       h=$(echo $ref | sed 's:^refs/heads/::')
 
+      ${optionalString (branches != []) ''
+        if ! (echo "$h" | grep -qE "${concatStringsSep "|" branches}"); then
+          echo "we are not serving this branch: $h"
+          exit 0
+        fi
+      ''}
       # empty_tree=$(git hash-object -t tree /dev/null)
       empty_tree=4b825dc6
 
-- 
cgit v1.2.3


From edcdd5f06788b3e748bf7f908b9510cdfd3c13fe Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 27 Jun 2016 19:58:41 +0200
Subject: k 5: override buildbots sqlalchemy

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

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index f2bbaf7f4..f0bda0ee1 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -38,13 +38,13 @@ with config.krebs.lib;
 
     ReaktorPlugins = callPackage ./Reaktor/plugins.nix {};
 
-    #buildbot = callPackage <nixpkgs/pkgs/development/tools/build-managers/buildbot> {
-    #  inherit (pkgs.pythonPackages) twisted jinja2;
-    #  dateutil = pkgs.pythonPackages.dateutil_1_5;
-    #  sqlalchemy_migrate_0_7 = pkgs.pythonPackages.sqlalchemy_migrate_func (pkgs.pythonPackages.sqlalchemy7.override {
-    #    doCheck = false;
-    #  });
-    #};
+    buildbot = callPackage <nixpkgs/pkgs/development/tools/build-managers/buildbot> {
+      inherit (pkgs.pythonPackages) twisted jinja2;
+      dateutil = pkgs.pythonPackages.dateutil_1_5;
+      sqlalchemy_migrate_0_7 = pkgs.pythonPackages.sqlalchemy_migrate_func (pkgs.pythonPackages.sqlalchemy7.override {
+        doCheck = false;
+      });
+    };
 
     # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d
     symlinkJoin = { name, paths, ... }@args: let
-- 
cgit v1.2.3


From a8a3ac5640d1243b970dc9c6c788cf3e91a42f31 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 28 Jun 2016 17:54:33 +0200
Subject: k 5 Reaktor: fix build on newer nixpkgs

---
 krebs/5pkgs/Reaktor/default.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/Reaktor/default.nix b/krebs/5pkgs/Reaktor/default.nix
index c4a362757..fc3710820 100644
--- a/krebs/5pkgs/Reaktor/default.nix
+++ b/krebs/5pkgs/Reaktor/default.nix
@@ -3,6 +3,9 @@
 python3Packages.buildPythonPackage rec {
   name = "Reaktor-${version}";
   version = "0.5.1";
+
+  doCheck = false;
+
   propagatedBuildInputs = with pkgs;[
     python3Packages.docopt
     python3Packages.requests2
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/45100000.lock: No such file or directory (2)