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

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix

5 files changed, 50 insertions, 5 deletions

diff --git a/nixpkgs/pkgs/applications/file-managers/browsr/default.nix b/nixpkgs/pkgs/applications/file-managers/browsr/default.nix
index 178b7c7b5a82..4c1beee35258 100644
--- a/nixpkgs/pkgs/applications/file-managers/browsr/default.nix
+++ b/nixpkgs/pkgs/applications/file-managers/browsr/default.nix
@@ -70,5 +70,6 @@ python3.pkgs.buildPythonApplication rec {
     changelog = "https://github.com/juftin/browsr/releases/tag/${src.rev}";
     license = licenses.mit;
     maintainers = with maintainers; [ figsoda ];
+    broken = versionAtLeast python3.pkgs.pandas.version "2" || versionAtLeast python3.pkgs.pillow.version "10";
   };
 }
diff --git a/nixpkgs/pkgs/applications/file-managers/fm/default.nix b/nixpkgs/pkgs/applications/file-managers/fm/default.nix
new file mode 100644
index 000000000000..9c13e7f42b96
--- /dev/null
+++ b/nixpkgs/pkgs/applications/file-managers/fm/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, wrapGAppsHook4
+, libadwaita
+, libpanel
+, gtksourceview5
+, poppler
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "fm";
+  version = "unstable-2023-07-25";
+
+  src = fetchFromGitHub {
+    owner = "euclio";
+    repo = "fm";
+    rev = "a0830b5483a48a8b1e40982f20c28dcb5bfe4a6e";
+    hash = "sha256-uso7j+bf6PF5wiTzSJymSxNNfzqXVcJygkfGdzQl4xA=";
+  };
+
+  cargoHash = "sha256-3IxpnDYbfLI1VAMgqIE4eSkiT9Z6HcC3K6MH6uqD9Ic=";
+
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    libadwaita
+    libpanel
+    gtksourceview5
+    poppler
+  ];
+
+  meta = with lib; {
+    description = "Small, general purpose file manager built with GTK4";
+    homepage = "https://github.com/euclio/fm";
+    license = licenses.mit;
+    maintainers = with maintainers; [ aleksana ];
+    mainProgram = "fm";
+    platforms = platforms.unix;
+  };
+}
diff --git a/nixpkgs/pkgs/applications/file-managers/krusader/default.nix b/nixpkgs/pkgs/applications/file-managers/krusader/default.nix
index a8635a416396..b2639fe84984 100644
--- a/nixpkgs/pkgs/applications/file-managers/krusader/default.nix
+++ b/nixpkgs/pkgs/applications/file-managers/krusader/default.nix
@@ -42,7 +42,7 @@ mkDerivation rec {
     homepage = "http://www.krusader.org";
     description = "Norton/Total Commander clone for KDE";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ sander turion ];
+    maintainers = with maintainers; [ sander ];
     mainProgram = "krusader";
   };
 }
diff --git a/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix
index 0fcfa61907a7..ef28d8cea340 100644
--- a/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix
+++ b/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix
@@ -49,7 +49,6 @@ python3.pkgs.buildPythonApplication rec {
   buildInputs = [
     glib
     gtk3
-    gobject-introspection
     libhandy
     librsvg
   ];
diff --git a/nixpkgs/pkgs/applications/file-managers/xplr/default.nix b/nixpkgs/pkgs/applications/file-managers/xplr/default.nix
index ba0dd5a18e06..4885783abaca 100644
--- a/nixpkgs/pkgs/applications/file-managers/xplr/default.nix
+++ b/nixpkgs/pkgs/applications/file-managers/xplr/default.nix
@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "xplr";
-  version = "0.21.2";
+  version = "0.21.3";
 
   src = fetchFromGitHub {
     owner = "sayanarijit";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-MCOkl95X5YZTAC0VHtSY5xWf1R3987cxepSM7na+LdA=";
+    sha256 = "sha256-lqFhLCOLiuSQWhbcZUEj2xFRlZ+x1ZTVc8IJw7tJjhE=";
   };
 
   buildInputs = lib.optional stdenv.isDarwin libiconv;
 
-  cargoHash = "sha256-1uAnIuxDDv3Z/fMs2Cu/aFWrnugGcEKlNjhILqDpOMI=";
+  cargoHash = "sha256-3hrpg2cMvIuFy6mH1/1igIpU4nbzFQLCAhiIRZbTuaI=";
 
   checkFlags = [
     # failure: path::tests::test_relative_to_parent