about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2020-05-09 06:33:29 +0200
committerVincent Laporte <vbgl@users.noreply.github.com>2020-05-15 21:40:31 +0200
commita91007dbc43774853d3e6dc2f0c48396d8a4b14c (patch)
tree1345dbe2c1dd256459522a73cfc3e637ee627383 /pkgs/top-level
parent5e6f290e326ad2fa8a0aebd5c6c93b4d9d8b3019 (diff)
downloadnixlib-a91007dbc43774853d3e6dc2f0c48396d8a4b14c.tar
nixlib-a91007dbc43774853d3e6dc2f0c48396d8a4b14c.tar.gz
nixlib-a91007dbc43774853d3e6dc2f0c48396d8a4b14c.tar.bz2
nixlib-a91007dbc43774853d3e6dc2f0c48396d8a4b14c.tar.lz
nixlib-a91007dbc43774853d3e6dc2f0c48396d8a4b14c.tar.xz
nixlib-a91007dbc43774853d3e6dc2f0c48396d8a4b14c.tar.zst
nixlib-a91007dbc43774853d3e6dc2f0c48396d8a4b14c.zip
ocamlPackages.ipaddr: remove at 2.6.1
This is a legacy version for OCaml 4.02
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/ocaml-packages.nix7
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index f21f3ca9cbed..80d49ca1f58b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -317,12 +317,7 @@ let
 
     io-page = callPackage ../development/ocaml-modules/io-page { };
 
-    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;
+    ipaddr = callPackage ../development/ocaml-modules/ipaddr { };
 
     irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { };