Unverified Commit 558e80e9 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

Merge pull request #259327 from vbgl/ocaml-lwt-5.7.0

ocamlPackages.lwt: 5.6.1 → 5.7.0
parents 0b48455b fa23afc1
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
{ buildDunePackage, containers
, ocaml
, dune-configurator
, gen, iter, qcheck-core
, mdx
@@ -7,7 +8,9 @@
buildDunePackage {
  pname = "containers-data";

  inherit (containers) src version doCheck;
  inherit (containers) src version;

  doCheck = containers.doCheck && ocaml.meta.branch != "5.0";

  buildInputs = [ dune-configurator ];
  nativeCheckInputs = [ mdx.bin ];
+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ buildDunePackage rec {
  pname = "kafka";
  version = "0.5";

  useDune2 = true;

  src = fetchurl {
    url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${version}/kafka-${version}.tbz";
    sha256 = "0m9212yap0a00hd0f61i4y4fna3141p77qj3mm7jl1h4q60jdhvy";
+6 −1
Original line number Diff line number Diff line
{ buildDunePackage
, ocaml
, lib
, kafka
, lwt
, cmdliner
}:

lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
  "kafka_lwt is not available for OCaml ${ocaml.version}"

buildDunePackage rec {
  pname = "kafka_lwt";

  inherit (kafka) version useDune2 src;
  inherit (kafka) version src;

  buildInputs = [ cmdliner ];

+2 −9
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@

buildDunePackage rec {
  pname = "lwt";
  version = "5.6.1";
  version = "5.7.0";

  minimalOCamlVersion = "4.08";

@@ -12,16 +12,9 @@ buildDunePackage rec {
    owner = "ocsigen";
    repo = "lwt";
    rev = version;
    sha256 = "sha256-XstKs0tMwliCyXnP0Vzi5WC27HKJGnATUYtbbQmH1TE=";
    hash = "sha256-o0wPK6dPdnsr/LzwcSwbIGcL85wkDjdFuEcAxuS/UEs=";
  };

  postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "5.0") ''
    substituteInPlace src/core/dune \
      --replace "(libraries bytes)" ""
    substituteInPlace src/unix/dune \
      --replace "libraries bigarray lwt" "libraries lwt"
  '';

  nativeBuildInputs = [ cppo ];
  buildInputs = [ dune-configurator ];
  propagatedBuildInputs = [ libev ocplib-endian ];