diff --git a/flake.lock b/flake.lock index fe6dcdd..5702d6a 100644 --- a/flake.lock +++ b/flake.lock @@ -175,11 +175,11 @@ }, "crane_4": { "locked": { - "lastModified": 1779130139, - "narHash": "sha256-BLrtr42azquO7MdGFU5a7KiMl3YpFlTeIXqy1fT5GlQ=", + "lastModified": 1785520756, + "narHash": "sha256-eGUJ3OJ+P4R6x9bN2xx/VTwhrhBt3U0CKtcY/B5xp50=", "owner": "ipetkov", "repo": "crane", - "rev": "edb38893982a3338972bb4a2ec7ce7c29ba10fd9", + "rev": "fe4c37e1c9e4d5135a89c7f6a734da02e778c34b", "type": "github" }, "original": { @@ -189,6 +189,21 @@ } }, "crane_5": { + "locked": { + "lastModified": 1785541369, + "narHash": "sha256-6VCYI5xashcnAR1lambqt9FGh0F6kYhg1P2Z0VDlr48=", + "owner": "ipetkov", + "repo": "crane", + "rev": "508ff4829aefddee8ea62291e86b144b58365724", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_6": { "locked": { "lastModified": 1780532242, "narHash": "sha256-D+BsdpxmtUwtqGoY0IXPhHgTlmqgcZKCEo1oMyn7ep0=", @@ -203,28 +218,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "naersk", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1752475459, - "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=", - "owner": "nix-community", - "repo": "fenix", - "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -380,11 +373,11 @@ ] }, "locked": { - "lastModified": 1785511398, - "narHash": "sha256-Nw7BLRvVch/OBz8NJqYXI2oG5IPbJHO6RSDfFiDGQSk=", + "lastModified": 1785542226, + "narHash": "sha256-QUCQBPwY2fEAnNiXC7p7vilJXOExbsrHs4MhTxp5ubY=", "ref": "refs/heads/main", - "rev": "0db83c40a057ec3f427b956e0c3357baa1d8845d", - "revCount": 3033, + "rev": "38aa5f77f4901286c384011dd3b51dc272f47985", + "revCount": 3078, "type": "git", "url": "https://forge.darkest.space/hyperhive/hyperhive.git" }, @@ -443,27 +436,6 @@ "type": "github" } }, - "naersk": { - "inputs": { - "fenix": "fenix", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1782220280, - "narHash": "sha256-thLTFbp9D5Qknmh8q/v4FRpLGphUSijT3E86cbLYTXo=", - "owner": "nix-community", - "repo": "naersk", - "rev": "9aa07bb0256d300219b30622d2454e85f7f3667e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, "niri": { "inputs": { "niri-stable": "niri-stable", @@ -524,21 +496,6 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1757882181, - "narHash": "sha256-+cCxYIh2UNalTz364p+QYmWHs0P+6wDhiWR4jDIKQIU=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "59c44d1909c72441144b93cf0f054be7fe764de5", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nix-vscode-extensions": { "inputs": { "nixpkgs": [ @@ -722,11 +679,11 @@ ] }, "locked": { - "lastModified": 1785511665, - "narHash": "sha256-FMeGcP5LEqp2jaqqeD6pbqZs9cXo+vgmK9EJZE9p5GU=", + "lastModified": 1785541122, + "narHash": "sha256-+977ybTIFOFYHK9xMBsgXHQmVR8EgjQSzkloBdgMJsU=", "owner": "nix-community", "repo": "NUR", - "rev": "df67c3887232c2ac1d095752ff77a68ddeb0d389", + "rev": "64e74ace88f3101a283d364ca73ee16ae0aa992a", "type": "github" }, "original": { @@ -785,9 +742,7 @@ "hyperhive": "hyperhive", "hyperhive-website": "hyperhive-website", "lanzaboote": "lanzaboote", - "naersk": "naersk", "niri": "niri", - "nix-filter": "nix-filter", "nix-vscode-extensions": "nix-vscode-extensions", "nixos-generators": "nixos-generators", "nixos-raspberrypi": "nixos-raspberrypi", @@ -804,23 +759,6 @@ "zerforschen-plus": "zerforschen-plus" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1752428706, - "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "591e3b7624be97e4443ea7b5542c191311aa141d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -845,9 +783,6 @@ "servicepoint-cli": { "inputs": { "crane": "crane_4", - "nix-filter": [ - "nix-filter" - ], "nixpkgs": [ "nixpkgs" ], @@ -856,11 +791,11 @@ ] }, "locked": { - "lastModified": 1779909128, - "narHash": "sha256-H1NNRXwM1/tpRY+qDgEpfietLZ83oAbac0CHOD8TxjE=", + "lastModified": 1785542352, + "narHash": "sha256-kGZ8pqsjJcGd+9iVGqguiZRybPD5mj58mEEGyIRR91c=", "ref": "refs/heads/main", - "rev": "0457966ae9927bad1b0b931b8e09e2c03cdde88d", - "revCount": 53, + "rev": "4f08849eb5f5d26b95306fb6c768b452f57fb1e2", + "revCount": 57, "type": "git", "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git" }, @@ -871,22 +806,17 @@ }, "servicepoint-simulator": { "inputs": { - "naersk": [ - "naersk" - ], - "nix-filter": [ - "nix-filter" - ], + "crane": "crane_5", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1757763091, - "narHash": "sha256-V3E6JKGzCrq5u+hp38sAdKv/EoxU+X0qfSoBIPxALi4=", + "lastModified": 1785542359, + "narHash": "sha256-UGs9r2KH3tba9V4uIU2irTmRXT8BaXOKu6HtQJ6uGKg=", "ref": "refs/heads/main", - "rev": "493b7b0343334019b372176f811a966839ba9aa5", - "revCount": 121, + "rev": "1c2d6d2491f5c6b5cdbf193d3d7897b50d7f0c62", + "revCount": 129, "type": "git", "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git" }, @@ -941,11 +871,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1784060273, - "narHash": "sha256-14rIy2kTs5CufmDpgJrwkR+7IzuCAXyLYDAx6ixfRFc=", + "lastModified": 1785537671, + "narHash": "sha256-i8AdoRLhoh05jpmrGifLfIEGorlxp2hdGjMsojkKBuE=", "owner": "nix-community", "repo": "stylix", - "rev": "2245fa9e16034149b6501834b99863a486e94725", + "rev": "06c8a9425f1c0248dc9b84c1e2c9001fa41d7d0a", "type": "github" }, "original": { @@ -1077,7 +1007,7 @@ }, "trollshell": { "inputs": { - "crane": "crane_5", + "crane": "crane_6", "home-manager": [ "home-manager" ], diff --git a/flake.nix b/flake.nix index 9a5ba53..12819fa 100644 --- a/flake.nix +++ b/flake.nix @@ -28,10 +28,6 @@ url = "github:nix-community/lanzaboote/v1.0.0"; inputs.nixpkgs.follows = "nixpkgs"; }; - naersk = { - url = "github:nix-community/naersk"; - inputs.nixpkgs.follows = "nixpkgs"; - }; niri = { url = "github:sodiboo/niri-flake"; inputs = { @@ -39,7 +35,6 @@ nixpkgs-stable.follows = "nixpkgs"; }; }; - nix-filter.url = "github:numtide/nix-filter"; nix-vscode-extensions = { url = "github:nix-community/nix-vscode-extensions"; inputs.nixpkgs.follows = "nixpkgs"; @@ -63,7 +58,6 @@ url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git"; inputs = { nixpkgs.follows = "nixpkgs"; - nix-filter.follows = "nix-filter"; treefmt-nix.follows = "treefmt-nix"; }; }; @@ -72,7 +66,6 @@ inputs = { nixpkgs.follows = "nixpkgs"; naersk.follows = "naersk"; - nix-filter.follows = "nix-filter"; }; }; servicepoint-tanks = {