From a5bdbb895d9c34929a1d7745e615023f30f76fad Mon Sep 17 00:00:00 2001 From: Alexander Biehl Date: Fri, 5 Jun 2020 12:19:51 +0200 Subject: [PATCH] Apply @jonringers suggestions Co-authored-by: Jon --- pkgs/development/python-modules/skein/default.nix | 3 +++ pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index dd98bdddc3a..630c4370a87 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -1,11 +1,13 @@ { buildPythonPackage , callPackage , fetchPypi +, isPy27 , jre , lib , pythonPackages , stdenv }: + let pname = "skein"; version = "0.8.0"; @@ -17,6 +19,7 @@ let in buildPythonPackage rec { inherit pname version src; + disabled = isPy27; propagatedBuildInputs = with pythonPackages; [ cryptography grpcio grpcio-tools jupyter pytest pyyaml requests jre ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d99e2363a1..7021dd612d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6338,7 +6338,7 @@ in { python_statsd = callPackage ../development/python-modules/python_statsd { }; - skein = disabledIf isPy27 (callPackage ../development/python-modules/skein { }); + skein = callPackage ../development/python-modules/skein { }; stompclient = callPackage ../development/python-modules/stompclient { };