From 13879f89e0fcfa08d71915631b9ca7781ef15dbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Dec 2021 20:05:58 +0100 Subject: [PATCH] python3Packages.sphinxcontrib-*diag: disable on older Python releases --- .../sphinxcontrib-actdiag/default.nix | 16 ++++++++++++--- .../sphinxcontrib-nwdiag/default.nix | 20 ++++++++++++++----- .../sphinxcontrib-seqdiag/default.nix | 20 ++++++++++++++----- 3 files changed, 43 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix index 8f93a5364bb1..32470e98b4e0 100644 --- a/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix @@ -4,25 +4,35 @@ , sphinx , actdiag , blockdiag +, pythonOlder }: buildPythonPackage rec { pname = "sphinxcontrib-actdiag"; version = "3.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-PFXUVP/Due/nwg8q2vAiGZuCVhLTLyAL6KSXqofg+B8="; }; - propagatedBuildInputs = [ sphinx actdiag blockdiag ]; + propagatedBuildInputs = [ + actdiag + blockdiag + sphinx + ]; - pythonImportsCheck = [ "sphinxcontrib.actdiag" ]; + pythonImportsCheck = [ + "sphinxcontrib.actdiag" + ]; meta = with lib; { description = "Sphinx actdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-actdiag"; - maintainers = with maintainers; [ davidtwco ]; license = licenses.bsd2; + maintainers = with maintainers; [ davidtwco ]; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix index 10963a73a912..47573ad609a8 100644 --- a/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix @@ -1,28 +1,38 @@ { lib +, blockdiag , buildPythonPackage , fetchPypi -, sphinx -, blockdiag , nwdiag +, pythonOlder +, sphinx }: buildPythonPackage rec { pname = "sphinxcontrib-nwdiag"; version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-bula1DutRv6NwfZRhciZfLHRZmXu42p+qvbeExN/+Fk="; }; - propagatedBuildInputs = [ sphinx blockdiag nwdiag ]; + propagatedBuildInputs = [ + blockdiag + nwdiag + sphinx + ]; - pythonImportsCheck = [ "sphinxcontrib.nwdiag" ]; + pythonImportsCheck = [ + "sphinxcontrib.nwdiag" + ]; meta = with lib; { description = "Sphinx nwdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-nwdiag"; - maintainers = with maintainers; [ davidtwco ]; license = licenses.bsd2; + maintainers = with maintainers; [ davidtwco ]; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix index 8d2541e62951..cc3a96086e4e 100644 --- a/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix @@ -1,28 +1,38 @@ { lib +, blockdiag , buildPythonPackage , fetchPypi -, sphinx -, blockdiag +, pythonOlder , seqdiag +, sphinx }: buildPythonPackage rec { pname = "sphinxcontrib-seqdiag"; version = "3.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-QH5IeXZz9x2Ujp/6BHFsrB2ZqeyPYW3jdk1C0DNBZXQ="; }; - propagatedBuildInputs = [ sphinx blockdiag seqdiag ]; + propagatedBuildInputs = [ + blockdiag + seqdiag + sphinx + ]; - pythonImportsCheck = [ "sphinxcontrib.seqdiag" ]; + pythonImportsCheck = [ + "sphinxcontrib.seqdiag" + ]; meta = with lib; { description = "Sphinx seqdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-seqdiag"; - maintainers = with maintainers; [ davidtwco ]; license = licenses.bsd2; + maintainers = with maintainers; [ davidtwco ]; }; }