From 2685842e88c5e9b809a52de7be98d145f9c1286f Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 2 Jun 2021 18:08:34 +0200 Subject: [PATCH] Revert "pkgs: temp package for fixed beancount deps" This reverts commit 8dc5961c3a1963362e0d52d898b6813af887161f. --- hosts/boreal/home.nix | 2 +- pkgs/beancount.nix | 61 ------------------------------------------- pkgs/default.nix | 1 - 3 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 pkgs/beancount.nix diff --git a/hosts/boreal/home.nix b/hosts/boreal/home.nix index fc89bd7..281695a 100644 --- a/hosts/boreal/home.nix +++ b/hosts/boreal/home.nix @@ -16,7 +16,7 @@ # dev clang_11 - packages.beancount + beancount fava # only available on unstable diff --git a/pkgs/beancount.nix b/pkgs/beancount.nix deleted file mode 100644 index ec864e7..0000000 --- a/pkgs/beancount.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPy3k -, beautifulsoup4 -, bottle -, chardet -, dateutil -, google-api-python-client -, google-auth-oauthlib -, lxml -, oauth2client -, ply -, pytest -, python_magic -, requests -}: - -buildPythonPackage rec { - version = "2.3.4"; - pname = "beancount"; - - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-K/CM5qldmAAPTXM5WYXNHeuBwNUu1aduYQusd9gvhsA="; - }; - - # Tests require files not included in the PyPI archive. - doCheck = false; - - propagatedBuildInputs = [ - beautifulsoup4 - bottle - chardet - dateutil - google-api-python-client - google-auth-oauthlib - lxml - oauth2client - ply - python_magic - requests - # pytest really is a runtime dependency - # https://github.com/beancount/beancount/blob/v2/setup.py#L81-L82 - pytest - ]; - - meta = with lib; { - homepage = "http://furius.ca/beancount/"; - description = "Double-entry bookkeeping computer language"; - longDescription = '' - A double-entry bookkeeping computer language that lets you define - financial transaction records in a text file, read them in memory, - generate a variety of reports from them, and provides a web interface. - ''; - license = licenses.gpl2Only; - maintainers = with maintainers; [ bhipple ]; - }; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index c4022d0..4b0dc52 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,5 +1,4 @@ { pkgs }: { sddm-sugar-candy = pkgs.callPackage ./sddm-sugar-candy {}; - beancount = pkgs.python3Packages.callPackage ./beancount.nix {}; }