diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-01 10:18:34 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-01 11:52:18 +0000 |
| commit | fe9147a042f83b7700da92f0680cfb7438997ac3 (patch) | |
| tree | 6a5434adf76f82e8fa7806a502ff8002d4d8bc7d /pkgs/top-level/ocaml-packages.nix | |
| parent | 352d487101eded14fd4f592f4d4909017187f0d6 (diff) | |
| download | nixpkgs-fe9147a042f83b7700da92f0680cfb7438997ac3.tar nixpkgs-fe9147a042f83b7700da92f0680cfb7438997ac3.tar.gz nixpkgs-fe9147a042f83b7700da92f0680cfb7438997ac3.tar.bz2 nixpkgs-fe9147a042f83b7700da92f0680cfb7438997ac3.tar.lz nixpkgs-fe9147a042f83b7700da92f0680cfb7438997ac3.tar.xz nixpkgs-fe9147a042f83b7700da92f0680cfb7438997ac3.tar.zst nixpkgs-fe9147a042f83b7700da92f0680cfb7438997ac3.zip | |
ocamlPackages.conduit: 0.10.0 -> 0.15.4
Keeping the old version under attribute conduit_p4.
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 49d02f61f91..c38c4c53a82 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -114,10 +114,6 @@ let }; camlimages = camlimages_4_1; - conduit = callPackage ../development/ocaml-modules/conduit { - lwt = ocaml_lwt; - }; - biniou = callPackage ../development/ocaml-modules/biniou { }; bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { }; @@ -136,6 +132,15 @@ let lwt = ocaml_lwt; }; + conduit_p4 = callPackage ../development/ocaml-modules/conduit/0.10.0.nix { + lwt = ocaml_lwt; + }; + + conduit = + if lib.versionOlder "4.03" ocaml.version + then callPackage ../development/ocaml-modules/conduit { } + else conduit_p4; + config-file = callPackage ../development/ocaml-modules/config-file { }; containers = callPackage ../development/ocaml-modules/containers { }; |