Unverified Commit c444dfac authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

OCaml: default to version 5.3 (#397478)

parents 133e2ad7 6ee239aa

pkgs/development/ocaml-modules/cohttp/async.nix

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ buildDunePackage { 
    src

    ;



  duneVersion = "3";

  minimalOCamlVersion = "4.14";



  buildInputs = [ ppx_sexp_conv ];

pkgs/development/ocaml-modules/eliom/default.nix

+52 −47
Original line number Diff line number Diff line 
{

  buildDunePackage,

  lib,

  ocaml,

  fetchFromGitHub,

  which,

  ocsigen_server,
@@ -16,7 +17,11 @@ 
  ocsipersist,

}:



buildDunePackage rec {

lib.throwIf (lib.versionAtLeast ocaml.version "5.3")

  "eliom is not available for OCaml ${ocaml.version}"



  buildDunePackage

  rec {

    pname = "eliom";

    version = "11.1.1";

pkgs/development/ocaml-modules/janestreet/0.17.nix

+1 −0
Original line number Diff line number Diff line
@@ -1975,6 +1975,7 @@ with self; 
    pname = "virtual_dom";

    hash = "sha256-5T+/N1fELa1cR9mhWLUgS3Fwr1OQXJ3J6T3YaHT9q7U=";

    meta.description = "OCaml bindings for the virtual-dom library";

    meta.broken = lib.versionAtLeast ocaml.version "5.3";

    buildInputs = [ js_of_ocaml-ppx ];

    propagatedBuildInputs = [

      base64

pkgs/development/ocaml-modules/kafka/default.nix

+23 −18
Original line number Diff line number Diff line 
{

  lib,

  fetchurl,

  ocaml,

  buildDunePackage,

  rdkafka,

  zlib,

}:



buildDunePackage rec {

lib.throwIf (lib.versionAtLeast ocaml.version "5.0")

  "kafka is not available for OCaml ${ocaml.version}"



  buildDunePackage

  rec {

    pname = "kafka";

    version = "0.5";

pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ lib.throwIf 
  (

    lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23"

    || lib.versionAtLeast ocaml.version "5.2" && !lib.versionAtLeast version "0.26.2"

    || lib.versionAtLeast ocaml.version "5.3" && !lib.versionAtLeast version "0.27"

  )

  "ocamlformat ${version} is not available for OCaml ${ocaml.version}"