ocamlPackages.bitsring: associate ocaml versions with bitstring versions univocally

This commit is contained in:
Florent Becker 2017-02-16 12:16:49 +01:00 committed by Florent Becker
parent ba993ad506
commit 2a17b75fb1

View File

@ -53,13 +53,10 @@ let
bolt = callPackage ../development/ocaml-modules/bolt { };
bitstring_2_0_4 = callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { };
bitstring_git = callPackage ../development/ocaml-modules/bitstring { };
bitstring =
if lib.versionOlder "4.02" ocaml.version
then bitstring_git
else bitstring_2_0_4;
then callPackage ../development/ocaml-modules/bitstring { }
else callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { };
camlidl = callPackage ../development/tools/ocaml/camlidl { };