From c21e915c972116b29bcf10c44f469f8036aa2aa5 Mon Sep 17 00:00:00 2001 From: wisut hantanong Date: Wed, 19 Jul 2017 15:59:47 +0700 Subject: [PATCH] python.pkgs.actdiag : move to separate expression --- .../python-modules/actdiag/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +--------------- 2 files changed, 30 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/actdiag/default.nix diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix new file mode 100644 index 00000000000..064e5e6c11a --- /dev/null +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pep8, nose, unittest2, docutils, blockdiag }: + +buildPythonPackage rec { + pname = "actdiag"; + version = "0.5.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vr4hnkr0gcvvpaycd8q3vcx029b2f5yv8swhdr8kwspaqb0dvfa"; + }; + + 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; + + meta = with stdenv.lib; { + description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; + homepage = http://blockdiag.com/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f2ae8c58c59..af1ab819b12 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -272,30 +272,7 @@ in { acme-tiny = callPackage ../development/python-modules/acme-tiny { }; - actdiag = buildPythonPackage rec { - name = "actdiag-0.5.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/actdiag/${name}.tar.gz"; - sha256 = "1vr4hnkr0gcvvpaycd8q3vcx029b2f5yv8swhdr8kwspaqb0dvfa"; - }; - - buildInputs = with self; [ pep8 nose unittest2 docutils ]; - - propagatedBuildInputs = with self; [ blockdiag ]; - - # One test fails: - # UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128) - doCheck = false; - - meta = { - description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + actdiag = callPackage ../development/python-modules/actdiag { }; adal = buildPythonPackage rec { version = "0.1.0";