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

Merge pull request #89727 from vbgl/ocaml-sexplib-remove-legacy

Browse Source 
ocamlPackages.sexplib_p4: remove
This commit is contained in:
Benjamin Hipple 2020-06-07 11:31:43 -04:00 committed by GitHub
commit c6a8c32613
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/ocaml-modules/sexplib/108.08.00.nix
View File

@ -1,28 +0,0 @@
{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}:
if !stdenv.lib.versionAtLeast ocaml.version "3.12"
|| stdenv.lib.versionAtLeast ocaml.version "4.03"
then throw "sexlib-108.08.00 is not available for OCaml ${ocaml.version}" else
stdenv.mkDerivation {
name = "ocaml-sexplib-108.08.00";
src = fetchurl {
url = "https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/sexplib-108.08.00.tar.gz";
sha256 = "11z1k1d7dbb5m957klgalimpr0r602xp5zkkbgbffib1bphasarg";
};
buildInputs = [ocaml findlib];
propagatedBuildInputs = [type_conv camlp4];
createFindlibDestdir = true;
meta = with stdenv.lib; {
branch = "108";
homepage = "https://ocaml.janestreet.com/";
description = "Library for serializing OCaml values to and from S-expressions";
license = licenses.asl20;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or [];
};
}

28
pkgs/development/ocaml-modules/sexplib/111.25.00.nix
View File

@ -1,28 +0,0 @@
{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}:
if !stdenv.lib.versionAtLeast ocaml.version "4.00"
|| stdenv.lib.versionAtLeast ocaml.version "4.03"
then throw "sexlib-111.25.00 is not available for OCaml ${ocaml.version}" else
stdenv.mkDerivation {
name = "ocaml-sexplib-111.25.00";
src = fetchurl {
url = "https://ocaml.janestreet.com/ocaml-core/111.25.00/individual/sexplib-111.25.00.tar.gz";
sha256 = "0qh0zqp5nakqpmmhh4x7cg03vqj3j2bj4zj0nqdlksai188p9ila";
};
buildInputs = [ocaml findlib];
propagatedBuildInputs = [type_conv camlp4];
createFindlibDestdir = true;
meta = with stdenv.lib; {
homepage = "https://ocaml.janestreet.com/";
description = "Library for serializing OCaml values to and from S-expressions";
license = licenses.asl20;
maintainers = [ maintainers.vbgl maintainers.ericbmerritt ];
platforms = ocaml.meta.platforms or [];
};
}

25
pkgs/development/ocaml-modules/sexplib/112.24.01.nix
View File

@ -1,25 +0,0 @@
{ stdenv, buildOcaml, fetchurl, ocaml, type_conv, camlp4 }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02"
|| stdenv.lib.versionAtLeast ocaml.version "4.03"
then throw "sexlib-112.24.01 is not available for OCaml ${ocaml.version}" else
buildOcaml rec {
minimumSupportedOcamlVersion = "4.02";
name = "sexplib";
version = "112.24.01";
src = fetchurl {
url = "https://github.com/janestreet/sexplib/archive/${version}.tar.gz";
sha256 = "5f776aee295cc51c952aecd4b74b52dd2b850c665cc25b3d69bc42014d3ba073";
};
propagatedBuildInputs = [ type_conv camlp4 ];
meta = with stdenv.lib; {
homepage = "https://ocaml.janestreet.com/";
description = "Library for serializing OCaml values to and from S-expressions";
license = licenses.asl20;
maintainers = [ maintainers.ericbmerritt ];
};
}

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

@ -770,19 +770,6 @@ let
then type_conv_108_08_00
else null;
sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { };
sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { };
sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { };
sexplib_p4 =
if lib.versionOlder "4.02" ocaml.version
then sexplib_112_24_01
else if lib.versionOlder "4.00" ocaml.version
then sexplib_111_25_00
else if lib.versionOlder "3.12" ocaml.version
then sexplib_108_08_00
else null;
ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { };
ocaml_extlib = callPackage ../development/ocaml-modules/extlib { };
@ -1133,7 +1120,7 @@ let
then janeStreet.sexplib
else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/sexplib.nix {}
else sexplib_p4;
else null;
variantslib =
if lib.versionOlder "4.03" ocaml.version