Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs

5 files changed, 14 insertions, 51 deletions

diff --git a/nixpkgs/pkgs/applications/file-managers/browsr/default.nix b/nixpkgs/pkgs/applications/file-managers/browsr/default.nix
index b859ab8d7e11..dbf481ed0048 100644
--- a/nixpkgs/pkgs/applications/file-managers/browsr/default.nix
+++ b/nixpkgs/pkgs/applications/file-managers/browsr/default.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "browsr";
-  version = "1.18.0";
+  version = "1.19.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "juftin";
     repo = "browsr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Ygqoz1rNQwhU1/8NsHwQsSCqQ8gYwHEaAuIaVMCtKKA=";
+    hash = "sha256-V5B+/zfUlpF0TMTHqzyjapW93/DoJKgbJkTMX2NZyIQ=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec {
     pandas
     pillow
     pymupdf
+    pyperclip
     rich
     rich-click
     rich-pixels
@@ -75,10 +76,14 @@ python3.pkgs.buildPythonApplication rec {
     "test_github_screenshot"
     "test_github_screenshot_license"
     "test_textual_app_context_path_github"
+    "test_mkdocs_screenshot"
+    # Different output
+    "test_textual_app_context_path"
   ];
 
   meta = with lib; {
     description = "A file explorer in your terminal";
+    mainProgram = "browsr";
     homepage = "https://juftin.com/browsr";
     changelog = "https://github.com/juftin/browsr/releases/tag/${src.rev}";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/applications/file-managers/dfilemanager/default.nix b/nixpkgs/pkgs/applications/file-managers/dfilemanager/default.nix
index 6c5544aded3e..8a30535f646e 100644
--- a/nixpkgs/pkgs/applications/file-managers/dfilemanager/default.nix
+++ b/nixpkgs/pkgs/applications/file-managers/dfilemanager/default.nix
@@ -19,6 +19,7 @@ mkDerivation {
   meta = {
     homepage = "https://github.com/probonopd/dfilemanager";
     description = "File manager written in Qt/C++";
+    mainProgram = "dfm";
     license = lib.licenses.gpl2;
     platforms = lib.platforms.unix;
   };
diff --git a/nixpkgs/pkgs/applications/file-managers/fm/default.nix b/nixpkgs/pkgs/applications/file-managers/fm/default.nix
index 9c13e7f42b96..148d949794f6 100644
--- a/nixpkgs/pkgs/applications/file-managers/fm/default.nix
+++ b/nixpkgs/pkgs/applications/file-managers/fm/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "fm";
-  version = "unstable-2023-07-25";
+  version = "0-unstable-2024-01-03";
 
   src = fetchFromGitHub {
     owner = "euclio";
     repo = "fm";
-    rev = "a0830b5483a48a8b1e40982f20c28dcb5bfe4a6e";
-    hash = "sha256-uso7j+bf6PF5wiTzSJymSxNNfzqXVcJygkfGdzQl4xA=";
+    rev = "f1da116fe703a2c3d5bc9450703ecf1a1f1b4fda";
+    hash = "sha256-fCufqCy5H5Up6V15sOz8SJrixth7OQ7tc4yIymmfq1M=";
   };
 
-  cargoHash = "sha256-3IxpnDYbfLI1VAMgqIE4eSkiT9Z6HcC3K6MH6uqD9Ic=";
+  cargoHash = "sha256-E/mT+e17Qse4aPCY5Tuvih+ZMDnUqwvEBY0N70kciMs=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix b/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix
deleted file mode 100644
index f2bb67292306..000000000000
--- a/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, installShellFiles
-, stdenv
-, darwin
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "joshuto";
-  version = "0.9.6";
-
-  src = fetchFromGitHub {
-    owner = "kamiyaa";
-    repo = "joshuto";
-    rev = "v${version}";
-    hash = "sha256-d2r8xPGnH/299wjEijilgqy3u/xJgtRmwzJdHt0sA+o=";
-  };
-
-  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";
-    changelog = "https://github.com/kamiyaa/joshuto/releases/tag/${src.rev}";
-    license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ figsoda totoroot xrelkd ];
-    mainProgram = "joshuto";
-  };
-}
diff --git a/nixpkgs/pkgs/applications/file-managers/xfe/default.nix b/nixpkgs/pkgs/applications/file-managers/xfe/default.nix
index ffad141bdafa..3853119126d1 100644
--- a/nixpkgs/pkgs/applications/file-managers/xfe/default.nix
+++ b/nixpkgs/pkgs/applications/file-managers/xfe/default.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "xfe";
-  version = "1.46";
+  version = "1.46.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz";
-    sha256 = "sha256-80rtoetmipDObW8BHL2US7305Jo5TFrQrIg6DzLoR/k=";
+    sha256 = "sha256-NTpowZCl4OTWrK2txh7f7t9WxGRdfM0M3KIyHq3nJUg=";
   };
 
   nativeBuildInputs = [ pkg-config intltool ];