From 8e6700aa2e67e43dd0d098a7f953cd70fbd0e995 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 6 Jul 2024 16:58:34 +1000 Subject: [PATCH] hydra: switch to fork --- flake.lock | 18 ++++++++++++++++++ flake.nix | 11 +++++++++++ 2 files changed, 29 insertions(+) diff --git a/flake.lock b/flake.lock index d29cc26d..0046cd9b 100644 --- a/flake.lock +++ b/flake.lock @@ -147,6 +147,23 @@ "type": "github" } }, + "hydra": { + "flake": false, + "locked": { + "lastModified": 1724802093, + "narHash": "sha256-GOK6CKWJkyRDAX5Jhsjdf8Ozp0BtJ4B13DNcTMLo++U=", + "owner": "qowoz", + "repo": "hydra", + "rev": "912c87e95428423766ecbd66d8e339825defdc33", + "type": "github" + }, + "original": { + "owner": "qowoz", + "ref": "community", + "repo": "hydra", + "type": "github" + } + }, "lite-config": { "locked": { "lastModified": 1723691425, @@ -284,6 +301,7 @@ "empty": "empty", "flake-compat": "flake-compat", "flake-parts": "flake-parts", + "hydra": "hydra", "lite-config": "lite-config", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 5c58dd3b..bc0575f6 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,8 @@ flake-compat.url = "github:nix-community/flake-compat"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; flake-parts.url = "github:hercules-ci/flake-parts"; + hydra.flake = false; + hydra.url = "github:qowoz/hydra/community"; lite-config.url = "github:yelite/lite-config"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; nix-darwin.url = "github:LnL7/nix-darwin"; @@ -61,6 +63,15 @@ { nixpkgs = { config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "terraform" ]; + overlays = [ + (final: prev: { + hydra = (prev.hydra.override { nix = final.nixVersions.nix_2_22; }).overrideAttrs (o: { + version = inputs.hydra.shortRev; + src = inputs.hydra; + buildInputs = o.buildInputs ++ [ final.perlPackages.DBIxClassHelpers ]; + }); + }) + ]; }; hostModuleDir = ./hosts;