From e19fe85e84db636ab12a86f11571370825872360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rasmus=20Pr=C3=A9centh?= Date: Sat, 20 Nov 2021 20:45:15 +0100 Subject: [PATCH 1/2] python3Packages.envisage: disable tests of broken optional feature --- pkgs/development/python-modules/envisage/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix index 20051804328b..153d43aed8ef 100644 --- a/pkgs/development/python-modules/envisage/default.nix +++ b/pkgs/development/python-modules/envisage/default.nix @@ -1,7 +1,7 @@ { lib, fetchPypi, isPy27 , buildPythonPackage , traits, apptools, pytestCheckHook -, ipykernel, ipython, setuptools +, ipython, setuptools }: buildPythonPackage rec { @@ -15,6 +15,8 @@ buildPythonPackage rec { sha256 = "8864c29aa344f7ac26eeb94788798f2d0cc791dcf95c632da8d79ebc580e114c"; }; + # for the optional dependency ipykernel, only versions < 6 are + # supported, so it's not included in the tests, and not propagated propagatedBuildInputs = [ traits apptools setuptools ]; preCheck = '' @@ -22,7 +24,7 @@ buildPythonPackage rec { ''; checkInputs = [ - ipykernel ipython pytestCheckHook + ipython pytestCheckHook ]; meta = with lib; { From 42a83770be09b3ac21b18da6d03c95c8a3398ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rasmus=20Pr=C3=A9centh?= Date: Sat, 20 Nov 2021 20:54:45 +0100 Subject: [PATCH 2/2] python3Packages.envisage: format default.nix --- .../python-modules/envisage/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix index 153d43aed8ef..b8513fd1d9ae 100644 --- a/pkgs/development/python-modules/envisage/default.nix +++ b/pkgs/development/python-modules/envisage/default.nix @@ -1,7 +1,12 @@ -{ lib, fetchPypi, isPy27 +{ lib +, fetchPypi +, isPy27 , buildPythonPackage -, traits, apptools, pytestCheckHook -, ipython, setuptools +, traits +, apptools +, pytestCheckHook +, ipython +, setuptools }: buildPythonPackage rec { @@ -24,7 +29,8 @@ buildPythonPackage rec { ''; checkInputs = [ - ipython pytestCheckHook + ipython + pytestCheckHook ]; meta = with lib; {