about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/development/ocaml-modules/async_extra/default.nix26
-rw-r--r--pkgs/development/ocaml-modules/janestreet/async-extra.nix17
-rw-r--r--pkgs/top-level/ocaml-packages.nix9
3 files changed, 0 insertions, 52 deletions
diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix
deleted file mode 100644
index 53be875f4f31..000000000000
--- a/pkgs/development/ocaml-modules/async_extra/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{stdenv, buildOcaml, fetchurl, async_kernel_p4, async_unix_p4,
- bin_prot_p4, core_p4, custom_printf, fieldslib_p4, herelib, pa_ounit,
- pipebang, pa_test, sexplib_p4}:
-
-buildOcaml rec {
-  name = "async_extra";
-  version = "112.24.00";
-
-  minimumSupportedOcamlVersion = "4.02";
-
-  src = fetchurl {
-    url = "https://github.com/janestreet/async_extra/archive/${version}.tar.gz";
-    sha256 = "51f6f67a9ad56fe5dcf09faeeca6ec2fea53a7a975a72bc80504b90841212e28";
-  };
-
-  buildInputs = [ pa_test pa_ounit ];
-  propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 core_p4 bin_prot_p4 custom_printf
-                            fieldslib_p4 herelib pipebang sexplib_p4 ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/janestreet/async_extra";
-    description = "Jane Street Capital's asynchronous execution library (extra)";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ericbmerritt ];
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix
deleted file mode 100644
index 3de02437dd97..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/async-extra.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, buildOcamlJane, async_kernel, async_unix,
- bin_prot, core, ppx_custom_printf, fieldslib, herelib,
- pipebang, sexplib, async_rpc_kernel}:
-
-buildOcamlJane {
-  name = "async_extra";
-  hash = "1xdwab19fycr4cdm3dh9vmx42f8lvf9s4f9pjgdydxfrm7yzyrfh";
-  propagatedBuildInputs = [ async_kernel async_unix core bin_prot ppx_custom_printf
-                            fieldslib herelib pipebang sexplib async_rpc_kernel ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/janestreet/async_extra";
-    description = "Jane Street Capital's asynchronous execution library (extra)";
-    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 033e9239d3b4..26d2d9fed47a 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -36,8 +36,6 @@ let
 
     astring = callPackage ../development/ocaml-modules/astring { };
 
-    async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { };
-
     async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { };
 
     async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { };
@@ -1187,13 +1185,6 @@ let
       then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {}
       else async_unix_p4;
 
-    async_extra =
-      if lib.versionOlder "4.03" ocaml.version
-      then janeStreet.async_extra
-      else if lib.versionOlder "4.02" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {}
-      else async_extra_p4;
-
     # Apps / from all-packages
 
     ocamlnat = callPackage  ../development/ocaml-modules/ocamlnat { };