Merge branch 'master' into bump-cachix-c++

hercules-ci · Aug 6, 2019 · a08fce8 · a08fce8
2 parents 5eef62b + 7fd7a14
commit a08fce8
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/module.nix b/module.nix
@@ -3,13 +3,13 @@
   that this file was bundled with.
  */
 { pkgs, ... }:
-{
-  imports = [ ./for-upstream/default.nixos.nix ];
 
-  # Overrides hercules-ci-agent to the version in this repo.
-  nixpkgs.overlays = [ (import ./nix/overlay.nix) ];
+let
+ agentpkgs = import ./. {};
+in {
+  imports = [ ./for-upstream/default.nixos.nix ];
 
-  services.hercules-ci-agent.package = pkgs.hercules-ci-agent;
+  services.hercules-ci-agent.package = agentpkgs.hercules-ci-agent;
 
   # TODO blacklist the upstream module (does that blacklist imports transitively?...)
 }