From a91007dbc43774853d3e6dc2f0c48396d8a4b14c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 9 May 2020 06:33:29 +0200 Subject: [PATCH] ocamlPackages.ipaddr: remove at 2.6.1 This is a legacy version for OCaml 4.02 --- .../ocaml-modules/ipaddr/2.6.1.nix | 32 ------------------- pkgs/top-level/ocaml-packages.nix | 7 +--- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/ipaddr/2.6.1.nix diff --git a/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix b/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix deleted file mode 100644 index a602393e920..00000000000 --- a/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, buildOcaml, fetchurl, sexplib_p4}: - -buildOcaml rec { - name = "ipaddr"; - version = "2.6.1"; - - src = fetchurl { - url = "https://github.com/mirage/ocaml-ipaddr/archive/${version}.tar.gz"; - sha256 = "7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0"; - }; - - propagatedBuildInputs = [ sexplib_p4 ]; - - configurePhase = '' - ocaml setup.ml -configure --prefix $out - ''; - - buildPhase = '' - make build - ''; - - installPhase = '' - make install - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/mirage/ocaml-ipaddr"; - description = "A library for manipulation of IP (and MAC) address representations "; - license = licenses.mit; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f21f3ca9cbe..80d49ca1f58 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 { };