From 4f0d0f692dd102b577cf13d33fb10a63aa81edc3 Mon Sep 17 00:00:00 2001 From: leo60228 Date: Wed, 6 Nov 2024 22:08:33 -0500 Subject: [PATCH] ???? --- flake.lock | 46 ++++++++++++++++++++++------------------------ flake.nix | 11 ++++++----- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 0e34d26..279dfa5 100644 --- a/flake.lock +++ b/flake.lock @@ -149,17 +149,16 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ - "hydra", - "nix-eval-jobs", + "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -171,16 +170,16 @@ "flake-parts_2": { "inputs": { "nixpkgs-lib": [ - "lanzaboote", + "nix-eval-jobs", "nixpkgs" ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -506,7 +505,9 @@ "lix": [ "lix" ], - "nix-eval-jobs": "nix-eval-jobs", + "nix-eval-jobs": [ + "nix-eval-jobs" + ], "nixpkgs": [ "nixpkgs" ] @@ -527,7 +528,7 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" @@ -705,14 +706,12 @@ }, "nix-eval-jobs": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "lix": [ - "hydra", "lix" ], "nix-github-actions": "nix-github-actions", "nixpkgs": [ - "hydra", "nixpkgs" ], "treefmt-nix": "treefmt-nix" @@ -725,24 +724,23 @@ "url": "https://git.lix.systems/api/v1/repos/lix-project/nix-eval-jobs/archive/43aaa943bfdbc56277e86ff430a761d38d194ad0.tar.gz?rev=43aaa943bfdbc56277e86ff430a761d38d194ad0" }, "original": { - "type": "git", - "url": "https://git.lix.systems/lix-project/nix-eval-jobs" + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nix-eval-jobs/archive/fixes/build-settings-opeq.tar.gz" } }, "nix-github-actions": { "inputs": { "nixpkgs": [ - "hydra", "nix-eval-jobs", "nixpkgs" ] }, "locked": { - "lastModified": 1720066371, - "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", "type": "github" }, "original": { @@ -1086,6 +1084,7 @@ "lix-module": "lix-module", "mpdiscord": "mpdiscord", "naersk": "naersk_3", + "nix-eval-jobs": "nix-eval-jobs", "nixos-apple-silicon": "nixos-apple-silicon", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", @@ -1438,17 +1437,16 @@ "treefmt-nix": { "inputs": { "nixpkgs": [ - "hydra", "nix-eval-jobs", "nixpkgs" ] }, "locked": { - "lastModified": 1723454642, - "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", + "lastModified": 1729613947, + "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "349de7bc435bdff37785c2466f054ed1766173be", + "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 93a77b3..fd0fc6c 100644 --- a/flake.nix +++ b/flake.nix @@ -38,11 +38,12 @@ url = "https://git.lix.systems/lix-project/hydra/archive/main.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; inputs.lix.follows = "lix"; - inputs.nix-eval-jobs = { - url = "https://git.lix.systems/lix-project/nix-eval-jobs/archive/fixes/build-settings-opeq.tar.gz"; - inputs.nixpkgs.follows = "hydra/nixpkgs"; - inputs.lix.follows = "hydra/lix"; - }; + inputs.nix-eval-jobs.follows = "nix-eval-jobs"; + }; + inputs.nix-eval-jobs = { + url = "https://git.lix.systems/lix-project/nix-eval-jobs/archive/fixes/build-settings-opeq.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.lix.follows = "lix"; }; inputs.lix = { url = "git+https://git@git.lix.systems/lix-project/lix";