diff --git a/flake.lock b/flake.lock index 1dfdc50..0791a3e 100644 --- a/flake.lock +++ b/flake.lock @@ -116,6 +116,21 @@ } }, "flake-compat": { + "locked": { + "lastModified": 1746162366, + "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -153,28 +168,6 @@ } }, "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", @@ -271,52 +264,52 @@ }, "hydra": { "inputs": { - "lix": [ - "lix" - ], - "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": [ - "nixpkgs" - ] + "flake-compat": "flake-compat", + "lix": "lix", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1744102671, - "narHash": "sha256-/y92PMLAG1ueMInNKaar27H6voo5m1jDnJhxcIYOp5M=", - "ref": "lix-2.92", - "rev": "dd8114c53075524d06ba1de3346e39610923427b", - "revCount": 4235, + "lastModified": 1748520450, + "narHash": "sha256-thTwt6c/qdLg65urUWSENbmwf/ofvujpFNNTcF+iZvI=", + "ref": "lix-2.93", + "rev": "509c94cdb7e11d48e67a5a68c0d5fadfcda7bad5", + "revCount": 4257, "type": "git", "url": "https://git.lix.systems/lix-project/hydra.git" }, "original": { - "ref": "lix-2.92", + "ref": "lix-2.93", "type": "git", "url": "https://git.lix.systems/lix-project/hydra.git" } }, "lix": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": [ + "hydra", + "flake-compat" + ], "nix2container": "nix2container", "nixpkgs": [ + "hydra", "nixpkgs" ], "nixpkgs-regression": "nixpkgs-regression", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1742250400, - "narHash": "sha256-be2mY7VFiWcPw7GcaJBbUvpnpoLd39wxqTXagBNTR5w=", - "ref": "release-2.92", - "rev": "d8db15010d2059a23a17f70ef542b4d1e7d2c640", - "revCount": 16651, + "lastModified": 1747597901, + "narHash": "sha256-jS+P57tXZEl+zvPfEIHFbd1j3xfuWcrcMrcnbm9wWbE=", + "ref": "release-2.93", + "rev": "33eaaf02fd3f380e99032b25e741eeeb10573cad", + "revCount": 17846, "type": "git", - "url": "https://git.lix.systems/lix-project/lix.git" + "url": "https://git.lix.systems/lix-project/lix" }, "original": { - "ref": "release-2.92", + "ref": "release-2.93", "type": "git", - "url": "https://git.lix.systems/lix-project/lix.git" + "url": "https://git.lix.systems/lix-project/lix" } }, "lix-module": { @@ -331,20 +324,45 @@ ] }, "locked": { - "lastModified": 1742943028, - "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", - "ref": "release-2.92", - "rev": "3fae818597ca2f1474de62022f850c23be50528d", - "revCount": 134, + "lastModified": 1748254718, + "narHash": "sha256-Uf6HNA0JctJH4ZdrZ/xb185mT0/XusLxnric9Xhg7Es=", + "ref": "release-2.93", + "rev": "3855614ceafe562393472cca5fb2005297889a75", + "revCount": 143, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module.git" }, "original": { - "ref": "release-2.92", + "ref": "release-2.93", "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module.git" } }, + "lix_2": { + "inputs": { + "flake-compat": "flake-compat_2", + "nix2container": "nix2container_2", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression_2", + "pre-commit-hooks": "pre-commit-hooks_2" + }, + "locked": { + "lastModified": 1747597901, + "narHash": "sha256-jS+P57tXZEl+zvPfEIHFbd1j3xfuWcrcMrcnbm9wWbE=", + "ref": "release-2.93", + "rev": "33eaaf02fd3f380e99032b25e741eeeb10573cad", + "revCount": 17846, + "type": "git", + "url": "https://git.lix.systems/lix-project/lix.git" + }, + "original": { + "ref": "release-2.93", + "type": "git", + "url": "https://git.lix.systems/lix-project/lix.git" + } + }, "mitel-ommclient2": { "inputs": { "nixpkgs": [ @@ -366,57 +384,6 @@ "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": 1737237842, - "narHash": "sha256-tPr61X9v/OMVt7VXOs1RRStciwN8gDGxEKx+h0/Fg48=", - "ref": "release-2.92", - "rev": "fdaeb722d05a3ac58daaa24d4b5fa8db4457d82e", - "revCount": 621, - "type": "git", - "url": "https://git.lix.systems/lix-project/nix-eval-jobs" - }, - "original": { - "ref": "release-2.92", - "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": { @@ -433,6 +400,22 @@ "type": "github" } }, + "nix2container_2": { + "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": [ @@ -517,6 +500,22 @@ "type": "github" } }, + "nixpkgs-regression_2": { + "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, @@ -550,6 +549,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1748437600, + "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1748190013, "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", @@ -601,6 +616,22 @@ "type": "github" } }, + "pre-commit-hooks_2": { + "flake": false, + "locked": { + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "rainbowrss": { "inputs": { "nixpkgs": [ @@ -630,11 +661,11 @@ "fieldpoc": "fieldpoc", "harmonia": "harmonia", "hydra": "hydra", - "lix": "lix", + "lix": "lix_2", "lix-module": "lix-module", "nixos-exporter": "nixos-exporter", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-0dc1c7": "nixpkgs-0dc1c7", "nurausstieg": "nurausstieg", "rainbowrss": "rainbowrss", @@ -707,7 +738,7 @@ }, "ssh-to-age": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ] @@ -776,28 +807,6 @@ "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 a50e111..0d9d76f 100644 --- a/flake.nix +++ b/flake.nix @@ -25,16 +25,16 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hydra = { - url = "git+https://git.lix.systems/lix-project/hydra.git?ref=lix-2.92"; - inputs.lix.follows = "lix"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "git+https://git.lix.systems/lix-project/hydra.git?ref=lix-2.93"; + #inputs.lix.follows = "lix"; + #inputs.nixpkgs.follows = "nixpkgs"; }; lix = { - url = "git+https://git.lix.systems/lix-project/lix.git?ref=release-2.92"; + url = "git+https://git.lix.systems/lix-project/lix.git?ref=release-2.93"; inputs.nixpkgs.follows = "nixpkgs"; }; lix-module = { - url = "git+https://git.lix.systems/lix-project/nixos-module.git?ref=release-2.92"; + url = "git+https://git.lix.systems/lix-project/nixos-module.git?ref=release-2.93"; inputs.lix.follows = "lix"; inputs.nixpkgs.follows = "nixpkgs"; };