Unverified Commit 14ef1caa authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

kubo: 0.36.0 -> 0.38.2 (#454562)

parents 959cb320 b8f0ee5c

nixos/modules/services/network-filesystems/kubo.nix

+6 −8
Original line number Diff line number Diff line
@@ -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;

pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix

+2 −1
Original line number Diff line number Diff line
@@ -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`.

    '';

  };

}

pkgs/by-name/ku/kubo/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -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