From efd2b3f315561872718d8dae57cbf03a484c356c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 30 Nov 2021 10:21:35 +0100 Subject: [PATCH] ocamlPackages.fieldslib: remove at 109.20.03 & 113.33.03 --- .../ocaml-modules/fieldslib/default.nix | 30 ------------------- .../ocaml-modules/janestreet/fieldslib.nix | 19 ------------ pkgs/top-level/ocaml-packages.nix | 9 ------ 3 files changed, 58 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/fieldslib/default.nix delete mode 100644 pkgs/development/ocaml-modules/janestreet/fieldslib.nix diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix deleted file mode 100644 index 4d3c369d4327..000000000000 --- a/pkgs/development/ocaml-modules/fieldslib/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: - -assert lib.versionOlder "4.00" (lib.getVersion ocaml); - -if lib.versionAtLeast ocaml.version "4.06" -then throw "fieldslib-109.20.03 is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - pname = "ocaml-fieldslib"; - version = "109.20.03"; - - src = fetchurl { - url = "https://ocaml.janestreet.com/ocaml-core/${lib.versions.majorMinor version}.00/individual/fieldslib-${version}.tar.gz"; - sha256 = "1dkzk0wf26rhvji80dz1r56dp6x9zqrnp87wldd4pj56jli94vir"; - }; - - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ type_conv camlp4 ]; - - createFindlibDestdir = true; - - meta = with lib; { - homepage = "https://ocaml.janestreet.com/"; - description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; - license = licenses.asl20; - maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or [ ]; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix deleted file mode 100644 index 15dee416b643..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, type_conv, buildOcamlJane }: - -buildOcamlJane { - pname = "fieldslib"; - version = "113.33.03"; - - minimumSupportedOcamlVersion = "4.02"; - - hash = "0mkbix32f8sq32q81hb10z2q31bw5f431jxv0jafbdrif0vr6xqd"; - - propagatedBuildInputs = [ type_conv ]; - - meta = with lib; { - homepage = "https://ocaml.janestreet.com/"; - description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.vbgl ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d719a965b623..5974d89187b7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -389,8 +389,6 @@ let fiat-p256 = callPackage ../development/ocaml-modules/fiat-p256 { }; - fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { }; - fileutils = callPackage ../development/ocaml-modules/fileutils { }; findlib = callPackage ../development/tools/ocaml/findlib { }; @@ -1589,13 +1587,6 @@ let then callPackage ../development/ocaml-modules/janestreet/typerep.nix {} else typerep_p4; - fieldslib = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.fieldslib - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {} - else fieldslib_p4; - sexplib = if lib.versionOlder "4.03" ocaml.version then janeStreet.sexplib