From 97904031e20e659d946a30be7c30d4bf5020737d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 3 Jun 2024 11:31:13 +0200
Subject: [PATCH 1/2] python312Packages.iterfzf: init at 1.4.0.51.0

Pythonic interface to fzf, a CLI fuzzy finder

https://github.com/dahlia/iterfzf
---
 .../python-modules/iterfzf/default.nix        | 62 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/development/python-modules/iterfzf/default.nix

diff --git a/pkgs/development/python-modules/iterfzf/default.nix b/pkgs/development/python-modules/iterfzf/default.nix
new file mode 100644
index 000000000000..099fad45d53e
--- /dev/null
+++ b/pkgs/development/python-modules/iterfzf/default.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  flit-core,
+  fzf,
+  packaging,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "iterfzf";
+  version = "1.4.0.51.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "dahlia";
+    repo = "iterfzf";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Xjk+r2PdIg+oULA5gfI129p1fNOO8RINNxP+pveiocM=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"' \
+      --replace-fail 'backend-path = ["."]' '# backend-path = ["."]' \
+      --replace-fail 'build-backend = "build_dist"' '# build-backend = "build_dist"'
+
+    substituteInPlace iterfzf/test_iterfzf.py \
+      --replace-fail 'executable="fzf"' 'executable="${fzf}/bin/fzf"'
+  '';
+
+  build-system = [
+    flit-core
+    setuptools
+    packaging
+  ];
+
+  dependencies = [ fzf ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  disabledTests = [
+    # AttributeError
+    "test_no_query"
+    "test_select_one_ambiguous"
+  ];
+
+  pythonImportsCheck = [ "iterfzf" ];
+
+  meta = with lib; {
+    description = "Pythonic interface to fzf, a CLI fuzzy finder";
+    homepage = "https://github.com/dahlia/iterfzf";
+    changelog = "https://github.com/dahlia/iterfzf/releases/tag/${version}";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 061b75dfcffe..d1a65a2e9c53 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5971,6 +5971,8 @@ self: super: with self; {
 
   iterative-telemetry = callPackage ../development/python-modules/iterative-telemetry { };
 
+  iterfzf = callPackage ../development/python-modules/iterfzf { };
+
   iterm2 = callPackage ../development/python-modules/iterm2 { };
 
   itsdangerous = callPackage ../development/python-modules/itsdangerous { };

From 1a9df0630934ff5d56dd6177d469fd82241c18af Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 3 Jun 2024 11:32:11 +0200
Subject: [PATCH 2/2] python312Packages.typer-shell: init at 0.1.9

Library for making beautiful shells/REPLs with Typer

https://github.com/FergusFettes/typer-shell
---
 .../python-modules/typer-shell/default.nix    | 59 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/development/python-modules/typer-shell/default.nix

diff --git a/pkgs/development/python-modules/typer-shell/default.nix b/pkgs/development/python-modules/typer-shell/default.nix
new file mode 100644
index 000000000000..bb195d121fb6
--- /dev/null
+++ b/pkgs/development/python-modules/typer-shell/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  buildPythonPackage,
+  click,
+  click-shell,
+  fetchFromGitHub,
+  iterfzf,
+  poetry-core,
+  pythonRelaxDepsHook,
+  pythonOlder,
+  pyyaml,
+  rich,
+  typer,
+}:
+
+buildPythonPackage rec {
+  pname = "typer-shell";
+  version = "0.1.9";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "FergusFettes";
+    repo = "typer-shell";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-y66Je9E0IWDuGrHtd1D8zP7E0EVfvrF3KOlA2dRFU+s=";
+  };
+
+  pythonRelaxDeps = [
+    "iterfzf"
+    "typer"
+  ];
+
+  build-system = [ poetry-core ];
+
+  nativeBuildInputs = [ pythonRelaxDepsHook ];
+
+  dependencies = [
+    click
+    click-shell
+    iterfzf
+    pyyaml
+    rich
+    typer
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "typer_shell" ];
+
+  meta = with lib; {
+    description = "Library for making beautiful shells/REPLs with Typer";
+    homepage = "https://github.com/FergusFettes/typer-shell";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d1a65a2e9c53..492a12b3047f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15562,6 +15562,8 @@ self: super: with self; {
 
   typer = callPackage ../development/python-modules/typer { };
 
+  typer-shell = callPackage ../development/python-modules/typer-shell { };
+
   type-infer = callPackage ../development/python-modules/type-infer { };
 
   types-aiobotocore = callPackage ../development/python-modules/types-aiobotocore { };