about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2018-03-01 05:53:28 +0100
committeraszlig <aszlig@nix.build>2018-03-01 06:14:49 +0100
commit4a0d04388c43c8bf1a69c016bbd6435724d1e05a (patch)
treee8886993ed8d83cdc50ef976024750fd78ca29c9
parent2c94ca56b55805e416300873eaed84feb7d4b79f (diff)
sternenseemann/logbook: Support newer Angstrong
Angstrong doesn't work anymore for OCaml versions lower that 4.03, so
let's use version 4.04.2 and fix logbook to cope with the interface
changes in Angstrong 0.7.0.

I've opened a pull request (sternenseemann/logbook#1) to fix it upstream
and also using the commit from the pull request here.

This fixes the following evaluation error:

in job 'channels.generic':
angstrom is not available for OCaml 4.02.3

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @sternenseemann
-rw-r--r--pkgs/sternenseemann/default.nix4
-rw-r--r--pkgs/sternenseemann/logbook/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/sternenseemann/default.nix b/pkgs/sternenseemann/default.nix
index a7ea47d1..d3b29076 100644
--- a/pkgs/sternenseemann/default.nix
+++ b/pkgs/sternenseemann/default.nix
@@ -1,6 +1,6 @@
-{ haskellPackages, ocamlPackages_4_02 }:
+{ haskellPackages, ocamlPackages }:
 
 {
   spacecookie = haskellPackages.callPackage ./spacecookie {};
-  logbook = ocamlPackages_4_02.callPackage ./logbook {};
+  logbook = ocamlPackages.callPackage ./logbook {};
 }
diff --git a/pkgs/sternenseemann/logbook/default.nix b/pkgs/sternenseemann/logbook/default.nix
index dcfb700e..7a919ade 100644
--- a/pkgs/sternenseemann/logbook/default.nix
+++ b/pkgs/sternenseemann/logbook/default.nix
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url    = "https://github.com/sternenseemann/logbook";
-    rev    = "518771882f3216f99570a5e4711a4870bb064366";
-    sha256 = "1h40xfzx61nyj1r2x7r35mj66fhjgfq1pvvbbr4hmi1mmyi38xsz";
+    rev    = "1834ced22e4faf1e3afb3519febc176209099526";
+    sha256 = "1jq43n28s5k59hnl5xawzqvgmnknccanyvf6s8zwyfw3m60qsnd2";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild topkg opam cow