Merge remote-tracking branch 'origin/master' into staging-next

4 files changed, 11 insertions, 20 deletions

diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix
index 9a76be5704af9..ebdb19ee5b770 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "ipfs-cluster";
-  version = "1.1.0";
+  version = "1.1.1";
 
-  vendorHash = "sha256-U7zh0MmuDmKQWa4uyoFDctPUfq+52Im6t2TFyWIGXAs=";
+  vendorHash = "sha256-pCp2ox08wWUdAnqBqoiMLy/qBQg1PsNnMl8nLCNifC8=";
 
   src = fetchFromGitHub {
     owner = "ipfs-cluster";
     repo = "ipfs-cluster";
     rev = "v${version}";
-    hash = "sha256-z08LLJ/SI833wMpZJ25WDrc66Y4R5i2uGlE7Nc30Kk0=";
+    hash = "sha256-FnofI7IpG0hA9/60cILbQ7xnGKJ2zdYk/pRZPTyOmzA=";
   };
 
   meta = with lib; {
diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix
index 0536fa2fdea61..b9cd8e47d9383 100644
--- a/pkgs/applications/networking/ktailctl/default.nix
+++ b/pkgs/applications/networking/ktailctl/default.nix
@@ -23,13 +23,13 @@
 }:
 
 let
-  version = "0.16.1";
+  version = "0.16.2";
 
   src = fetchFromGitHub {
     owner = "f-koehler";
     repo = "KTailctl";
     rev = "v${version}";
-    hash = "sha256-rMvFwWTrYWZUAMWd6H/SXE26q5ASjwsa8bD1tFC6yBI=";
+    hash = "sha256-rnuh0+i6W9ipSM61MXd9dTlIkdGUHMjtvElW/4S2YCg=";
   };
 
   goDeps = (buildGoModule {
@@ -43,11 +43,6 @@ stdenv.mkDerivation {
   pname = "ktailctl";
   inherit version src;
 
-  patches = [
-    # Install libktailctl_config.so https://github.com/f-koehler/KTailctl/pull/212
-    ./install-missing-libraries.diff
-  ];
-
   postPatch = ''
     cp -r --reflink=auto ${goDeps} src/wrapper/vendor
   '';
diff --git a/pkgs/applications/networking/ktailctl/install-missing-libraries.diff b/pkgs/applications/networking/ktailctl/install-missing-libraries.diff
deleted file mode 100644
index 6153199a66638..0000000000000
--- a/pkgs/applications/networking/ktailctl/install-missing-libraries.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
-index ed0a64a..970e509 100644
---- a/src/config/CMakeLists.txt
-+++ b/src/config/CMakeLists.txt
-@@ -7,3 +7,4 @@ target_link_libraries(ktailctl_config
-     KF6::ConfigGui
-     ktailctl_wrapper
- )
-+install(TARGETS ktailctl_config)
diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix
index bc3989f1ee67c..52ef3f7350015 100644
--- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix
+++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix
@@ -13,9 +13,10 @@
 , pkg-config
 , xmlrpc_c
 , zlib
+, nixosTests
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "rakshasa-rtorrent";
   version = "0.9.8+date=2022-06-20";
 
@@ -53,6 +54,10 @@ stdenv.mkDerivation rec {
     "--with-posix-fallocate"
   ];
 
+  passthru.tests = {
+    inherit (nixosTests) rtorrent;
+  };
+
   enableParallelBuilding = true;
 
   postInstall = ''