From 4285acb8c7395f3550431202911f161c90460aee Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 21 Jun 2023 16:04:20 -0400 Subject: [PATCH 1/2] python310Packages.textual-universal-directorytree: init at 1.0.1 https://github.com/juftin/textual-universal-directorytree --- .../default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/textual-universal-directorytree/default.nix diff --git a/pkgs/development/python-modules/textual-universal-directorytree/default.nix b/pkgs/development/python-modules/textual-universal-directorytree/default.nix new file mode 100644 index 000000000000..9224f06511b9 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e1fa34835e11..0d92b4fcb793 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12104,6 +12104,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 { }; From 8200b973b5a5a743b664fd88f15b722a637fdde1 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 21 Jun 2023 16:04:49 -0400 Subject: [PATCH 2/2] browsr: 1.10.7 -> 1.11.0 Diff: https://github.com/juftin/browsr/compare/v1.10.7...v1.11.0 Changelog: https://github.com/juftin/browsr/releases/tag/v1.11.0 --- .../file-managers/browsr/default.nix | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/file-managers/browsr/default.nix b/pkgs/applications/file-managers/browsr/default.nix index 97b14563c97e..e5ee64c28a6a 100644 --- a/pkgs/applications/file-managers/browsr/default.nix +++ b/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 ]; };