From a4022a6f9f4bfc56392666a60ab11bfdbcff5625 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 16 Feb 2022 20:53:57 +0100 Subject: [PATCH] ipfs-cluster: 0.14.4 -> 0.14.5 https://github.com/ipfs/ipfs-cluster/releases/tag/v0.14.5 The patch removes a flaky test, see https://github.com/ipfs/ipfs-cluster/issues/1586. Also build ipfs-cluster with Go 1.17 as it builds fine and upstream is even using that version. --- .../networking/ipfs-cluster/default.nix | 17 +++++++++++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index d66efa86a7f9..de4bb988d768 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,18 +1,27 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "ipfs-cluster"; - version = "0.14.4"; + version = "0.14.5"; - vendorSha256 = "sha256-4j6aPs17YNXyPIRr5NshAPYIfNM08GlYV13jnGtJzQc="; + vendorSha256 = "sha256-ykUjq7Svp3+kUNnFkwsBlC+C4nws6Yvu3bk2Wb4c8vY="; src = fetchFromGitHub { owner = "ipfs"; repo = "ipfs-cluster"; rev = "v${version}"; - sha256 = "sha256-82t3sHMKZiV6sYnW72N94qfRZ/aMkavj+hiAyg5viHQ="; + sha256 = "sha256-Xb7QbBmCJKgokxvdbtWxtnNIS/iUsYFLlRzgfoABAq8="; }; + # Remove patch when updating to >0.14.5 + patches = [ + (fetchpatch { + name = "remove-distribution-test.patch"; + url = "https://github.com/ipfs/ipfs-cluster/pull/1589/commits/49825d1df76f848806f1d76abce5e279221cc8c5.patch"; + sha256 = "sha256-mM2rc4ai/qhbvxnoRw5jO7BTRlD2/Tp037EuqqS49DE="; + }) + ]; + meta = with lib; { description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons"; homepage = "https://cluster.ipfs.io/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c243f738b80..50a74c281e33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6726,9 +6726,7 @@ with pkgs; ipfs = callPackage ../applications/networking/ipfs { buildGoModule = buildGo116Module; }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { - buildGoModule = buildGo116Module; - }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; ipfs-migrator-all-fs-repo-migrations = callPackage ../applications/networking/ipfs-migrator/all-migrations.nix { buildGoModule = buildGo116Module;