summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-01-30 18:20:52 +0100
committerlassulus <lassulus@lassul.us>2018-01-30 18:20:52 +0100
commitcec665d4c1552a4453a5d07d3725ca211093d676 (patch)
tree6b8855225662c06a70a8053b07d1c3e1ac901cfb /makefu
parentde21c3d6bccbe2de25568334cfb2db33c235b21b (diff)
parent32c800ec3fc508c6c8d025a31c9b922d9fdbe04d (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu')
-rw-r--r--makefu/2configs/git/cgit-retiolum.nix9
-rw-r--r--makefu/2configs/hw/stk1160.nix1
2 files changed, 0 insertions, 10 deletions
diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix
index da246f66a..eacbd99cf 100644
--- a/makefu/2configs/git/cgit-retiolum.nix
+++ b/makefu/2configs/git/cgit-retiolum.nix
@@ -53,15 +53,6 @@ let
make-krebs-repo = with git; name: { cgit ? {}, ... }: {
inherit cgit name;
public = true;
- hooks = {
- post-receive = pkgs.git-hooks.irc-announce {
- nick = config.networking.hostName;
- verbose = config.krebs.build.host.name == "gum";
- channel = "#xxx";
- # TODO remove the hardcoded hostname
- server = "irc.r";
- };
- };
};
diff --git a/makefu/2configs/hw/stk1160.nix b/makefu/2configs/hw/stk1160.nix
index bdd146365..4ac639a25 100644
--- a/makefu/2configs/hw/stk1160.nix
+++ b/makefu/2configs/hw/stk1160.nix
@@ -6,7 +6,6 @@
extraConfig = ''
MEDIA_ANALOG_TV_SUPPORT y
VIDEO_STK1160_COMMON m
- VIDEO_STK1160_AC97 y
VIDEO_STK1160 m
'';
};