From 1ddbc47dc7439f50d12e8daabd01efaa78320e39 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 28 Mar 2022 07:21:51 +0200 Subject: [PATCH] ocamlPackages.type_conv: remove at 108.08.00, 109.60.01, 113.00.02 --- .../ocaml-modules/type_conv/108.08.00.nix | 31 ------------------ .../ocaml-modules/type_conv/109.60.01.nix | 32 ------------------- .../ocaml-modules/type_conv/112.01.01.nix | 26 --------------- pkgs/top-level/ocaml-packages.nix | 12 ------- 4 files changed, 101 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/type_conv/108.08.00.nix delete mode 100644 pkgs/development/ocaml-modules/type_conv/109.60.01.nix delete mode 100644 pkgs/development/ocaml-modules/type_conv/112.01.01.nix diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix deleted file mode 100644 index fb3977223f7e..000000000000 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, camlp4 }: - -if !lib.versionAtLeast ocaml.version "3.12" - || lib.versionAtLeast ocaml.version "4.03" -then throw "type_conv-108.08.00 is not available for OCaml ${ocaml.version}" else - -stdenv.mkDerivation rec { - pname = "ocaml-type_conv"; - version = "108.08.00"; - - src = fetchurl { - url = "https://ocaml.janestreet.com/ocaml-core/${version}/individual/type_conv-${version}.tar.gz"; - sha256 = "08ysikwwp69zvc147lzzg79nwlrzrk738rj0ggcfadi8h5il42sl"; - }; - - nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ camlp4 ]; - - strictDeps = true; - - createFindlibDestdir = true; - - meta = with lib; { - homepage = "https://ocaml.janestreet.com/"; - description = "Support library for OCaml preprocessor type conversions"; - license = licenses.asl20; - branch = "108"; - platforms = ocaml.meta.platforms or [ ]; - maintainers = with maintainers; [ maggesi ]; - }; -} diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix deleted file mode 100644 index 1f6500c6ed17..000000000000 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, camlp4 }: - -if !lib.versionAtLeast ocaml.version "4.00" - || lib.versionAtLeast ocaml.version "4.03" -then throw "type_conv-109.60.01 is not available for OCaml ${ocaml.version}" else - -stdenv.mkDerivation rec { - pname = "ocaml-type_conv"; - version = "109.60.01"; - - src = fetchFromGitHub { - owner = "janestreet"; - repo = "type_conv"; - rev = version; - sha256 = "sha256-8Oz/fPL3+RghyxQp5u6seSEdf0BgfP6XNcsMYty0rNs="; - }; - - nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ camlp4 ]; - - strictDeps = true; - - createFindlibDestdir = true; - - meta = { - homepage = "http://forge.ocamlcore.org/projects/type-conv/"; - description = "Support library for OCaml preprocessor type conversions"; - license = lib.licenses.lgpl21; - platforms = ocaml.meta.platforms or [ ]; - maintainers = with lib.maintainers; [ maggesi ]; - }; -} diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix deleted file mode 100644 index 468b872ec3d0..000000000000 --- a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, fetchFromGitHub, buildOcaml, camlp4}: - -buildOcaml rec { - minimumSupportedOcamlVersion = "4.02"; - - pname = "type_conv"; - version = "113.00.02"; - - src = fetchFromGitHub { - owner = "janestreet"; - repo = "type_conv"; - rev = version; - sha256 = "sha256-HzH0hnceCQ2kDRATjl+tfKk3XSBDsGnPzVUGYpDQUmU="; - }; - - strictDeps = true; - - buildInputs = [ camlp4 ]; - - meta = { - homepage = "https://github.com/janestreet/type_conv/"; - description = "Support library for preprocessor type conversions"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ maggesi ericbmerritt ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6e38e07ff3b6..255ba4eb4784 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1138,18 +1138,6 @@ let inherit (pkgs.python3Packages) pytorch; }; - type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; - type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; - type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { }; - type_conv = - if lib.versionOlder "4.02" ocaml.version - then type_conv_112_01_01 - else if lib.versionOlder "4.00" ocaml.version - then type_conv_109_60_01 - else if lib.versionOlder "3.12" ocaml.version - then type_conv_108_08_00 - else null; - ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; ocaml_extlib = ocaml_extlib-1-7-8;