diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-04-05 22:32:01 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-08 11:36:05 +0200 |
| commit | 63193b19b364ba33b7c63959ce4729c3517bb2f9 (patch) | |
| tree | dc578b7d450a05bedc00fc090c968e2243bacb89 | |
| parent | 762378a5d7da9281610e9f079f7efb880c5157a0 (diff) | |
| download | nixlib-63193b19b364ba33b7c63959ce4729c3517bb2f9.tar nixlib-63193b19b364ba33b7c63959ce4729c3517bb2f9.tar.gz nixlib-63193b19b364ba33b7c63959ce4729c3517bb2f9.tar.bz2 nixlib-63193b19b364ba33b7c63959ce4729c3517bb2f9.tar.lz nixlib-63193b19b364ba33b7c63959ce4729c3517bb2f9.tar.xz nixlib-63193b19b364ba33b7c63959ce4729c3517bb2f9.tar.zst nixlib-63193b19b364ba33b7c63959ce4729c3517bb2f9.zip | |
beancount: move to pythonPackages
| -rw-r--r-- | pkgs/development/python-modules/beancount/default.nix (renamed from pkgs/applications/office/beancount/default.nix) | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 15 insertions, 11 deletions
diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index d500be8a1f22..2991ae9be82f 100644 --- a/pkgs/applications/office/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchhg, pkgs, pythonPackages }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, beautifulsoup4, bottle, chardet, dateutil +, google_api_python_client, lxml, ply, python_magic +, nose }: -pythonPackages.buildPythonApplication rec { +buildPythonPackage rec { version = "2.0.0"; - name = "beancount-${version}"; - namePrefix = ""; + pname = "beancount"; - src = pkgs.fetchurl { - url = "mirror://pypi/b/beancount/${name}.tar.gz"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; sha256 = "0wxwf02d3raglwqsxdsgf89fniakv1m19q825w76k5z004g18y42"; }; - buildInputs = with pythonPackages; [ nose ]; + checkInputs = [ nose ]; # Automatic tests cannot be run because it needs to import some local modules for tests. doCheck = false; @@ -18,7 +22,7 @@ pythonPackages.buildPythonApplication rec { nosetests ''; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = [ beautifulsoup4 bottle chardet diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e98111c43da..71f2a508840c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18775,9 +18775,7 @@ with pkgs; bastet = callPackage ../games/bastet {}; - beancount = callPackage ../applications/office/beancount { - pythonPackages = python3Packages; - }; + beancount = with python3.pkgs; toPythonApplication beancount; bean-add = callPackage ../applications/office/beancount/bean-add.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d8374149a65..5a5ce5a50639 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -931,6 +931,8 @@ in { bcdoc = callPackage ../development/python-modules/bcdoc {}; + beancount = callPackage ../development/python-modules/beancount { }; + beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; beaker = buildPythonPackage rec { |