diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index 87d83971c706..de4718229797 100644 --- a/nixos/modules/services/network-filesystems/kubo.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -167,7 +167,7 @@ in autoMigrate = lib.mkOption { type = lib.types.bool; default = true; - description = "Whether Kubo should try to run the fs-repo-migration at startup."; + description = "Whether Kubo should try to migrate its filesystem repository automatically."; }; enableGC = lib.mkOption { @@ -330,8 +330,8 @@ in environment.variables.IPFS_PATH = fakeKuboRepo; # https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes - boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 2500000; - boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 2500000; + boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 7500000; + boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 7500000; programs.fuse = lib.mkIf cfg.autoMount { userAllowOther = true; @@ -344,9 +344,6 @@ in createHome = false; uid = config.ids.uids.ipfs; description = "IPFS daemon user"; - packages = [ - pkgs.kubo-migrator - ]; }; }; @@ -377,6 +374,7 @@ in path = [ "/run/wrappers" cfg.package + pkgs.kubo-fs-repo-migrations # Used by 'ipfs repo migrate --to=...' ]; environment.IPFS_PATH = cfg.dataDir; @@ -388,7 +386,7 @@ in rm -vf "$IPFS_PATH/api" '' + lib.optionalString cfg.autoMigrate '' - '${lib.getExe pkgs.kubo-migrator}' -to '${cfg.package.repoVersion}' -y + '${lib.getExe cfg.package}' repo migrate '--to=${cfg.package.repoVersion}' --allow-downgrade '' + '' fi @@ -412,7 +410,7 @@ in serviceConfig = { ExecStart = [ "" - "${cfg.package}/bin/ipfs daemon ${kuboFlags}" + "${lib.getExe cfg.package} daemon ${kuboFlags}" ]; User = cfg.user; Group = cfg.group; diff --git a/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix b/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix index 7496c1ed274c..463a79a43405 100644 --- a/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix +++ b/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix @@ -258,7 +258,8 @@ symlinkJoin { longDescription = '' This package contains all the individual migrations in the bin directory. This is used by fs-repo-migrations and could also be used by Kubo itself - when starting it like this: ipfs daemon --migrate + when starting it like this: `ipfs daemon --migrate` + or when calling `ipfs repo migrate --to=16`. ''; }; } diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix index fc6930a8dfe7..70636ced3a48 100644 --- a/pkgs/by-name/ku/kubo/package.nix +++ b/pkgs/by-name/ku/kubo/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "kubo"; - version = "0.36.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.38.2"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; - passthru.repoVersion = "16"; # Also update kubo-migrator when changing the repo version + passthru.repoVersion = "18"; # 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-JbWt6d1cX3F2lmivjszcxcyE+wKYk+Sy03xhb4E3oHw="; + hash = "sha256-A02edHUZoU2oQk4OyCmc/wMfk3k+EWkdO2RxPGlUrXg="; }; # tarball contains multiple files/directories