Merge pull request #239046 from figsoda/browsr

pkgs/applications/file-managers/browsr/default.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "browsr";
-  version = "1.10.7";
+  version = "1.11.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "juftin";
     repo = "browsr";
     rev = "v${version}";
-    hash = "sha256-AT5cFQ4CldlHv3MQYAGXdZVB3bNAAvbJeosdxZjcPBM=";
+    hash = "sha256-LhrMQFkvdkYra/6jQtMAooGy76qLYldHoxEGMPhde7Q=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -25,7 +25,6 @@ python3.pkgs.buildPythonApplication rec {
   propagatedBuildInputs = with python3.pkgs; [
     art
     click
-    fsspec
     pandas
     pillow
     pymupdf
@@ -33,35 +32,24 @@ python3.pkgs.buildPythonApplication rec {
     rich-click
     rich-pixels
     textual
-    universal-pathlib
+    textual-universal-directorytree
   ] ++ lib.attrVals extras passthru.optional-dependencies;
 
   passthru.optional-dependencies = with python3.pkgs; {
     all = [
-      adlfs
-      aiohttp
-      gcsfs
-      paramiko
       pyarrow
-      requests
-      s3fs
+      textual-universal-directorytree.optional-dependencies.remote
     ];
     parquet = [
       pyarrow
     ];
     remote = [
-      adlfs
-      aiohttp
-      gcsfs
-      paramiko
-      requests
-      s3fs
+      textual-universal-directorytree.optional-dependencies.remote
     ];
   };
 
   pythonRelaxDeps = [
     "art"
-    "fsspec"
     "pymupdf"
     "rich-click"
     "textual"
@@ -78,8 +66,8 @@ python3.pkgs.buildPythonApplication rec {
 
   meta = with lib; {
     description = "A file explorer in your terminal";
-    homepage = "https://github.com/juftin/browsr";
-    changelog = "https://github.com/fsspec/universal_pathlib/releases/tag/${src.rev}";
+    homepage = "https://juftin.com/browsr";
+    changelog = "https://github.com/juftin/browsr/releases/tag/${src.rev}";
     license = licenses.mit;
     maintainers = with maintainers; [ figsoda ];
   };

pkgs/development/python-modules/textual-universal-directorytree/default.nix

@@ -0,0 +1,56 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, hatchling
+, textual
+, universal-pathlib
+, adlfs
+, aiohttp
+, gcsfs
+, paramiko
+, requests
+, s3fs
+}:
+
+buildPythonPackage rec {
+  pname = "textual-universal-directorytree";
+  version = "1.0.1";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "juftin";
+    repo = "textual-universal-directorytree";
+    rev = "v${version}";
+    hash = "sha256-a7alxVmHTKJnJiU7X6UlUD2y7MY4O5TMR+02KcyPwEs=";
+  };
+
+  nativeBuildInputs = [
+    hatchling
+  ];
+
+  propagatedBuildInputs = [
+    textual
+    universal-pathlib
+  ];
+
+  passthru.optional-dependencies = {
+    remote = [
+      adlfs
+      aiohttp
+      gcsfs
+      paramiko
+      requests
+      s3fs
+    ];
+  };
+
+  pythonImportsCheck = [ "textual_universal_directorytree" ];
+
+  meta = with lib; {
+    description = "Textual plugin for a DirectoryTree compatible with remote filesystems";
+    homepage = "https://github.com/juftin/textual-universal-directorytree";
+    changelog = "https://github.com/juftin/textual-universal-directorytree/releases/tag/${src.rev}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}

pkgs/top-level/python-packages.nix

@@ -12106,6 +12106,8 @@ self: super: with self; {
 
   textual = callPackage ../development/python-modules/textual { };
 
+  textual-universal-directorytree = callPackage ../development/python-modules/textual-universal-directorytree { };
+
   testbook = callPackage ../development/python-modules/testbook { };
 
   testing-common-database = callPackage ../development/python-modules/testing-common-database { };