public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86444 from vbgl/ocaml-core_extended-remove-legacy

Browse Source 
ocamlPackages.core_extended: remove at 112.24.00
This commit is contained in:
Jörg Thalheim 2020-05-01 10:01:03 +01:00 committed by GitHub
commit 8cb98f9f71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/development/ocaml-modules/core_extended/default.nix
View File

@ -1,33 +0,0 @@
{stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core_p4, custom_printf,
fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils_p4, re2_p4, sexplib_p4}:
buildOcaml rec {
name = "core_extended";
version = "112.24.00";
minimumSupportedOcamlVersion = "4.02";
src = fetchurl {
url = "https://github.com/janestreet/core_extended/archive/${version}.tar.gz";
sha256 = "f87b0661b6c2cfb545ec61d1cb2ab1b9c4967b6ac14e651de41d3a6fb7f0f1e3";
};
preConfigure = stdenv.lib.optionalString stdenv.isLinux ''
patch lib/extended_unix_stubs.c <<EOF
0a1
> #define _LINUX_QUOTA_VERSION 2
EOF
'';
hasSharedObjects = true;
buildInputs = [ pa_bench pa_test pa_ounit ];
propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4
pipebang textutils_p4 re2_p4 sexplib_p4 ];
meta = with stdenv.lib; {
homepage = "https://github.com/janestreet/core_extended";
description = "Jane Street Capital's standard library overlay";
license = licenses.asl20;
maintainers = [ maintainers.ericbmerritt ];
};
}

28
pkgs/development/ocaml-modules/janestreet/core-extended.nix
View File

@ -1,28 +0,0 @@
{stdenv, buildOcamlJane,
core,
bin_prot, fieldslib, sexplib, typerep, variantslib,
ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
re2, textutils}:
buildOcamlJane {
name = "core_extended";
hash = "1j4ipcn741j8w3h4gpv5sygjzg6b5g6gc2jcrr4n0jyn5dq8b0p5";
propagatedBuildInputs =
[ core bin_prot fieldslib sexplib typerep variantslib
ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane
re2 textutils ];
patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
patch src/extended_unix_stubs.c <<EOF
0a1
> #define _LINUX_QUOTA_VERSION 2
EOF
'';
meta = with stdenv.lib; {
homepage = "https://github.com/janestreet/core_extended";
description = "Jane Street Capital's standard library overlay";
license = licenses.asl20;
maintainers = [ maintainers.maurer maintainers.ericbmerritt ];
};
}

9
pkgs/top-level/ocaml-packages.nix
View File

@ -593,8 +593,6 @@ let
comparelib = callPackage ../development/ocaml-modules/comparelib { }; comparelib = callPackage ../development/ocaml-modules/comparelib { };
core_extended_p4 = callPackage ../development/ocaml-modules/core_extended { };
core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { }; core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { };
core_p4 = callPackage ../development/ocaml-modules/core { }; core_p4 = callPackage ../development/ocaml-modules/core { };
@ -1194,13 +1192,6 @@ let
then callPackage ../development/ocaml-modules/janestreet/textutils.nix {} then callPackage ../development/ocaml-modules/janestreet/textutils.nix {}
else textutils_p4; else textutils_p4;
core_extended =
if lib.versionOlder "4.03" ocaml.version
then janeStreet.core_extended
else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {}
else core_extended_p4;
async_kernel = async_kernel =
if lib.versionOlder "4.03" ocaml.version if lib.versionOlder "4.03" ocaml.version
then janeStreet.async_kernel then janeStreet.async_kernel