summary refs log tree commit diff
diff options
context:
space:
mode:
authorFabián Heredia Montiel <303897+fabianhjr@users.noreply.github.com>2023-10-12 15:42:59 -0600
committerGitHub <noreply@github.com>2023-10-12 15:42:59 -0600
commitf96d8113b32b2b5cb6a2aeb693541635dccce43c (patch)
treed62b0753c1bd55c174438810c936a76e26f48a14
parent90ee47bc142f0ba835c0efcbc98481c8498f66ba (diff)
parent70c8adce8d3b399d9e6e9b6528d3407588b35db6 (diff)
downloadnixpkgs-f96d8113b32b2b5cb6a2aeb693541635dccce43c.tar
nixpkgs-f96d8113b32b2b5cb6a2aeb693541635dccce43c.tar.gz
nixpkgs-f96d8113b32b2b5cb6a2aeb693541635dccce43c.tar.bz2
nixpkgs-f96d8113b32b2b5cb6a2aeb693541635dccce43c.tar.lz
nixpkgs-f96d8113b32b2b5cb6a2aeb693541635dccce43c.tar.xz
nixpkgs-f96d8113b32b2b5cb6a2aeb693541635dccce43c.tar.zst
nixpkgs-f96d8113b32b2b5cb6a2aeb693541635dccce43c.zip
Merge pull request #259745 from Luflosi/update/kubo
kubo: 0.22.0 -> 0.23.0
-rw-r--r--nixos/modules/services/network-filesystems/kubo.nix2
-rw-r--r--pkgs/applications/networking/kubo/default.nix10
2 files changed, 5 insertions, 7 deletions
diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix
index 5a355f3441d..bc746bed31f 100644
--- a/nixos/modules/services/network-filesystems/kubo.nix
+++ b/nixos/modules/services/network-filesystems/kubo.nix
@@ -203,10 +203,8 @@ in
               default = [
                 "/ip4/0.0.0.0/tcp/4001"
                 "/ip6/::/tcp/4001"
-                "/ip4/0.0.0.0/udp/4001/quic"
                 "/ip4/0.0.0.0/udp/4001/quic-v1"
                 "/ip4/0.0.0.0/udp/4001/quic-v1/webtransport"
-                "/ip6/::/udp/4001/quic"
                 "/ip6/::/udp/4001/quic-v1"
                 "/ip6/::/udp/4001/quic-v1/webtransport"
               ];
diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/applications/networking/kubo/default.nix
index defb898b447..4f57c481cfe 100644
--- a/pkgs/applications/networking/kubo/default.nix
+++ b/pkgs/applications/networking/kubo/default.nix
@@ -6,15 +6,15 @@
 
 buildGoModule rec {
   pname = "kubo";
-  version = "0.22.0"; # When updating, also check if the repo version changed and adjust repoVersion below
+  version = "0.23.0"; # When updating, also check if the repo version changed and adjust repoVersion below
   rev = "v${version}";
 
-  passthru.repoVersion = "14"; # Also update kubo-migrator when changing the repo version
+  passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version
 
   # 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-TX5ZM8Kyj3LZ12Ro7MsHRd+P5XLk/mU7DUxZaopSEV0=";
+    hash = "sha256-ycXn8h8sFGJXVMldneN51lZgXoPaZ/XeXLtqqJ4w6H0=";
   };
 
   # tarball contains multiple files/directories
@@ -37,9 +37,9 @@ buildGoModule rec {
 
   postPatch = ''
     substituteInPlace 'misc/systemd/ipfs.service' \
-      --replace '/usr/bin/ipfs' "$out/bin/ipfs"
+      --replace '/usr/local/bin/ipfs' "$out/bin/ipfs"
     substituteInPlace 'misc/systemd/ipfs-hardened.service' \
-      --replace '/usr/bin/ipfs' "$out/bin/ipfs"
+      --replace '/usr/local/bin/ipfs' "$out/bin/ipfs"
   '';
 
   postInstall = ''