From 5e2ac86e5be4a612e2dff47cb84101494a899f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Mon, 4 Mar 2019 22:42:03 +0100 Subject: [PATCH 1/3] pythonPackages.gcovr: Fix build --- pkgs/development/python-modules/gcovr/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 4788112ebef..7000e33b7b8 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, jinja2 }: buildPythonPackage rec { @@ -12,6 +13,15 @@ buildPythonPackage rec { sha256 = "ca94c337f2d9a70db177ec4330534fad7b2b772beda625c1ec071fbcf1361e22"; }; + propagatedBuildInputs = [ + jinja2 + ]; + + # There are no unit tests in the pypi tarball. Most of the unit tests on the + # github repository currently only work with gcc5, so we just disable them. + # See also: https://github.com/gcovr/gcovr/issues/206 + doCheck = false; + meta = with stdenv.lib; { description = "A Python script for summarizing gcov data"; license = licenses.bsd0; From f13fdf4b1df8528e8ccf850053b787a41d261524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Tue, 5 Mar 2019 07:41:01 +0100 Subject: [PATCH 2/3] pythonPackages.gcovr: Fixup homepage --- pkgs/development/python-modules/gcovr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 7000e33b7b8..e6f45a2b4c6 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python script for summarizing gcov data"; license = licenses.bsd0; - homepage = http://gcovr.com/; + homepage = https://www.gcovr.com/; }; } From f10b0c6f8ca8e57a28e76ee86ec0252c7202f66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Tue, 5 Mar 2019 07:46:49 +0100 Subject: [PATCH 3/3] gcovr: Add alias to pythonPackages.gcovr Since gcovr is most likely to be used as a script instead of a library, we provide an alias to python3Packages.gcovr. We still keep python2/3Packages.gcovr in case somebody really wants to import it as a library, which can not entirely be ruled out. --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bb2810c65e..bed8c72c20a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10383,6 +10383,8 @@ in gcab = callPackage ../development/libraries/gcab { }; + gcovr = with python3Packages; toPythonApplication gcovr; + gcr = callPackage ../development/libraries/gcr { }; gdl = callPackage ../development/libraries/gdl { };