diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-04-27 17:00:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 17:00:54 +0100 |
| commit | 32e4d072a0d8d378d9c3a18a94541c1d320bad61 (patch) | |
| tree | 6238f8624a02cbaf0adb2385954ff44449877093 /pkgs | |
| parent | 1dddfb24c9449d673dbfdca4fdf4bdf87a7e7445 (diff) | |
| parent | 05db4f4fb9ba55662783bae84f7d936326141f30 (diff) | |
Merge pull request #85987 from vbgl/ocaml-async_shell-remove-legacy
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/ocaml-modules/async_shell/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 5 |
2 files changed, 0 insertions, 27 deletions
diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix deleted file mode 100644 index 62b64a492d6f..000000000000 --- a/pkgs/development/ocaml-modules/async_shell/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_p4, core_p4, core_extended_p4}: - -buildOcaml rec { - name = "async_shell"; - version = "109.28.03"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_shell/archive/${version}.tar.gz"; - sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105"; - }; - - propagatedBuildInputs = [ async_p4 core_p4 core_extended_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_shell"; - description = "Shell helpers for Async"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 14664fbedd7e..d75b8bc6a2a9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -45,11 +45,6 @@ let async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { }; - async_shell = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_shell - else callPackage ../development/ocaml-modules/async_shell { }; - async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; async_p4 = |