jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #44408 from dotlambda/actdiag-application

Browse Source 
*diag: use python3 and toPythonApplication
This commit is contained in:
Robert Schütz 2018-08-03 19:59:15 +02:00 committed by GitHub
commit c2649439d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/python-modules/actdiag/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi { stdenv, buildPythonPackage, fetchPypi, fetchpatch
, pep8, nose, unittest2, docutils, blockdiag }: , pep8, nose, unittest2, docutils, blockdiag, reportlab }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "actdiag"; pname = "actdiag";
@ -10,13 +10,17 @@ buildPythonPackage rec {
sha256 = "983071777d9941093aaef3be1f67c198a8ac8d2bba264cdd1f337ca415ab46af"; 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 ]; buildInputs = [ pep8 nose unittest2 docutils ];
propagatedBuildInputs = [ blockdiag ]; propagatedBuildInputs = [ blockdiag ];
# One test fails: checkInputs = [ reportlab ];
# UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128)
doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; description = "Generate activity-diagram image from spec-text file (similar to Graphviz)";

8
pkgs/top-level/all-packages.nix
View File

@ -429,7 +429,7 @@ with pkgs;
acpica-tools = callPackage ../tools/system/acpica-tools { }; acpica-tools = callPackage ../tools/system/acpica-tools { };
actdiag = pythonPackages.actdiag; actdiag = with python3.pkgs; toPythonApplication actdiag;
actkbd = callPackage ../tools/system/actkbd { }; actkbd = callPackage ../tools/system/actkbd { };
@ -905,7 +905,7 @@ with pkgs;
blobfuse = callPackage ../tools/filesystems/blobfuse { }; blobfuse = callPackage ../tools/filesystems/blobfuse { };
blockdiag = pythonPackages.blockdiag; blockdiag = with python3Packages; toPythonApplication blockdiag;
blsd = callPackage ../tools/misc/blsd { blsd = callPackage ../tools/misc/blsd {
libgit2 = libgit2_0_27; libgit2 = libgit2_0_27;
@ -4244,7 +4244,7 @@ with pkgs;
nssmdns = callPackage ../tools/networking/nss-mdns { }; nssmdns = callPackage ../tools/networking/nss-mdns { };
nwdiag = pythonPackages.nwdiag; nwdiag = with python3Packages; toPythonApplication nwdiag;
nylon = callPackage ../tools/networking/nylon { }; nylon = callPackage ../tools/networking/nylon { };
@ -5076,7 +5076,7 @@ with pkgs;
setserial = callPackage ../tools/system/setserial { }; setserial = callPackage ../tools/system/setserial { };
seqdiag = pythonPackages.seqdiag; seqdiag = with python3Packages; toPythonApplication seqdiag;
screenfetch = callPackage ../tools/misc/screenfetch { }; screenfetch = callPackage ../tools/misc/screenfetch { };