From 2a17b75fb1f41f58901746121214c3eb43e56e63 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 12:16:49 +0100 Subject: [PATCH] ocamlPackages.bitsring: associate ocaml versions with bitstring versions univocally --- pkgs/top-level/ocaml-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index aab1f31d68c..340ad8ff6cf 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -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 { };