From 95134fb939d198b64a515d205ea29ad3ac7cf83b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 17:40:56 +0200 Subject: [PATCH 1/5] pythonPackages.actdiag: run tests --- .../development/python-modules/actdiag/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index 2172aa1165a6..27a9a455c47f 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pep8, nose, unittest2, docutils, blockdiag }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch +, pep8, nose, unittest2, docutils, blockdiag, reportlab }: buildPythonPackage rec { pname = "actdiag"; @@ -10,13 +10,17 @@ buildPythonPackage rec { sha256 = "983071777d9941093aaef3be1f67c198a8ac8d2bba264cdd1f337ca415ab46af"; }; + patches = fetchpatch { + name = "drop_test_pep8.py.patch"; + url = https://bitbucket.org/blockdiag/actdiag/commits/c1f2ed5947a1e93291f5860e4e30cee098bd635d/raw; + sha256 = "1zxzwb0fvwlc8xgs45fx65341sjhb3h6l2p6rdj6i127vg1hsxb4"; + }; + buildInputs = [ pep8 nose unittest2 docutils ]; propagatedBuildInputs = [ blockdiag ]; - # One test fails: - # UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128) - doCheck = false; + checkInputs = [ reportlab ]; meta = with stdenv.lib; { description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; From 54ae6ea537b7ea3dc34fa169eb7ba652def7684b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 17:41:31 +0200 Subject: [PATCH 2/5] actdiag: use python3 and toPythonApplication --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d151eadf4e3..0e199d5a16c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -429,7 +429,7 @@ with pkgs; acpica-tools = callPackage ../tools/system/acpica-tools { }; - actdiag = pythonPackages.actdiag; + actdiag = with python3.pkgs; toPythonApplication actdiag; actkbd = callPackage ../tools/system/actkbd { }; From 8769f25c6a804b8ef8742c32d2c16e9534470cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 19:18:22 +0200 Subject: [PATCH 3/5] blockdiag: use python3Packages and toPythonApplication --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e199d5a16c9..8df33c48f2d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -905,7 +905,7 @@ with pkgs; blobfuse = callPackage ../tools/filesystems/blobfuse { }; - blockdiag = pythonPackages.blockdiag; + blockdiag = with python3Packages; toPythonApplication blockdiag; blsd = callPackage ../tools/misc/blsd { libgit2 = libgit2_0_27; From 7d4d49bf1daf4be39403b19c3b34f330145f006a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 19:21:02 +0200 Subject: [PATCH 4/5] seqdiag: use python3Packages and toPythonApplication --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8df33c48f2d4..448ff8fd6221 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5074,7 +5074,7 @@ with pkgs; setserial = callPackage ../tools/system/setserial { }; - seqdiag = pythonPackages.seqdiag; + seqdiag = with python3Packages; toPythonApplication seqdiag; screenfetch = callPackage ../tools/misc/screenfetch { }; From 5acb3f5774759d9eff3dc66f7cc8195dccab777d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 19:22:18 +0200 Subject: [PATCH 5/5] nwdiag: use python3Packages and toPythonApplication --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 448ff8fd6221..9ad932bdb979 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4242,7 +4242,7 @@ with pkgs; nssmdns = callPackage ../tools/networking/nss-mdns { }; - nwdiag = pythonPackages.nwdiag; + nwdiag = with python3Packages; toPythonApplication nwdiag; nylon = callPackage ../tools/networking/nylon { };