diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-01 11:16:27 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-01 11:52:18 +0000 |
| commit | 6875115b8e0ab94a00bc3c6f4c37857effcf6055 (patch) | |
| tree | 5a7c1163170797d284973d1c30a6af7951438a67 /pkgs/top-level/ocaml-packages.nix | |
| parent | fe9147a042f83b7700da92f0680cfb7438997ac3 (diff) | |
| download | nixpkgs-6875115b8e0ab94a00bc3c6f4c37857effcf6055.tar nixpkgs-6875115b8e0ab94a00bc3c6f4c37857effcf6055.tar.gz nixpkgs-6875115b8e0ab94a00bc3c6f4c37857effcf6055.tar.bz2 nixpkgs-6875115b8e0ab94a00bc3c6f4c37857effcf6055.tar.lz nixpkgs-6875115b8e0ab94a00bc3c6f4c37857effcf6055.tar.xz nixpkgs-6875115b8e0ab94a00bc3c6f4c37857effcf6055.tar.zst nixpkgs-6875115b8e0ab94a00bc3c6f4c37857effcf6055.zip | |
ocamlPackages.cohttp: 0.19.3 -> 0.22.0
Keeping the old version under attribute cohttp_p4
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c38c4c53a82..3245cca8446 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -128,10 +128,15 @@ let cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1.0.nix { }; - cohttp = callPackage ../development/ocaml-modules/cohttp { + cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix { lwt = ocaml_lwt; }; + cohttp = + if lib.versionOlder "4.03" ocaml.version + then callPackage ../development/ocaml-modules/cohttp { } + else cohttp_p4; + conduit_p4 = callPackage ../development/ocaml-modules/conduit/0.10.0.nix { lwt = ocaml_lwt; }; |