From 2dc68d1295b26df453317a4f18fd796d04a18992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 30 Jun 2026 21:51:48 +0200 Subject: [PATCH 1/2] tribuchet: bump --- flake.lock | 9 ++++++--- flake.nix | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 4df38add9..bf748323b 100644 --- a/flake.lock +++ b/flake.lock @@ -1054,6 +1054,9 @@ }, "tribuchet": { "inputs": { + "crane": [ + "crane" + ], "nix-darwin": [ "nix-darwin" ], @@ -1062,11 +1065,11 @@ ] }, "locked": { - "lastModified": 1782076996, - "narHash": "sha256-L0o+oRRedeRMXEzTmbYOWO1wM0UrNKivBA87daIWiR4=", + "lastModified": 1782824879, + "narHash": "sha256-uZ8i0Bk5dYmzMq6ukzKARX1hHs2uKFl4Gcnfi0wGWNc=", "owner": "Mic92", "repo": "tribuchet", - "rev": "3652b8e62bf33c41271b7dcaad170385984d4801", + "rev": "cc4245edfbe91ffbb04b891bba4238293d8529e9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ba1e88835..29c57ec99 100644 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,7 @@ tribuchet.url = "github:Mic92/tribuchet"; tribuchet.inputs.nixpkgs.follows = "nixpkgs"; tribuchet.inputs.nix-darwin.follows = "nix-darwin"; + tribuchet.inputs.crane.follows = "crane"; #spora.url = "github:krebs/spora"; #spora.inputs.nixpkgs.follows = "nixpkgs"; From c49d8881ed78d160cbb1992c350580a224622578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 30 Jun 2026 23:59:46 +0200 Subject: [PATCH 2/2] tribuchet: bump --- flake.lock | 7 ++++--- flake.nix | 2 +- machines/eve/modules/tribuchet.nix | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index bf748323b..02f0f6aa1 100644 --- a/flake.lock +++ b/flake.lock @@ -1065,15 +1065,16 @@ ] }, "locked": { - "lastModified": 1782824879, - "narHash": "sha256-uZ8i0Bk5dYmzMq6ukzKARX1hHs2uKFl4Gcnfi0wGWNc=", + "lastModified": 1782856656, + "narHash": "sha256-dedl4w2MnZJxJV8LpdJeRPi2ueCMIqxTgTlGvgqn4Gc=", "owner": "Mic92", "repo": "tribuchet", - "rev": "cc4245edfbe91ffbb04b891bba4238293d8529e9", + "rev": "abcea59743596594ad9ac50a4708ca3c25240588", "type": "github" }, "original": { "owner": "Mic92", + "ref": "build-fix", "repo": "tribuchet", "type": "github" } diff --git a/flake.nix b/flake.nix index 29c57ec99..e7013ef32 100644 --- a/flake.nix +++ b/flake.nix @@ -65,7 +65,7 @@ tincr.inputs.treefmt-nix.follows = "treefmt-nix"; tincr.inputs.crane.follows = "crane"; - tribuchet.url = "github:Mic92/tribuchet"; + tribuchet.url = "github:Mic92/tribuchet/build-fix"; tribuchet.inputs.nixpkgs.follows = "nixpkgs"; tribuchet.inputs.nix-darwin.follows = "nix-darwin"; tribuchet.inputs.crane.follows = "crane"; diff --git a/machines/eve/modules/tribuchet.nix b/machines/eve/modules/tribuchet.nix index a3e68eeb5..8dcee1af6 100644 --- a/machines/eve/modules/tribuchet.nix +++ b/machines/eve/modules/tribuchet.nix @@ -52,8 +52,8 @@ in # aarch64-linux goes to the eliza worker, x86_64-linux to jamie; # a declined build (no worker up) falls back to a local build. systems = [ - #"aarch64-linux" - #"x86_64-linux" + "aarch64-linux" + "x86_64-linux" ]; # nix-1 main already carries the uid-range patch (see flake input). patchNix = false;