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"; 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 cc66fb626104..133136237184 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5980,6 +5980,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 { };