ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Try again to ensure hydra module is usable

Browse source 
Nixpkgs only contains a `hydra_unstable`, not `hydra`, package, so
adjust the default accordingly, and then override it to our package in
the separate module which does that.

(cherry picked from commit e149da7b9bbc04bd0b1ca03fa0768e958cbcd40e)
This commit is contained in:
John Ericson 2024-05-03 12:41:17 -04:00 committed by Pierre Bourdon
parent c98017b823
commit 62bc5b54b2
Signed by untrusted user: delroth
GPG key ID: 6FB80DCD84DA0F1C
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -76,7 +76,7 @@
modules =
[
self.nixosModules.hydra
self.nixosModules.overlayNixpkgsForThisHyydra
self.nixosModules.overlayNixpkgsForThisHydra
self.nixosModules.hydraTest
self.nixosModules.hydraProxy
{

3
nixos-modules/default.nix
View file

@ -3,8 +3,9 @@
{
hydra = import ./hydra.nix;
overlayNixpkgsForThisHyydra = {
overlayNixpkgsForThisHydra = { pkgs, ... }: {
nixpkgs = { inherit overlays; };
services.hydra.package = pkgs.hydra;
};
hydraTest = { pkgs, ... }: {

4
nixos-modules/hydra.nix
View file

@ -68,7 +68,7 @@ in
package = mkOption {
type = types.path;
default = pkgs.hydra;
default = pkgs.hydra_unstable;
defaultText = literalExpression "pkgs.hydra";
description = "The Hydra package.";
};
@ -233,7 +233,7 @@ in
gc-keep-outputs = true;
gc-keep-derivations = true;
};
services.hydra-dev.extraConfig =
''
using_frontend_proxy = 1

2
nixos-tests.nix
View file

@ -7,7 +7,7 @@ let
{
imports = [
nixosModules.hydra
nixosModules.overlayNixpkgsForThisHyydra
nixosModules.overlayNixpkgsForThisHydra
nixosModules.hydraTest
];