Unverified Commit 203ecda8 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #274321 from Luflosi/update/kubo 

kubo: 0.24.0 -> 0.25.0
parents cbb38bf7 16a8b378

nixos/tests/kubo/default.nix

+3 −1
Original line number Diff line number Diff line 
{ recurseIntoAttrs, runTest }:

recurseIntoAttrs {

  kubo = runTest ./kubo.nix;

  kubo-fuse = runTest ./kubo-fuse.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;

}

nixos/tests/kubo/kubo.nix

+7 −0
Original line number Diff line number Diff line
@@ -46,6 +46,13 @@ 
            f"ipfs --api /unix/run/ipfs.sock cat /ipfs/{ipfs_hash.strip()} | grep fnord2"

        )



    machine.stop_job("ipfs")



    with subtest("Socket activation for the Gateway"):

        machine.succeed(

            f"curl 'http://127.0.0.1:8080/ipfs/{ipfs_hash.strip()}' | grep fnord2"

        )



    with subtest("Setting dataDir works properly with the hardened systemd unit"):

        machine.succeed("test -e /mnt/ipfs/config")

        machine.succeed("test ! -e /var/lib/ipfs/")

pkgs/applications/networking/kubo/default.nix→pkgs/by-name/ku/kubo/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


buildGoModule rec {

  pname = "kubo";

  version = "0.24.0"; # When updating, also check if the repo version changed and adjust repoVersion below

  version = "0.25.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-stSjLvg8G1EiXon3Qby4wLgbhX7Aaj9pnxcvE32/42k=";

    hash = "sha256-+Mk3rDdtjhETmdaOOSXEFdLTJ0nX9G3qUxctsu5vrSc=";

  };



  # tarball contains multiple files/directories

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -9899,8 +9899,6 @@ with pkgs; 














  kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { };



























  kubo = callPackage ../applications/networking/kubo { };



























  kubo-migrator-all-fs-repo-migrations = callPackage ../applications/networking/kubo-migrator/all-migrations.nix { };















  kubo-migrator-unwrapped = callPackage ../applications/networking/kubo-migrator/unwrapped.nix { };















  kubo-migrator = callPackage ../applications/networking/kubo-migrator { };