From 3d9818b9c79690c972469ab1a318c74cf1d89f3c Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 21 Mar 2022 16:49:17 -0700 Subject: [PATCH] Revert "Merge pull request #164677 from lovesegfault/update-cleo" This reverts commit 35e23aa9dca40519cec9a07e327afa50ed6ae540, reversing changes made to a8f938c15c84df4bef8e920fac71cd876188fa9e. --- .../python-modules/cleo/default.nix | 34 +++++++------------ 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index 3307c7d8ff9f..e79983b1bb29 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -1,31 +1,23 @@ -{ lib -, buildPythonPackage -, clikit -, fetchFromGitHub -, poetry-core -, pytestCheckHook -, pytest-mock -}: +{ lib, buildPythonPackage, fetchPypi +, clikit }: buildPythonPackage rec { pname = "cleo"; - version = "1.0.0a4"; - format = "pyproject"; + version = "0.8.1"; - src = fetchFromGitHub { - owner = "sdispater"; - repo = pname; - rev = version; - hash = "sha256-w4WzGK7Q055iPF5wkpVXHoHvwr8ewKDqDUPCdoGhAQ0="; + src = fetchPypi { + inherit pname version; + sha256 = "3d0e22d30117851b45970b6c14aca4ab0b18b1b53c8af57bed13208147e4069f"; }; - propagatedBuildInputs = [ clikit poetry-core ]; + propagatedBuildInputs = [ + clikit + ]; - doCheck = true; - - checkInputs = [ pytestCheckHook pytest-mock ]; - - pythonImportsCheck = [ "cleo" ]; + # The Pypi tarball doesn't include tests, and the GitHub source isn't + # buildable until we bootstrap poetry, see + # https://github.com/NixOS/nixpkgs/pull/53599#discussion_r245855665 + doCheck = false; meta = with lib; { homepage = "https://github.com/sdispater/cleo";