Merge pull request #108822 from c00w/cluster_ipfs_2

ipfs-cluster: 0.13.0 -> unstable-2020-10
This commit is contained in:
Sandro 2021-01-09 23:24:32 +01:00 committed by GitHub
commit b9a9f69b58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 9 deletions

View File

@ -2,18 +2,19 @@
buildGoModule rec {
pname = "ipfs-cluster";
version = "0.13.0";
rev = "v${version}";
version = "unstable-2020-10-20";
vendorSha256 = "00fkyxxi4iz16v0j33270x8qrspqpsv9j6csnikjy0klyb038pfq";
vendorSha256 = "0abfhl4v4yqy89aqn13ymj4rw5zhr92a9fh1abgpkr19adnyrs3d";
doCheck = false;
patches = [
./test.patch
];
src = fetchFromGitHub {
owner = "ipfs";
repo = "ipfs-cluster";
inherit rev;
sha256 = "0jf3ngxqkgss5f1kifp5lp3kllb21jxc475ysl01ma8l3smqdvya";
rev = "c78f7839a2d5645806e01bfbf7af862600f8fbc4";
sha256 = "0fschpysma2piy2bfas56yapxm2cl6nj986ww3sp7ysldjzadmkk";
};
meta = with stdenv.lib; {

View File

@ -0,0 +1,12 @@
diff --git a/peer_manager_test.go b/peer_manager_test.go
index 521e754..cf0d777 100644
--- a/peer_manager_test.go
+++ b/peer_manager_test.go
@@ -76,6 +76,7 @@ func clusterAddr(c *Cluster) ma.Multiaddr {
}
func TestClustersPeerAdd(t *testing.T) {
+ t.Skip("test is disabld by nixos")
ctx := context.Background()
clusters, mocks, boot := peerManagerClusters(t)
defer shutdownClusters(t, clusters, mocks)

View File

@ -4973,9 +4973,7 @@ in
ipfs = callPackage ../applications/networking/ipfs { };
ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
ipfs-cluster = callPackage ../applications/networking/ipfs-cluster {
buildGoModule = buildGo114Module;
};
ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { };
ipget = callPackage ../applications/networking/ipget { };