From e7eedf0f4805d85a7596a1245833efb0e255fe20 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 21 May 2019 16:47:47 +0800
Subject: [PATCH] nixbld: centralize package overrides

---
 nixbld-etc-nixos/configuration.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix
index 8dda24a..706b64c 100644
--- a/nixbld-etc-nixos/configuration.nix
+++ b/nixbld-etc-nixos/configuration.nix
@@ -130,10 +130,6 @@ ACTION=="add", SUBSYSTEM=="tty", \
   ];
   services.hydra = {
     enable = true;
-    package = pkgs.hydra.overrideAttrs(oa: {
-      patches = oa.patches ++ [ ./hydra-conda.patch ./hydra-retry.patch ];
-      hydraPath = oa.hydraPath + ":" + pkgs.lib.makeBinPath [ pkgs.jq ];
-    });
     useSubstitutes = true;
     hydraURL = "https://nixbld.m-labs.hk";
     notificationSender = "hydra@m-labs.hk";
@@ -200,7 +196,13 @@ ACTION=="add", SUBSYSTEM=="tty", \
   };
  
   nixpkgs.config.packageOverrides = super: let self = super.pkgs; in {
-    matterbridge = super.matterbridge.overrideAttrs(oa: { patches = [ ./matterbridge-disable-github.patch ]; });
+    hydra = super.hydra.overrideAttrs(oa: {
+      patches = oa.patches ++ [ ./hydra-conda.patch ./hydra-retry.patch ];
+      hydraPath = oa.hydraPath + ":" + super.lib.makeBinPath [ super.jq ];
+    });
+    matterbridge = super.matterbridge.overrideAttrs(oa: {
+      patches = [ ./matterbridge-disable-github.patch ];
+    });
   };
 
   security.acme.certs = {