From 1d1dc0303895d7d207ce33a893c26e2c50f29161 Mon Sep 17 00:00:00 2001 From: Franklin Delehelle Date: Thu, 16 Dec 2021 14:56:21 +0100 Subject: [PATCH 1/2] pythonPackages.ete3: init at 3.1.2 --- .../python-modules/ete3/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/ete3/default.nix diff --git a/pkgs/development/python-modules/ete3/default.nix b/pkgs/development/python-modules/ete3/default.nix new file mode 100644 index 000000000000..6b27d2e073bc --- /dev/null +++ b/pkgs/development/python-modules/ete3/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, numpy +, six +, withTreeVisualization ? false +, lxml +, withXmlSupport ? false +, pyqt4 +, pyqt5 +}: + +buildPythonPackage rec { + pname = "ete3"; + version = "3.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "4fc987b8c529889d6608fab1101f1455cb5cbd42722788de6aea9c7d0a8e59e9"; + }; + + + doCheck = false; # Tests are (i) not 3.x compatible, (ii) broken under 2.7 + pythonImportsCheck = [ "ete3" ]; + + propagatedBuildInputs = [ six numpy ] + ++ lib.optional withTreeVisualization (if isPy3k then pyqt5 else pyqt4) + ++ lib.optional withXmlSupport lxml; + + meta = with lib; { + description = "A Python framework for the analysis and visualization of trees"; + homepage = "http://etetoolkit.org/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ delehef ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b56c7119a310..67c33fcacfc3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2560,6 +2560,8 @@ in { etcd = callPackage ../development/python-modules/etcd { }; + ete3 = callPackage ../development/python-modules/ete3 { }; + etelemetry = callPackage ../development/python-modules/etelemetry { }; etebase = callPackage ../development/python-modules/etebase { From 106f645c966ba02426672d973a6a8beda50f778f Mon Sep 17 00:00:00 2001 From: Franklin Delehelle Date: Thu, 16 Dec 2021 15:10:45 +0100 Subject: [PATCH 2/2] maintainers: add delehef --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 68cf8b30d546..7c37be40288b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2754,6 +2754,12 @@ github = "delan"; githubId = 465303; }; + delehef = { + name = "Franklin Delehelle"; + email = "nix@odena.eu"; + github = "delehef"; + githubId = 1153808; + }; deliciouslytyped = { email = "47436522+deliciouslytyped@users.noreply.github.com"; github = "deliciouslytyped";