diff --git a/flake.lock b/flake.lock index 4d4b302..8f9062d 100644 --- a/flake.lock +++ b/flake.lock @@ -98,6 +98,22 @@ "url": "https://git.clerie.de/clerie/fieldpoc.git" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -120,6 +136,28 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "hydra", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "ssh-to-age", @@ -181,6 +219,53 @@ "type": "github" } }, + "hydra": { + "inputs": { + "lix": "lix", + "nix-eval-jobs": "nix-eval-jobs", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733503045, + "narHash": "sha256-VoMam8Zzbk+X6dIYwH2f9NqItL6g9YDhQvGybzSl8xQ=", + "ref": "refs/heads/main", + "rev": "eccf01d4fef67f87b6383f96c73781bd08b686ac", + "revCount": 4230, + "type": "git", + "url": "https://git.lix.systems/lix-project/hydra.git" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/hydra.git" + } + }, + "lix": { + "inputs": { + "flake-compat": "flake-compat", + "nix2container": "nix2container", + "nixpkgs": [ + "hydra", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1732112222, + "narHash": "sha256-H7GN4++a4vE49SUNojZx+FSk4mmpb2ifJUtJMJHProI=", + "ref": "refs/heads/main", + "rev": "66f6dbda32959dd5cf3a9aaba15af72d037ab7ff", + "revCount": 16513, + "type": "git", + "url": "https://git.lix.systems/lix-project/lix" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/lix" + } + }, "mitel-ommclient2": { "inputs": { "nixpkgs": [ @@ -202,6 +287,72 @@ "url": "https://git.clerie.de/clerie/mitel_ommclient2.git" } }, + "nix-eval-jobs": { + "inputs": { + "flake-parts": "flake-parts_2", + "lix": [ + "hydra", + "lix" + ], + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "hydra", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1732351635, + "narHash": "sha256-H94CcQ3yamG5+RMxtxXllR02YIlxQ5WD/8PcolO9yEA=", + "ref": "refs/heads/main", + "rev": "dfc286ca3dc49118c30d8d6205d6d6af76c62b7a", + "revCount": 617, + "type": "git", + "url": "https://git.lix.systems/lix-project/nix-eval-jobs" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/nix-eval-jobs" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "hydra", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731952509, + "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "7b5f051df789b6b20d259924d349a9ba3319b226", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nix2container": { + "flake": false, + "locked": { + "lastModified": 1724996935, + "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, "nixos-exporter": { "inputs": { "nixpkgs": [ @@ -254,6 +405,22 @@ "type": "github" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1713434076, @@ -322,6 +489,22 @@ "url": "https://git.clerie.de/clerie/nurausstieg.git" } }, + "pre-commit-hooks": { + "flake": false, + "locked": { + "lastModified": 1726745158, + "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "berlinerbaeder-exporter": "berlinerbaeder-exporter", @@ -330,6 +513,7 @@ "fernglas": "fernglas", "fieldpoc": "fieldpoc", "harmonia": "harmonia", + "hydra": "hydra", "nixos-exporter": "nixos-exporter", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", @@ -403,7 +587,7 @@ }, "ssh-to-age": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixpkgs" ] @@ -457,6 +641,28 @@ "repo": "treefmt-nix", "type": "github" } + }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "hydra", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732292307, + "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "705df92694af7093dfbb27109ce16d828a79155f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4dd91e3..322d009 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,10 @@ url = "github:nix-community/harmonia/harmonia-v1.0.2"; inputs.nixpkgs.follows = "nixpkgs"; }; + hydra = { + url = "git+https://git.lix.systems/lix-project/hydra.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; fieldpoc.url = "git+https://git.clerie.de/clerie/fieldpoc.git"; nixos-exporter = { url = "git+https://git.clerie.de/clerie/nixos-exporter.git"; diff --git a/flake/overlay.nix b/flake/overlay.nix index 0d346a4..d50a81d 100644 --- a/flake/overlay.nix +++ b/flake/overlay.nix @@ -3,6 +3,7 @@ , bij , chaosevents , harmonia +, hydra , nurausstieg , scan-to-gpg , ssh-to-age @@ -18,6 +19,8 @@ final: prev: { harmonia = harmonia.packages.${final.system}.harmonia.override { nixForHarmonia = final.nixVersions.nix_2_23; }; + inherit (hydra.packages.${final.system}) + hydra; inherit (nurausstieg.packages.${final.system}) nurausstieg; inherit (scan-to-gpg.packages.${final.system})