delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1381 from NixOS/factor-out-tests

Browse source 
Try again to ensure hydra module is usable
This commit is contained in:
John Ericson 2024-05-03 12:50:02 -04:00 committed by GitHub
parent e81c36ac92 e149da7b9b
commit 3bf00e31c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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 = modules =
[ [
self.nixosModules.hydra self.nixosModules.hydra
self.nixosModules.overlayNixpkgsForThisHyydra self.nixosModules.overlayNixpkgsForThisHydra
self.nixosModules.hydraTest self.nixosModules.hydraTest
self.nixosModules.hydraProxy self.nixosModules.hydraProxy
{ {

3
nixos-modules/default.nix
View file

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

4
nixos-modules/hydra.nix
View file

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

2
nixos-tests.nix
View file

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