update hledger

3 files changed, 90 insertions, 2 deletions

diff --git a/darwin.nix b/darwin.nix
index 8d3496c..4dc9676 100644
--- a/darwin.nix
+++ b/darwin.nix
@@ -4,8 +4,20 @@ let
   homedir = builtins.getEnv "HOME";
   gitCommitTemplate = ./lib/git-commit-template;
   gpgid = "D09299626FA78AF8";
+  haskellOverlay = self: super: {
+    haskellPackages = super.haskellPackages.override (old: {
+      overrides = self: super: {
+        hledger = self.callPackage ./pkgs/hledger-1.19.1.nix {};
+        hledger-lib = self.callPackage ./pkgs/hledger-lib-1.19.1.nix {};
+      };
+    });
+  };
 in
 {
+  nixpkgs.overlays = [
+    haskellOverlay
+  ];
+
   imports = [
     ./lib/common.nix
     ./lib/email.nix
@@ -14,8 +26,6 @@ in
     sessionVariables.PATH = "/usr/local/opt/mysql@5.7/bin:${homedir}/bin:${homedir}/.cabal/bin:${homedir}/.local/bin:$PATH";
     packages = with pkgs; [
       muchsync
-      hledger-web
-      hledger-ui
       (haskellPackages.ghcWithPackages (ps: with ps; [hledger]))
       coreutils
     ];
diff --git a/pkgs/hledger-1.19.1.nix b/pkgs/hledger-1.19.1.nix
new file mode 100644
index 0000000..11f4678
--- /dev/null
+++ b/pkgs/hledger-1.19.1.nix
@@ -0,0 +1,43 @@
+{ mkDerivation, aeson, ansi-terminal, base, base-compat-batteries
+, bytestring, cmdargs, containers, data-default, Decimal, Diff
+, directory, extra, filepath, hashable, haskeline, hledger-lib
+, lucid, math-functions, megaparsec, mtl, old-time, parsec
+, pretty-show, process, regex-tdfa, safe, shakespeare, split
+, stdenv, tabular, tasty, temporary, terminfo, text, time, timeit
+, transformers, unordered-containers, utf8-string, utility-ht
+, wizards
+}:
+mkDerivation {
+  pname = "hledger";
+  version = "1.19.1";
+  sha256 = "d5c1eb6d8de5cf2d82771db1796b57a304095fa940773a6405c9cd8085f3da71";
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    aeson ansi-terminal base base-compat-batteries bytestring cmdargs
+    containers data-default Decimal Diff directory extra filepath
+    hashable haskeline hledger-lib lucid math-functions megaparsec mtl
+    old-time parsec pretty-show process regex-tdfa safe shakespeare
+    split tabular tasty temporary terminfo text time timeit
+    transformers unordered-containers utf8-string utility-ht wizards
+  ];
+  executableHaskellDepends = [
+    aeson ansi-terminal base base-compat-batteries bytestring cmdargs
+    containers data-default Decimal directory extra filepath haskeline
+    hledger-lib math-functions megaparsec mtl old-time parsec
+    pretty-show process regex-tdfa safe shakespeare split tabular tasty
+    temporary terminfo text time timeit transformers
+    unordered-containers utf8-string utility-ht wizards
+  ];
+  testHaskellDepends = [
+    aeson ansi-terminal base base-compat-batteries bytestring cmdargs
+    containers data-default Decimal directory extra filepath haskeline
+    hledger-lib math-functions megaparsec mtl old-time parsec
+    pretty-show process regex-tdfa safe shakespeare split tabular tasty
+    temporary terminfo text time timeit transformers
+    unordered-containers utf8-string utility-ht wizards
+  ];
+  homepage = "http://hledger.org";
+  description = "Command-line interface for the hledger accounting system";
+  license = stdenv.lib.licenses.gpl3;
+}
diff --git a/pkgs/hledger-lib-1.19.1.nix b/pkgs/hledger-lib-1.19.1.nix
new file mode 100644
index 0000000..329bade
--- /dev/null
+++ b/pkgs/hledger-lib-1.19.1.nix
@@ -0,0 +1,35 @@
+{ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base
+, base-compat-batteries, blaze-markup, bytestring, call-stack
+, cassava, cassava-megaparsec, cmdargs, containers, data-default
+, Decimal, directory, doctest, extra, fgl, file-embed, filepath
+, Glob, hashtables, megaparsec, mtl, old-time, parsec
+, parser-combinators, pretty-show, regex-tdfa, safe, split, stdenv
+, tabular, tasty, tasty-hunit, template-haskell, text, time, timeit
+, transformers, uglymemo, unordered-containers, utf8-string
+}:
+mkDerivation {
+  pname = "hledger-lib";
+  version = "1.19.1";
+  sha256 = "cabf263fe8a3c38822c9146b54a519fe56d369456c72be6db5a88c1c0208c15f";
+  libraryHaskellDepends = [
+    aeson aeson-pretty ansi-terminal array base base-compat-batteries
+    blaze-markup bytestring call-stack cassava cassava-megaparsec
+    cmdargs containers data-default Decimal directory extra fgl
+    file-embed filepath Glob hashtables megaparsec mtl old-time parsec
+    parser-combinators pretty-show regex-tdfa safe split tabular tasty
+    tasty-hunit template-haskell text time timeit transformers uglymemo
+    unordered-containers utf8-string
+  ];
+  testHaskellDepends = [
+    aeson aeson-pretty ansi-terminal array base base-compat-batteries
+    blaze-markup bytestring call-stack cassava cassava-megaparsec
+    cmdargs containers data-default Decimal directory doctest extra fgl
+    file-embed filepath Glob hashtables megaparsec mtl old-time parsec
+    parser-combinators pretty-show regex-tdfa safe split tabular tasty
+    tasty-hunit template-haskell text time timeit transformers uglymemo
+    unordered-containers utf8-string
+  ];
+  homepage = "http://hledger.org";
+  description = "A reusable library providing the core functionality of hledger";
+  license = stdenv.lib.licenses.gpl3;
+}