From 7ff7f6664328a8ce9f4c5f68f21d63d48247516d Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 6 Jul 2022 18:59:02 +0200 Subject: [PATCH 1/3] ipfs: use passthru for repoVersion The `repoVersion` is only used outside the derivation and not for the build of IPFS itsef. This is exactly the use-case `passthru` was meant for. It allows updating the `repoVersion` without rebuilding IPFS. This may come in handy if someone forgets to update it and it needs to be updated later. --- pkgs/applications/networking/ipfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 68b68a93ba79e..243cf17a8d5fe 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "0.13.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; - repoVersion = "12"; # Also update ipfs-migrator when changing the repo version + passthru.repoVersion = "12"; # Also update ipfs-migrator when changing the repo version # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { From 631a2bddfcef74ba71ddcff9197299723fa73811 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 10 Jul 2022 18:46:58 +0200 Subject: [PATCH 2/3] nixos/tests/ipfs: disable FUSE test The FUSE mount functionality of IPFS was broken by the update to v0.13.0, so disable it. Hopefully it will be fixed soon. See https://github.com/ipfs/kubo/issues/9044. --- nixos/tests/ipfs.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix index 295a7b9c7273f..024822745ada5 100644 --- a/nixos/tests/ipfs.nix +++ b/nixos/tests/ipfs.nix @@ -54,6 +54,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { "echo fnord3 | ipfs --api /ip4/127.0.0.1/tcp/2324 add --quieter" ) - fuse.succeed(f"cat /ipfs/{ipfs_hash.strip()} | grep fnord3") + # The FUSE mount functionality is broken as of v0.13.0. + # See https://github.com/ipfs/kubo/issues/9044. + # fuse.succeed(f"cat /ipfs/{ipfs_hash.strip()} | grep fnord3") ''; }) From c6fa85eff3f68acc4bc3ae3440184216e8d422ff Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 6 Jul 2022 19:20:29 +0200 Subject: [PATCH 3/3] ipfs: 0.13.0 -> 0.13.1 https://github.com/ipfs/go-ipfs/releases/tag/v0.13.1 --- pkgs/applications/networking/ipfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 243cf17a8d5fe..2540c777f16df 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "ipfs"; - version = "0.13.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.13.1"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "12"; # Also update ipfs-migrator when changing the repo version @@ -10,7 +10,7 @@ buildGoModule rec { # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "sha256-eEIHsmtD3vF48RVFHEz28gkVv7u50pMBE8Z+oaM6pLM="; + sha256 = "sha256-kGtqFb4Fxx9mxDqX8YSqnY875sU70pzL2BwWBQg5sTU="; }; # tarball contains multiple files/directories