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 {