From 4de085154bbbc4c289abbab325282ec3df482e75 Mon Sep 17 00:00:00 2001 From: emily Date: Thu, 17 Oct 2024 15:58:16 +0200 Subject: [PATCH] hydra: Use correct module --- config/services/hydra/default.nix | 3 ++- flake.lock | 18 +++++++++--------- flake.nix | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/config/services/hydra/default.nix b/config/services/hydra/default.nix index 103c0ad..5073636 100644 --- a/config/services/hydra/default.nix +++ b/config/services/hydra/default.nix @@ -1,6 +1,7 @@ { config, inputs, lib, ... }: { imports = [ ./nix-config.nix + inputs.hydra.nixosModules.hydra ]; sops.secrets."services/hydra/signKey" = { owner = "hydra-queue-runner"; @@ -18,7 +19,7 @@ }; kyouma.deployment.auto-upgrade.cache = "daemon"; - services.hydra = { + services.hydra-dev = { enable = true; package = inputs.hydra.packages.${config.nixpkgs.hostPlatform.system}.hydra; hydraURL = "https://hydra.kyouma.net"; diff --git a/flake.lock b/flake.lock index 6506ccc..eb9f055 100644 --- a/flake.lock +++ b/flake.lock @@ -543,17 +543,17 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1724696781, - "narHash": "sha256-oDLfi7PdElAdhGK8i+mQ4OOn6Hu3vzHiYnuFcHoJ0IU=", + "lastModified": 1728321752, + "narHash": "sha256-GbBAoBF7ZObz0IP+g0LZKxMafpMvNKjTEu9haiZbV54=", "ref": "refs/heads/main", - "rev": "ab6d81fad404af05dfeae7f74d1783a2f7367826", - "revCount": 4205, + "rev": "ee1234c15cdcb427dbd4828e0add09d02cd606c9", + "revCount": 4220, "type": "git", - "url": "https://git.lix.systems/snaakey/hydra.git" + "url": "https://git.lix.systems/lix-project/hydra" }, "original": { "type": "git", - "url": "https://git.lix.systems/snaakey/hydra.git" + "url": "https://git.lix.systems/lix-project/hydra" } }, "iceshrimp": { @@ -842,11 +842,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723688146, - "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", + "lastModified": 1728193676, + "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", + "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a1573dd..9a54db8 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hydra = { - url = "git+https://git.lix.systems/snaakey/hydra.git"; + url = "git+https://git.lix.systems/lix-project/hydra"; inputs.lix.follows = "lix"; }; iceshrimp = {