From ef4c72483cfb39515a25f4b1808daa9ec15419ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jul 2021 09:41:23 +0200 Subject: [PATCH 1/2] python3Packages.confuse: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/confuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index 8f1c1754056a..b5e225fa2a2b 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "confuse"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kvwEUcbiwnMqw2PQ9Z1+pgir3b7QYt2o6Y6ajJhs5GQ="; + sha256 = "sha256-kvvKHHBhESDqciNy4MBxwNNCp195a0veS/A0jqSfAi4="; }; propagatedBuildInputs = [ pyyaml ] ++ lib.optionals isPy27 [ enum34 pathlib ] ; From e329096f480da495469933084943ea0dbfb74700 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jul 2021 09:51:41 +0200 Subject: [PATCH 2/2] python3Packages.confuse: enable tests --- .../python-modules/confuse/default.nix | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index b5e225fa2a2b..2b350be00460 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -1,25 +1,45 @@ { buildPythonPackage , enum34 -, fetchPypi +, fetchFromGitHub +, flit-core , isPy27 , lib , pathlib , pyyaml +, pytestCheckHook }: buildPythonPackage rec { pname = "confuse"; version = "1.5.0"; + format = "flit"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-kvvKHHBhESDqciNy4MBxwNNCp195a0veS/A0jqSfAi4="; + src = fetchFromGitHub { + owner = "beetbox"; + repo = pname; + rev = "v${version}"; + sha256 = "1kvilxhjifvz6ra64jadf9jiwphrah5rcb9ryq0v7w1dywgn4qp7"; }; - propagatedBuildInputs = [ pyyaml ] ++ lib.optionals isPy27 [ enum34 pathlib ] ; + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + pyyaml + ] ++ lib.optionals isPy27 [ + enum34 + pathlib + ] ; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "confuse" ]; meta = with lib; { - description = "Confuse is a configuration library for Python that uses YAML."; + description = "Python configuration library for Python that uses YAML"; homepage = "https://github.com/beetbox/confuse"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ];