Merge https://github.com/NixOS/nixpkgs

8 files changed, 55 insertions, 40 deletions

diff --git a/nixpkgs/pkgs/applications/file-managers/clex/default.nix b/nixpkgs/pkgs/applications/file-managers/clex/default.nix
index a2ac0df9801d..507da73bbc53 100644
--- a/nixpkgs/pkgs/applications/file-managers/clex/default.nix
+++ b/nixpkgs/pkgs/applications/file-managers/clex/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "clex";
-  version = "4.6.patch10";
+  version = "4.7";
 
   src = fetchurl {
-    sha256 = "03niihqk57px7rm2c84qira5jm5vw8lj5s58dximk0w5gsis4fhw";
-    url = "${meta.homepage}/download/${pname}-${version}.tar.gz";
+    url = "https://github.com/xitop/clex/releases/download/v${version}/clex-${version}.tar.gz";
+    hash = "sha256-3Y3ayJEy9pHLTUSeXYeekTVdopwKLZ8vVcVarLIFnpM=";
   };
 
   buildInputs = [ ncurses ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       to be executed by the shell. There are no built-in commands, CLEX is an
       add-on to your favorite shell.
     '';
-    homepage = "http://www.clex.sk";
+    homepage = "https://github.com/xitop/clex";
     license = licenses.gpl2Plus;
     platforms = with platforms; linux ++ darwin;
   };
diff --git a/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix b/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix
index 04491de0fd9f..b6166f2586d4 100644
--- a/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix
+++ b/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "felix";
-  version = "2.10.1";
+  version = "2.10.2";
 
   src = fetchFromGitHub {
     owner = "kyoheiu";
     repo = "felix";
     rev = "v${version}";
-    hash = "sha256-pDJW/QhkJtEAq7xusYn/t/pPizT77OYmlbVlF/RTXic=";
+    hash = "sha256-vDQHOv6ejp2aOQY0s80mC7x5sG6wB1/98/taw7aYEnE=";
   };
 
-  cargoHash = "sha256-AGQt06fMXuyOEmQIEiUCzuK1Atx3gQMUCB+hPWlrldk=";
+  cargoHash = "sha256-xy/h2O7aTURt4t8sNRASLhMYtceQrZnOynwhfhaecDA=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix b/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix
index 937991ede40b..f2bb67292306 100644
--- a/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix
+++ b/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix
@@ -1,22 +1,37 @@
-{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }:
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, installShellFiles
+, stdenv
+, darwin
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "joshuto";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "kamiyaa";
     repo = "joshuto";
     rev = "v${version}";
-    hash = "sha256-b13CLfWidqfYhHC9wY84kd3elsjWGxBMGr5GXHzUhfs=";
+    hash = "sha256-d2r8xPGnH/299wjEijilgqy3u/xJgtRmwzJdHt0sA+o=";
   };
 
-  cargoHash = "sha256-gMX8hvt20V4XUd0nnXGA4fyOUfB7ZY1eeme9HgYopL0=";
+  cargoHash = "sha256-amgqoL7NYfl3WzTtgvDoBX46rsL9248rbCis6MHVQhE=";
+
+  nativeBuildInputs = [ installShellFiles ];
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Foundation
   ];
 
+  postInstall = ''
+    installShellCompletion --cmd joshuto \
+      --bash <($out/bin/joshuto completions bash) \
+      --zsh <($out/bin/joshuto completions zsh) \
+      --fish <($out/bin/joshuto completions fish)
+  '';
+
   meta = with lib; {
     description = "Ranger-like terminal file manager written in Rust";
     homepage = "https://github.com/kamiyaa/joshuto";
diff --git a/nixpkgs/pkgs/applications/file-managers/krusader/compat-fix.patch b/nixpkgs/pkgs/applications/file-managers/krusader/compat-fix.patch
new file mode 100644
index 000000000000..5411982b97ba
--- /dev/null
+++ b/nixpkgs/pkgs/applications/file-managers/krusader/compat-fix.patch
@@ -0,0 +1,20 @@
+diff --git a/app/compat.h b/app/compat.h
+index b63d561..c051f35 100644
+--- a/app/compat.h
++++ b/app/compat.h
+@@ -11,13 +11,13 @@
+ 
+ #if __has_include(<KCompletion/kcompletion_version.h>)
+ #  include <KCompletion/kcompletion_version.h>
+-#else // Pre KF-5.91 header layout
++#elif __has_include(<kcompletion_version.h>) // Pre KF-5.91 header layout
+ #  include <kcompletion_version.h>
+ #endif
+ 
+ #if __has_include(<KArchive/karchive_version.h>)
+ #  include <KArchive/karchive_version.h>
+-#else // Pre KF-5.91 header layout
++#elif __has_include(<karchive_version.h>) // Pre KF-5.91 header layout
+ #  include <karchive_version.h>
+ #endif
+ 
diff --git a/nixpkgs/pkgs/applications/file-managers/krusader/default.nix b/nixpkgs/pkgs/applications/file-managers/krusader/default.nix
index b2639fe84984..ec7e47f896c6 100644
--- a/nixpkgs/pkgs/applications/file-managers/krusader/default.nix
+++ b/nixpkgs/pkgs/applications/file-managers/krusader/default.nix
@@ -15,13 +15,18 @@
 
 mkDerivation rec {
   pname = "krusader";
-  version = "2.7.2";
+  version = "2.8.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-QaOaQ7PELdHR7K6obfMMr/agYf7MHWb2CFmyo8qXYQk=";
+    hash = "sha256-jkzwWpMYsLwbCUGBG5iLLyuwwEoNHjeZghKpGQzywpo=";
   };
 
+  patches = [
+    # Fix compilation error due to forceful header include
+    ./compat-fix.patch
+  ];
+
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
diff --git a/nixpkgs/pkgs/applications/file-managers/nimmm/default.nix b/nixpkgs/pkgs/applications/file-managers/nimmm/default.nix
deleted file mode 100644
index 0e0d75ab8012..000000000000
--- a/nixpkgs/pkgs/applications/file-managers/nimmm/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, nimPackages, fetchFromGitHub, nim, termbox, pcre }:
-
-nimPackages.buildNimPackage rec {
-  pname = "nimmm";
-  version = "0.2.0";
-  nimBinOnly = true;
-
-  src = fetchFromGitHub {
-    owner = "joachimschmidt557";
-    repo = "nimmm";
-    rev = "v${version}";
-    sha256 = "168n61avphbxsxfq8qzcnlqx6wgvz5yrjvs14g25cg3k46hj4xqg";
-  };
-
-  buildInputs = [ termbox pcre ]
-    ++ (with nimPackages; [ noise nimbox lscolors ]);
-
-  meta = with lib; {
-    description = "Terminal file manager written in nim";
-    homepage = "https://github.com/joachimschmidt557/nimmm";
-    license = licenses.gpl3;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.joachimschmidt557 ];
-  };
-}
diff --git a/nixpkgs/pkgs/applications/file-managers/nnn/default.nix b/nixpkgs/pkgs/applications/file-managers/nnn/default.nix
index af4064abbec1..4e08dc0543e9 100644
--- a/nixpkgs/pkgs/applications/file-managers/nnn/default.nix
+++ b/nixpkgs/pkgs/applications/file-managers/nnn/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/jarun/nnn/blob/v${version}/CHANGELOG";
     license = licenses.bsd2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ jfrankenau Br1ght0ne ];
+    maintainers = with maintainers; [ Br1ght0ne ];
     mainProgram = "nnn";
   };
 })
diff --git a/nixpkgs/pkgs/applications/file-managers/noice/default.nix b/nixpkgs/pkgs/applications/file-managers/noice/default.nix
index e67346c51715..25e93ace7c04 100644
--- a/nixpkgs/pkgs/applications/file-managers/noice/default.nix
+++ b/nixpkgs/pkgs/applications/file-managers/noice/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     homepage = "https://git.2f30.org/noice/";
     license = licenses.bsd2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ jfrankenau ];
+    maintainers = with maintainers; [ iogamaster ];
   };
 }