From e39bfe918cc5ffc289bbe2afaa6df59be9181d27 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Thu, 23 Apr 2020 19:06:26 +0200
Subject: pkgs/sternenseemann: update/fix logbook

* Fix couple of build errors with more recent packages
* switch build system to dune
* clean up package
---
 pkgs/sternenseemann/logbook/default.nix | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'pkgs/sternenseemann')

diff --git a/pkgs/sternenseemann/logbook/default.nix b/pkgs/sternenseemann/logbook/default.nix
index 78f12f4d..5be7abf4 100644
--- a/pkgs/sternenseemann/logbook/default.nix
+++ b/pkgs/sternenseemann/logbook/default.nix
@@ -1,25 +1,24 @@
-{ stdenv, ocaml, topkg, ocamlbuild, findlib, ocaml_lwt
-, jingoo, ptime, angstrom, astring, opam, cow
-, fetchgit }:
+{ lib, buildDunePackage, fetchFromGitHub
+, ocaml_lwt, jingoo, ptime, angstrom, astring, cow}:
 
-stdenv.mkDerivation rec {
-  version = "2017-02-18";
-  name = "ocaml${ocaml.version}-logbook-${version}";
+buildDunePackage rec {
+  version = "unstable-2020-04-23";
+  pname = "logbook";
 
-  src = fetchgit {
-    url    = "https://github.com/sternenseemann/logbook";
-    rev    = "1834ced22e4faf1e3afb3519febc176209099526";
-    sha256 = "1jq43n28s5k59hnl5xawzqvgmnknccanyvf6s8zwyfw3m60qsnd2";
+  src = fetchFromGitHub {
+    owner  = "sternenseemann";
+    repo   = pname;
+    rev    = "765267852f4baaa6dbb272370705f318cc562ea6";
+    sha256 = "057pcrk9ik673z6fbhbr4b2qxqvk0lrp1w9dpjipqr2slhxiikwf";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild topkg opam cow
-                  ocaml_lwt jingoo ptime angstrom astring
-                ];
+  buildInputs = [ cow ocaml_lwt jingoo ];
+  propagatedBuildInputs = [ ptime angstrom astring ];
 
-  inherit (topkg) buildPhase installPhase;
-  meta = with stdenv.lib; {
+  useDune2 = true;
+
+  meta = with lib; {
     description = "A tool for personal log files";
-    platforms = ocaml.meta.platforms;
     hydraPlatforms = [ "x86_64-linux" ];
     license = licenses.bsd3;
   };
-- 
cgit 1.4.1