From e71d8d665a7450369096712de3d606c8ac6268ff Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Thu, 21 May 2020 04:09:39 +0200
Subject: pkgs/sternenseemann/logbook: 0.2 → 0.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/sternenseemann/logbook/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'pkgs/sternenseemann/logbook')

diff --git a/pkgs/sternenseemann/logbook/default.nix b/pkgs/sternenseemann/logbook/default.nix
index 38018264..6364349d 100644
--- a/pkgs/sternenseemann/logbook/default.nix
+++ b/pkgs/sternenseemann/logbook/default.nix
@@ -1,25 +1,23 @@
-{ lib, buildDunePackage, fetchFromGitHub, fetchpatch
+{ lib, buildDunePackage, fetchFromGitHub
 , ocaml_lwt, jingoo, ptime, angstrom, astring, cow}:
 
 buildDunePackage rec {
-  version = "0.2";
+  version = "0.3";
   pname = "logbook";
 
   src = fetchFromGitHub {
     owner  = "sternenseemann";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "1x202546ivs46m1193bzlnkpi3mxjjs3c1hcrlnb21v5x4fjnd4m";
+    sha256 = "05iwma3vv4v2b3nkb1n1fkfj1gbixw04r8rxdnm468zhf7i7z9gj";
   };
 
+  # fix for angstrom < 0.14
+  postPatch = "sed -i s/~consume:All// src/logbook.ml";
+
   buildInputs = [ cow ocaml_lwt jingoo ];
   propagatedBuildInputs = [ ptime angstrom astring ];
 
-  patches = [ (fetchpatch {
-    url = "https://github.com/sternenseemann/logbook/commit/d4ee40ada4bba55505cc55ab653e69fa5c6406e6.diff";
-    sha256 = "0dj6q2h1pxcniypx14if4gnfq7bbghsig9g51n7z2mad0fsji4sa";
-  }) ];
-
   useDune2 = true;
 
   meta = with lib; {
-- 
cgit 1.4.1