From cbae6f839526fd124633531c648bc8faacc7f227 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sun, 15 Mar 2026 16:58:10 +0100 Subject: [PATCH 1/4] tools: fix timeout errors in `lint-nix` job --- tools/nix/pkgs.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/nix/pkgs.nix b/tools/nix/pkgs.nix index 9a8722d9010949..a75b0e8dd45e1e 100644 --- a/tools/nix/pkgs.nix +++ b/tools/nix/pkgs.nix @@ -8,3 +8,14 @@ let }) arg; in nixpkgs +// { + nixfmt-tree = nixpkgs.nixfmt-tree.overrideAttrs (old: { + patches = (old.patches or [ ]) ++ [ + (nixpkgs.fetchpatch2 { + url = "https://github.com/numtide/treefmt/commit/c370339aa3390267eb5b45cc6cb1566aa8cab1b9.patch?full_index=1"; + revert = true; + hash = "sha256-ysGtMvXbaNLuKc4CkrESTxTwCcdoiPNZZWCyailE6co="; + }) + ]; + }); +} From 1607b5e041bf4b83d045e3c00e55cd34f6b7401e Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sun, 15 Mar 2026 17:17:20 +0100 Subject: [PATCH 2/4] fixup! tools: fix timeout errors in `lint-nix` job --- tools/nix/pkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/nix/pkgs.nix b/tools/nix/pkgs.nix index a75b0e8dd45e1e..af43776a626960 100644 --- a/tools/nix/pkgs.nix +++ b/tools/nix/pkgs.nix @@ -12,7 +12,7 @@ nixpkgs nixfmt-tree = nixpkgs.nixfmt-tree.overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ (nixpkgs.fetchpatch2 { - url = "https://github.com/numtide/treefmt/commit/c370339aa3390267eb5b45cc6cb1566aa8cab1b9.patch?full_index=1"; + url = "https://github.com/numtide/treefmt/commits/c370339aa3390267eb5b45cc6cb1566aa8cab1b9.patch?full_index=1"; revert = true; hash = "sha256-ysGtMvXbaNLuKc4CkrESTxTwCcdoiPNZZWCyailE6co="; }) From f51d1f7799a343c1219306b7fa3db0b545d3477e Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sun, 15 Mar 2026 17:29:45 +0100 Subject: [PATCH 3/4] fixup! tools: fix timeout errors in `lint-nix` job --- tools/nix/pkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/nix/pkgs.nix b/tools/nix/pkgs.nix index af43776a626960..a75b0e8dd45e1e 100644 --- a/tools/nix/pkgs.nix +++ b/tools/nix/pkgs.nix @@ -12,7 +12,7 @@ nixpkgs nixfmt-tree = nixpkgs.nixfmt-tree.overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ (nixpkgs.fetchpatch2 { - url = "https://github.com/numtide/treefmt/commits/c370339aa3390267eb5b45cc6cb1566aa8cab1b9.patch?full_index=1"; + url = "https://github.com/numtide/treefmt/commit/c370339aa3390267eb5b45cc6cb1566aa8cab1b9.patch?full_index=1"; revert = true; hash = "sha256-ysGtMvXbaNLuKc4CkrESTxTwCcdoiPNZZWCyailE6co="; }) From f6ca2ebd1f2b4e5af6fbc326e7e7937a43d9efb4 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sun, 15 Mar 2026 17:31:57 +0100 Subject: [PATCH 4/4] fixup! tools: fix timeout errors in `lint-nix` job --- tools/nix/pkgs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/nix/pkgs.nix b/tools/nix/pkgs.nix index a75b0e8dd45e1e..4453e80b892be4 100644 --- a/tools/nix/pkgs.nix +++ b/tools/nix/pkgs.nix @@ -12,9 +12,9 @@ nixpkgs nixfmt-tree = nixpkgs.nixfmt-tree.overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ (nixpkgs.fetchpatch2 { - url = "https://github.com/numtide/treefmt/commit/c370339aa3390267eb5b45cc6cb1566aa8cab1b9.patch?full_index=1"; + url = "https://github.com/numtide/treefmt/commit/b96016b4e38ffc76518087b3b0c9bbfa190d5225.patch?full_index=1"; revert = true; - hash = "sha256-ysGtMvXbaNLuKc4CkrESTxTwCcdoiPNZZWCyailE6co="; + hash = "sha256-DcxT2OGPX6Kmxhqa56DjZsSh2hoyhPyVmE17ULeryv8="; }) ]; });