diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix deleted file mode 100644 index a808975d250e..000000000000 --- a/pkgs/development/ocaml-modules/core/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, buildOcaml, fetchurl, type_conv, - core_kernel_p4, bin_prot_p4, comparelib, custom_printf, enumerate, - fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, - pipebang, sexplib_p4, typerep_p4, variantslib_p4}: - -buildOcaml rec { - name = "core"; - version = "112.24.01"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/core/archive/${version}.tar.gz"; - sha256 = "be5d53ebd4fd04ef23ebf9b3b2840c7aeced6bc4cc6cd3f5e89f71c9949000f4"; - }; - - hasSharedObjects = true; - - buildInputs = [ pa_bench pa_test pa_ounit ]; - propagatedBuildInputs = [ type_conv core_kernel_p4 bin_prot_p4 comparelib - custom_printf enumerate fieldslib_p4 herelib - pipebang sexplib_p4 typerep_p4 variantslib_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/core"; - description = "Jane Street Capital's standard library overlay"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/core.nix b/pkgs/development/ocaml-modules/janestreet/core.nix deleted file mode 100644 index ac62bc51b070..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/core.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, buildOcamlJane, - core_kernel, - bin_prot, fieldslib, sexplib, typerep, variantslib, - ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: - -buildOcamlJane { - name = "core"; - hash = "0nz6d5glgymbpchvcpw77yis9jgi2bll32knzy9vx99wn83zdrmd"; - propagatedBuildInputs = - [ core_kernel bin_prot fieldslib sexplib typerep variantslib - ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/core"; - description = "Jane Street Capital's standard library overlay"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7db3335f6a1a..821166fca92f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -591,8 +591,6 @@ let core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { }; - core_p4 = callPackage ../development/ocaml-modules/core { }; - ocamlbuild = if lib.versionOlder "4.03" ocaml.version then callPackage ../development/tools/ocaml/ocamlbuild { } @@ -1169,13 +1167,6 @@ let then callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {} else core_kernel_p4; - core = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.core - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/core.nix {} - else core_p4; - async_rpc_kernel = if lib.versionOlder "4.03" ocaml.version then janeStreet.async_rpc_kernel