From 0cadf9c028a7a640d96526442ae690d744ee0ce4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 7 Jun 2020 10:11:23 +0200 Subject: [PATCH 1/3] ocamlPackages.sexplib_108_08_00: remove at 108.08.00 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a legacy version for OCaml ≤ 4.02 --- .../ocaml-modules/sexplib/108.08.00.nix | 28 ------------------- pkgs/top-level/ocaml-packages.nix | 3 -- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/sexplib/108.08.00.nix diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix deleted file mode 100644 index 349dffcf47b3..000000000000 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ /dev/null @@ -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 []; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e0ac6f08b9d4..698f0a8a29dc 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -770,7 +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 { }; @@ -779,8 +778,6 @@ let 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 { }; From f4a7f9f4991d2ff321f84a2b6e7a323a61e88a0c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 7 Jun 2020 10:11:27 +0200 Subject: [PATCH 2/3] ocamlPackages.sexplib_111_25_00: remove at 111.25.00 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a legacy version for OCaml ≤ 4.02 --- .../ocaml-modules/sexplib/111.25.00.nix | 28 ------------------- pkgs/top-level/ocaml-packages.nix | 3 -- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/sexplib/111.25.00.nix diff --git a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix deleted file mode 100644 index adf878bca030..000000000000 --- a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix +++ /dev/null @@ -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 []; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 698f0a8a29dc..ac78eab4a94e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -770,14 +770,11 @@ let then type_conv_108_08_00 else null; - 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 null; ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; From cb6ffc170b86c2725a91243b8e02e9bb54ceb929 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 7 Jun 2020 10:11:31 +0200 Subject: [PATCH 3/3] ocamlPackages.sexplib_112_24_01: remove at 112.24.01 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a legacy version for OCaml ≤ 4.02 --- .../ocaml-modules/sexplib/112.24.01.nix | 25 ------------------- pkgs/top-level/ocaml-packages.nix | 9 +------ 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/sexplib/112.24.01.nix diff --git a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix deleted file mode 100644 index fe7b9020dae2..000000000000 --- a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ac78eab4a94e..87d67e5e8e65 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -770,13 +770,6 @@ let then type_conv_108_08_00 else null; - 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 null; - ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; ocaml_extlib = callPackage ../development/ocaml-modules/extlib { }; @@ -1127,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