diff options
author | Luflosi <luflosi@luflosi.de> | 2024-06-11 15:43:57 +0200 |
---|---|---|
committer | Luflosi <luflosi@luflosi.de> | 2024-06-11 15:47:09 +0200 |
commit | 4f8d1589862f36a8b5710ff7eb8216f587b235e9 (patch) | |
tree | 1dac7429dfcd86ca44a67d6eb9ed7f0fed69ccab | |
parent | 8f5f49d8ad22689611fcbb62b1a79124a35cf67d (diff) |
kubo: 0.28.0 -> 0.29.0
https://github.com/ipfs/kubo/releases/tag/v0.29.0 The FUSE mount functionality is no longer completely broken, so reenable the NixOS test.
-rw-r--r-- | nixos/tests/kubo/default.nix | 4 | ||||
-rw-r--r-- | nixos/tests/kubo/kubo-fuse.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/ku/kubo/package.nix | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/nixos/tests/kubo/default.nix b/nixos/tests/kubo/default.nix index d8c0c69dc1fbd..629922fc366db 100644 --- a/nixos/tests/kubo/default.nix +++ b/nixos/tests/kubo/default.nix @@ -1,7 +1,5 @@ { recurseIntoAttrs, runTest }: recurseIntoAttrs { kubo = runTest ./kubo.nix; - # The FUSE functionality is completely broken since Kubo v0.24.0 - # See https://github.com/ipfs/kubo/issues/10242 - # kubo-fuse = runTest ./kubo-fuse.nix; + kubo-fuse = runTest ./kubo-fuse.nix; } diff --git a/nixos/tests/kubo/kubo-fuse.nix b/nixos/tests/kubo/kubo-fuse.nix index 71a5bf61649f6..c8c273fc0dfc7 100644 --- a/nixos/tests/kubo/kubo-fuse.nix +++ b/nixos/tests/kubo/kubo-fuse.nix @@ -23,7 +23,7 @@ with subtest("FUSE mountpoint"): machine.fail("echo a | su bob -l -c 'ipfs add --quieter'") - # The FUSE mount functionality is broken as of v0.13.0 and v0.17.0. + # The FUSE mount functionality is broken as of v0.13.0. This is still the case with v0.29.0. # See https://github.com/ipfs/kubo/issues/9044. # Workaround: using CID Version 1 avoids that. ipfs_hash = machine.succeed( diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix index fde2afa89c831..9b0163a1ae601 100644 --- a/pkgs/by-name/ku/kubo/package.nix +++ b/pkgs/by-name/ku/kubo/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.28.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.29.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version @@ -15,7 +15,7 @@ buildGoModule rec { # Kubo makes changes to its source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-nq9NpbK9Fql0o1TG8p9lIlnKUnxvMMimz8AYKVozkwY="; + hash = "sha256-udCVyA3NN3RCmVtdIjccfy/RymvrsGJoxlF8DiapP4g="; }; # tarball contains multiple files/directories @@ -41,9 +41,9 @@ buildGoModule rec { postPatch = '' substituteInPlace 'misc/systemd/ipfs.service' \ - --replace '/usr/local/bin/ipfs' "$out/bin/ipfs" + --replace-fail '/usr/local/bin/ipfs' "$out/bin/ipfs" substituteInPlace 'misc/systemd/ipfs-hardened.service' \ - --replace '/usr/local/bin/ipfs' "$out/bin/ipfs" + --replace-fail '/usr/local/bin/ipfs' "$out/bin/ipfs" ''; postInstall = '' |