From ca6761aedefc2b5629a3afe0447e30b245e7c5b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Mar 2022 15:54:41 +0000 Subject: [PATCH 1/2] python310Packages.stups-pierone: 1.1.49 -> 1.1.50 --- pkgs/development/python-modules/stups-pierone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix index 4757cd323186..eaf58dc01c88 100644 --- a/pkgs/development/python-modules/stups-pierone/default.nix +++ b/pkgs/development/python-modules/stups-pierone/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "stups-pierone"; - version = "1.1.49"; + version = "1.1.50"; disabled = !isPy3k; src = fetchFromGitHub { owner = "zalando-stups"; repo = "pierone-cli"; rev = version; - sha256 = "1kb1lpnxbcq821mx75vzapndvxfvsdrplyhsqjq4vdhyqrx2dn3q"; + sha256 = "sha256-YAoj+Ou0Q64QRN5R0CQSxQGP7xDQQNISS6VT5txV0sw="; }; propagatedBuildInputs = [ From 02a09c627d8e4bc0b4e1ec9d2cc3c47631bef41a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Mar 2022 10:18:19 +0100 Subject: [PATCH 2/2] python3Packages.stups-pierone: add pythonImportsCheck --- .../python-modules/stups-pierone/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix index eaf58dc01c88..f627f0e7231e 100644 --- a/pkgs/development/python-modules/stups-pierone/default.nix +++ b/pkgs/development/python-modules/stups-pierone/default.nix @@ -7,19 +7,21 @@ , pytest , pytest-cov , hypothesis -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "stups-pierone"; version = "1.1.50"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zalando-stups"; repo = "pierone-cli"; rev = version; - sha256 = "sha256-YAoj+Ou0Q64QRN5R0CQSxQGP7xDQQNISS6VT5txV0sw="; + hash = "sha256-YAoj+Ou0Q64QRN5R0CQSxQGP7xDQQNISS6VT5txV0sw="; }; propagatedBuildInputs = [ @@ -28,9 +30,9 @@ buildPythonPackage rec { stups-zign ]; - preCheck = " + preCheck = '' export HOME=$TEMPDIR - "; + ''; checkInputs = [ pytest @@ -38,10 +40,14 @@ buildPythonPackage rec { hypothesis ]; + pythonImportsCheck = [ + "pierone" + ]; + meta = with lib; { description = "Convenient command line client for STUPS' Pier One Docker registry"; homepage = "https://github.com/zalando-stups/pierone-cli"; license = licenses.asl20; - maintainers = [ maintainers.mschuwalow ]; + maintainers = with maintainers; [ mschuwalow ]; }; }