From 14320729fa22943b392f1c0b8f50fe10f2dd7849 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sun, 5 Oct 2025 11:32:26 +0200
Subject: [PATCH 1/4] ipfs-cluster: use `finalAttrs` pattern

---
 pkgs/by-name/ip/ipfs-cluster/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ip/ipfs-cluster/package.nix b/pkgs/by-name/ip/ipfs-cluster/package.nix
index 4426f45327f3..b675a81965a0 100644
--- a/pkgs/by-name/ip/ipfs-cluster/package.nix
+++ b/pkgs/by-name/ip/ipfs-cluster/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "ipfs-cluster";
   version = "1.1.4";
 
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ipfs-cluster";
     repo = "ipfs-cluster";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-mdLrLiRNudpQ8i0lvwoNAqhSWJ8VMEC1ZRxXHWHpqLY=";
   };
 
@@ -26,4 +26,4 @@ buildGoModule rec {
       jglukasik
     ];
   };
-}
+})

From 0882e1545d34db88b11aeb17f62509f639cdf4bf Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Wed, 8 Oct 2025 14:41:54 +0200
Subject: [PATCH 2/4] ipfs-cluster: fix tests on Darwin with "sandbox = true"

---
 pkgs/by-name/ip/ipfs-cluster/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ip/ipfs-cluster/package.nix b/pkgs/by-name/ip/ipfs-cluster/package.nix
index b675a81965a0..6f27475f944d 100644
--- a/pkgs/by-name/ip/ipfs-cluster/package.nix
+++ b/pkgs/by-name/ip/ipfs-cluster/package.nix
@@ -17,6 +17,8 @@ buildGoModule (finalAttrs: {
     hash = "sha256-mdLrLiRNudpQ8i0lvwoNAqhSWJ8VMEC1ZRxXHWHpqLY=";
   };
 
+  __darwinAllowLocalNetworking = true; # required for tests
+
   meta = with lib; {
     description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons";
     homepage = "https://ipfscluster.io";

From d4cc3846abdbf06cac7cf91226defe097d123fe9 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sun, 5 Oct 2025 11:32:49 +0200
Subject: [PATCH 3/4] ipfs-cluster: fix build

Compile ipfs-cluster with Go 1.24 instead of Go 1.25 because:
- Their CI uses Go 1.24, see https://github.com/ipfs-cluster/ipfs-cluster/blob/v1.1.4/.github/workflows/tests.yml#L10
- ipfs-cluster fails to compile with Go 1.25:
  ```
  Building subPackage .
  Building subPackage ./adder
  Building subPackage ./adder/adderutils
  Building subPackage ./adder/ipfsadd
  Building subPackage ./adder/sharding
  Building subPackage ./adder/single
  Building subPackage ./allocator/balanced
  Building subPackage ./api
  Building subPackage ./api/common
  Building subPackage ./api/common/test
  Building subPackage ./api/ipfsproxy
  Building subPackage ./api/pb
  Building subPackage ./api/pinsvcapi
  Building subPackage ./api/pinsvcapi/pinsvc
  Building subPackage ./api/rest
  Building subPackage ./api/rest/client
  Building subPackage ./cmd/ipfs-cluster-ctl
  Building subPackage ./cmd/ipfs-cluster-follow
  # github.com/cockroachdb/swiss
  vendor/github.com/cockroachdb/swiss/map.go:286:7: undefined: hashFn
  vendor/github.com/cockroachdb/swiss/map.go:337:14: undefined: getRuntimeHasher
  vendor/github.com/cockroachdb/swiss/map.go:338:22: undefined: fastrand64
  vendor/github.com/cockroachdb/swiss/map.go:600:23: undefined: fastrand64
  vendor/github.com/cockroachdb/swiss/map.go:649:19: undefined: fastrand64
  vendor/github.com/cockroachdb/swiss/map.go:670:20: undefined: fastrand64
  vendor/github.com/cockroachdb/swiss/options.go:30:14: undefined: hashFn
  ```
---
 pkgs/by-name/ip/ipfs-cluster/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ip/ipfs-cluster/package.nix b/pkgs/by-name/ip/ipfs-cluster/package.nix
index 6f27475f944d..a9798cb3469a 100644
--- a/pkgs/by-name/ip/ipfs-cluster/package.nix
+++ b/pkgs/by-name/ip/ipfs-cluster/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  buildGoModule,
+  buildGo124Module,
   fetchFromGitHub,
 }:
 
-buildGoModule (finalAttrs: {
+buildGo124Module (finalAttrs: {
   pname = "ipfs-cluster";
   version = "1.1.4";
 

From cabae239bc369cd0bcf62e36e972d44a8257face Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sun, 5 Oct 2025 22:50:27 +0200
Subject: [PATCH 4/4] ipfs-cluster: skip flaky test

---
 pkgs/by-name/ip/ipfs-cluster/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/ip/ipfs-cluster/package.nix b/pkgs/by-name/ip/ipfs-cluster/package.nix
index a9798cb3469a..c4c0f6b7407e 100644
--- a/pkgs/by-name/ip/ipfs-cluster/package.nix
+++ b/pkgs/by-name/ip/ipfs-cluster/package.nix
@@ -17,6 +17,18 @@ buildGo124Module (finalAttrs: {
     hash = "sha256-mdLrLiRNudpQ8i0lvwoNAqhSWJ8VMEC1ZRxXHWHpqLY=";
   };
 
+  checkFlags =
+    let
+      skippedTests = [
+        # Flaky test, sometimes fails with:
+        # --- FAIL: TestClustersPeerAddInUnhealthyCluster (7.58s)
+        #     peer_manager_test.go:247: failed to dial: failed to dial QmSookyjcPhxchnHeo2jtssHqe8zdmhgEQiY61yUcWjWp5: all dials failed
+        #           * [/ip4/127.0.0.1/tcp/46571] dial backoff
+        "TestClustersPeerAddInUnhealthyCluster"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
   __darwinAllowLocalNetworking = true; # required for tests
 
   meta = with lib; {