diff options
| author | sternenseemann <git@lukasepple.de> | 2017-02-18 22:54:02 +0100 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-02-23 08:01:29 +0000 |
| commit | 8352e0b38c65a736219619d8821ad50f787e58d1 (patch) | |
| tree | f07487c56fcc4de043a9a017b05873319c56e1d9 /pkgs/top-level/ocaml-packages.nix | |
| parent | 6c37a92b2bdb77465b9486e904b83895b2b45596 (diff) | |
| download | nixpkgs-8352e0b38c65a736219619d8821ad50f787e58d1.tar nixpkgs-8352e0b38c65a736219619d8821ad50f787e58d1.tar.gz nixpkgs-8352e0b38c65a736219619d8821ad50f787e58d1.tar.bz2 nixpkgs-8352e0b38c65a736219619d8821ad50f787e58d1.tar.lz nixpkgs-8352e0b38c65a736219619d8821ad50f787e58d1.tar.xz nixpkgs-8352e0b38c65a736219619d8821ad50f787e58d1.tar.zst nixpkgs-8352e0b38c65a736219619d8821ad50f787e58d1.zip | |
ocaml-ipaddr: 2.6.1 -> 2.7.2
Keeps the legacy version under attribute `ipaddr_p4`; it is needed for OCaml < 4.02 and some libraries (eg `conduit`).
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 f7a91767326..339f6eb84e3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -202,7 +202,12 @@ let io-page = callPackage ../development/ocaml-modules/io-page { }; - ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; + ipaddr_p4 = callPackage ../development/ocaml-modules/ipaddr/2.6.1.nix { }; + + ipaddr = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/ipaddr { } + else ipaddr_p4; iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; |