about summary refs log tree commit diff
path: root/pkgs/top-level/ocaml-packages.nix
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2017-02-24 06:47:05 +0000
committerVincent Laporte <Vincent.Laporte@gmail.com>2017-02-24 19:02:48 +0000
commit71739f348e5d1e277d737f990b4836d119d149f4 (patch)
tree8edcd94503a1032f943267c5e6cd50f70145ff39 /pkgs/top-level/ocaml-packages.nix
parent01fdaee031af9ac3abfd5c01fb971fd21ce2f8b2 (diff)
downloadnixlib-71739f348e5d1e277d737f990b4836d119d149f4.tar
nixlib-71739f348e5d1e277d737f990b4836d119d149f4.tar.gz
nixlib-71739f348e5d1e277d737f990b4836d119d149f4.tar.bz2
nixlib-71739f348e5d1e277d737f990b4836d119d149f4.tar.lz
nixlib-71739f348e5d1e277d737f990b4836d119d149f4.tar.xz
nixlib-71739f348e5d1e277d737f990b4836d119d149f4.tar.zst
nixlib-71739f348e5d1e277d737f990b4836d119d149f4.zip
Revert "ocamlPackages.spacetime: only build with ocaml-4.04"
This reverts commit f18ac15dcad7d07f6c9c31b049a45bba9cd77b2a.
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
-rw-r--r--pkgs/top-level/ocaml-packages.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index e9567a958595..5ad601af15da 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -399,10 +399,7 @@ let
 
     sequence = callPackage ../development/ocaml-modules/sequence { };
 
-    spacetime_lib = if lib.versionOlder "4.04" ocaml.version then
-    callPackage ../development/tools/ocaml/ocamlbuild { }
-    else
-    null;
+    spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
 
     sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { };