From 5e25ecccde67778d0a78910001a8381ae7db1a4b Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Mon, 13 Jul 2020 13:37:01 +0200
Subject: [PATCH] Update jali

---
 overlays/10-previews.nix  |  2 +-
 overlays/jali/package.nix | 15 ++++++---------
 overlays/pkgSets.nix      |  6 +++---
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/overlays/10-previews.nix b/overlays/10-previews.nix
index 9c9424b0..4bbde1e5 100644
--- a/overlays/10-previews.nix
+++ b/overlays/10-previews.nix
@@ -7,5 +7,5 @@ in {
     inherit (unstable.gnome3) gnome-keyring seahorse gdm;
   };
   inherit (unstable)
-    neovim vimPlugins syncthing nerdfonts ormolu ghcid go-neb; # riot-desktop;
+    aqbanking neovim vimPlugins syncthing nerdfonts ormolu ghcid go-neb; # riot-desktop;
 }
diff --git a/overlays/jali/package.nix b/overlays/jali/package.nix
index a62d95a2..f9ce1e10 100644
--- a/overlays/jali/package.nix
+++ b/overlays/jali/package.nix
@@ -1,19 +1,16 @@
 { aqbanking, python3Packages, fetchgit }:
 let
-  andir = import (builtins.fetchTarball {
-    url = "https://github.com/andir/nixpkgs/archive/aqbanking.tar.gz";
-    sha256 = "06m7risi68jfqgv001ip77lzz6bylvvdn5j8sn845c54zpm6qp36";
-  }) { };
-in with python3Packages;
-buildPythonApplication rec {
-  name = "${pname}-${version}";
+  inherit (python3Packages) jinja2 pendulum GitPython buildPythonApplication;
   pname = "jali";
-  doCheck = false;
   version = "b47d3b9";
+in buildPythonApplication {
+  name = "${pname}-${version}";
+  inherit pname version;
+  doCheck = false;
   src = fetchgit {
     url = "https://git.darmstadt.ccc.de/jali/jali.git";
     rev = version;
     sha256 = "0l5h9hjri77zifx3x4khw7ncmmc9l9ppisdjilsfllzkabz4xjf4";
   };
-  propagatedBuildInputs = [ jinja2 pendulum GitPython andir.aqbanking ];
+  propagatedBuildInputs = [ jinja2 pendulum GitPython aqbanking ];
 }
diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix
index 6e1c04dc..c791cf1c 100644
--- a/overlays/pkgSets.nix
+++ b/overlays/pkgSets.nix
@@ -45,13 +45,13 @@ self: super: {
     inherit (self.pythonPackages) yapf jsbeautifier;
     inherit (self)
       go gdb mpc_cli ncmpcpp shfmt htmlTidy astyle nodejs tasksh magic-wormhole
-      nixfmt rnix-lsp tmate rustup kitty nix-top ghc ghcid ormolu;
+      nixfmt rnix-lsp tmate rustup kitty nix-top ghc ghcid;
     obelisk = (import self.sources.obelisk { }).command;
     neuron = import self.sources.neuron { };
   };
   accounting-pkgs = {
-    inherit (self.haskellPackages) hledger hledger-ui hledger-web;
-    inherit (self) ledger jali;
+    inherit (self.haskellPackages) hledger hledger-ui hledger-web hledger-iadd;
+    inherit (self) ledger jali aqbanking;
   };
   system-pkgs = self.core-system-pkgs // self.extra-system-pkgs // {
     inherit (self) test-system-config test-home-config test-config;