From 292a1850725e3b8083fde4df14a08f3a542f3338 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 9 Oct 2023 23:24:20 +0300
Subject: [PATCH 1/2] krfzf-py: init at 0.0.6

---
 .../python-modules/krfzf-py/default.nix       | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/krfzf-py/default.nix

diff --git a/pkgs/development/python-modules/krfzf-py/default.nix b/pkgs/development/python-modules/krfzf-py/default.nix
new file mode 100644
index 000000000000..d55334d21e8c
--- /dev/null
+++ b/pkgs/development/python-modules/krfzf-py/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, poetry-core
+}:
+
+buildPythonPackage rec {
+  pname = "krfzf-py";
+  version = "0.0.6";
+  format = "pyproject";
+
+  src = fetchPypi {
+    pname = "krfzf_py";
+    inherit version;
+    hash = "sha256-/M9Atu9MLAGmnEdx6tknMJAit2o4Xt971uQ7pb0CBCk=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  pythonImportsCheck = [ "fzf" ];
+
+  meta = with lib; {
+    description = "A Pythonic Fzf Wrapper";
+    downloadPage = "https://github.com/justfoolingaround/fzf.py";
+    homepage = "https://pypi.org/project/krfzf-py/";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ doronbehar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8768daa8771e..969df304e184 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5930,6 +5930,8 @@ self: super: with self; {
 
   krakenex = callPackage ../development/python-modules/krakenex { };
 
+  krfzf-py = callPackage ../development/python-modules/krfzf-py { };
+
   kubernetes = callPackage ../development/python-modules/kubernetes { };
 
   l18n = callPackage ../development/python-modules/l18n { };

From a62003e729fa81ad3f9ff84d8929cb99d8b72f6e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 9 Oct 2023 23:14:19 +0300
Subject: [PATCH 2/2] mov-cli: unstable-2022-06-30 -> 1.5.4

Add mpv dependency, and more dependencies.
---
 pkgs/applications/video/mov-cli/default.nix | 26 ++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/video/mov-cli/default.nix b/pkgs/applications/video/mov-cli/default.nix
index 35789cb395f3..23954a05c5aa 100644
--- a/pkgs/applications/video/mov-cli/default.nix
+++ b/pkgs/applications/video/mov-cli/default.nix
@@ -1,24 +1,34 @@
 { lib
 , python3
 , fetchFromGitHub
+, mpv
 }:
 
 python3.pkgs.buildPythonPackage rec {
   pname = "mov-cli";
-  version = "unstable-2022-06-30";
+  version = "1.5.4";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "mov-cli";
     repo = "mov-cli";
-    rev = "b89e807e8ffc830b0b18c8e98712441c03774b8e";
-    sha256 = "sha256-D+OeXcLdkbG4ASbPQYIWf7J1CRZ9jH3UXxfTL4WleY0=";
+    rev = version;
+    sha256 = "sha256-WhoP4FcoO9+O9rfpC3oDQkVIpVOqxfdLRygHgf1O01g=";
   };
+  makeWrapperArgs = [
+    "--prefix" "PATH" ":" "${lib.getBin mpv}/bin"
+  ];
 
-  propagatedBuildInputs = with python3.pkgs; [ setuptools httpx click beautifulsoup4 colorama ];
-
-  postPatch = ''
-    substituteInPlace setup.py --replace "bs4" "beautifulsoup4"
-  '';
+  propagatedBuildInputs = with python3.pkgs; [
+    poetry-core
+    krfzf-py
+    pycrypto
+    setuptools
+    httpx
+    click
+    beautifulsoup4
+    colorama
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/mov-cli/mov-cli";