diff options
| -rw-r--r-- | flake.lock | 147 | ||||
| -rw-r--r-- | flake.nix | 5 | ||||
| -rw-r--r-- | hosts/p-body/hydra.nix | 3 |
3 files changed, 105 insertions, 50 deletions
@@ -160,27 +160,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1683560683, - "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "006c75898cf814ef9497252b022e91c946ba8e17", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -222,7 +201,9 @@ "flake-compat": [ "flake-compat" ], - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1684306480, @@ -261,7 +242,7 @@ }, "guzzle_api": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pre-commit-hooks": [ "pre-commit-hooks" ] @@ -300,17 +281,44 @@ "type": "github" } }, + "hydra": { + "inputs": { + "nix": "nix", + "nixpkgs": [ + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1683550113, + "narHash": "sha256-niw0RHfwpo2/86wvtHrbU/DQYlkkwtrM+qG7GEC0qAo=", + "owner": "nixos", + "repo": "hydra", + "rev": "13ef4e3c5d87bc6f68c91a36d78cdc7d589d8ff2", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "hydra", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", "flake-compat": [ "flake-compat" ], - "flake-parts": "flake-parts_2", + "flake-parts": [ + "flake-parts" + ], "flake-utils": [ "flake-utils" ], - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "pre-commit-hooks-nix": [ "pre-commit-hooks" ], @@ -330,6 +338,43 @@ "type": "github" } }, + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, + "nix": { + "inputs": { + "lowdown-src": "lowdown-src", + "nixpkgs": "nixpkgs_2", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1677045134, + "narHash": "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=", + "owner": "nixos", + "repo": "nix", + "rev": "4acc684ef7b3117c6d6ac12837398a0008a53d85", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "2.13.3", + "repo": "nix", + "type": "github" + } + }, "nixinate": { "inputs": { "nixpkgs": [ @@ -394,66 +439,67 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684690104, - "narHash": "sha256-It8pY+NukmjrBrQ3AeTLpF5m7ecVfIYxE+qzV33YNmo=", + "lastModified": 1684570954, + "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "601b8658d53c5e25ac3b5203e4a163122a77a84b", + "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "type": "indirect" } }, - "nixpkgs-stable": { + "nixpkgs-regression": { "locked": { - "lastModified": 1684580438, - "narHash": "sha256-LUPswmDn6fXP3lEBJFA2Id8PkcYDgzUilevWackYVvQ=", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7dc71aef32e8faf065cb171700792cf8a65c152d", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-22.11", - "type": "indirect" + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-stable": { "locked": { - "lastModified": 1684570954, - "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", + "lastModified": 1684580438, + "narHash": "sha256-LUPswmDn6fXP3lEBJFA2Id8PkcYDgzUilevWackYVvQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3", + "rev": "7dc71aef32e8faf065cb171700792cf8a65c152d", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", + "ref": "nixos-22.11", "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { - "lastModified": 1684690104, - "narHash": "sha256-It8pY+NukmjrBrQ3AeTLpF5m7ecVfIYxE+qzV33YNmo=", + "lastModified": 1670461440, + "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "601b8658d53c5e25ac3b5203e4a163122a77a84b", + "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-22.11-small", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1684570954, "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", @@ -468,7 +514,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1684570954, "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", @@ -554,7 +600,7 @@ "agenix": "agenix", "crane": "crane_2", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -579,11 +625,12 @@ "getchoo": "getchoo", "guzzle_api": "guzzle_api", "home-manager": "home-manager", + "hydra": "hydra", "lanzaboote": "lanzaboote", "nixinate": "nixinate", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", "openwrt-imagebuilder": "openwrt-imagebuilder", @@ -32,6 +32,7 @@ getchoo = { url = "github:getchoo/nix-exprs"; + inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-compat.follows = "flake-compat"; }; @@ -45,9 +46,13 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + hydra.url = "github:nixos/hydra"; + lanzaboote = { url = "github:nix-community/lanzaboote"; + inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-compat.follows = "flake-compat"; + inputs.flake-parts.follows = "flake-parts"; inputs.flake-utils.follows = "flake-utils"; inputs.pre-commit-hooks-nix.follows = "pre-commit-hooks"; }; diff --git a/hosts/p-body/hydra.nix b/hosts/p-body/hydra.nix index c24d3c1..115e077 100644 --- a/hosts/p-body/hydra.nix +++ b/hosts/p-body/hydra.nix @@ -1,5 +1,7 @@ { config, + hydra, + pkgs, self, ... }: let @@ -22,6 +24,7 @@ in { services.hydra = { enable = true; + package = hydra.packages.${pkgs.system}.hydra; hydraURL = "https://hydra.${domain}"; notificationSender = "hydra@${domain}"; listenHost = "localhost"; |