Unverified Commit cd171221 authored by Vincent Laporte's avatar Vincent Laporte Committed by GitHub
Browse files

ocamlPackages.lwt: 5.9.2 → 6.1.1 (#499045)

parents 1807e060 0ee76240

pkgs/development/ocaml-modules/conduit/lwt-unix.nix

+2 −1
Original line number Diff line number Diff line 
{

  lib,

  buildDunePackage,

  conduit-lwt,

  ppx_sexp_conv,
@@ -30,7 +31,7 @@ buildDunePackage { 
    lwt_ssl

  ];



  doCheck = true;

  doCheck = !lib.versionAtLeast lwt.version "6.0.0";

  checkInputs = [

    lwt_log

    ssl

pkgs/development/ocaml-modules/lambda-term/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
  fetchFromGitHub,

  buildDunePackage,

  zed,

  lwt_log,

  lwt_react,

  mew_vi,

  uucp,
@@ -23,7 +22,6 @@ buildDunePackage (finalAttrs: { 


  propagatedBuildInputs = [

    zed

    lwt_log

    lwt_react

    mew_vi

    uucp

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

+2 −3
Original line number Diff line number Diff line
@@ -7,15 +7,13 @@ 
  dune-configurator,

  ocplib-endian,

  ppxlib,

  version ? if lib.versionAtLeast ppxlib.version "0.36" then "5.9.2" else "5.9.1",

  version ? if lib.versionAtLeast ppxlib.version "0.36" then "6.1.1" else "5.9.1",

}:



buildDunePackage {

  pname = "lwt";

  inherit version;



  minimalOCamlVersion = "4.08";



  src = fetchFromGitHub {

    owner = "ocsigen";

    repo = "lwt";
@@ -24,6 +22,7 @@ buildDunePackage { 
      {

        "5.9.1" = "sha256-oPYLFugMTI3a+hmnwgUcoMgn5l88NP1Roq0agLhH/vI=";

        "5.9.2" = "sha256-pzowRN1wwaF2iMfMPE7RCtA2XjlaXC3xD0yznriVfu8=";

        "6.1.1" = "sha256-EMlA+mh66bfVNqDcmuaW7GoEEu6xQhCRjZx7t7pHuGo=";

      }

      ."${version}";

  };

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

+6 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  buildDunePackage,

  fetchurl,

  fetchpatch,

  eio,

  lwt,

}:
@@ -16,6 +17,11 @@ buildDunePackage rec { 
    hash = "sha256-dlJnhHh4VNO60NZJZqc1HS8wPR95WhdeBJTK37pPbCE=";

  };



  patches = lib.optional (lib.versionAtLeast lwt.version "6.0.0") (fetchpatch {

    url = "https://github.com/ocaml-multicore/lwt_eio/commit/5f8bf1e7af33590683ee45151894d7b9a20607f0.patch";

    hash = "sha256-5A3Bh+xOXo79Rw145hYqYv42li30M0TKLW+qu/dC0KQ=";

  });



  propagatedBuildInputs = [

    eio

    lwt

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

+6 −7
Original line number Diff line number Diff line
@@ -5,17 +5,15 @@ 
  lwt,

}:



buildDunePackage rec {

buildDunePackage (finalAttrs: {

  pname = "lwt_log";

  version = "1.1.2";



  minimalOCamlVersion = "4.03";



  src = fetchFromGitHub {

    owner = "aantron";

    repo = pname;

    rev = version;

    sha256 = "sha256-ODTD3KceEnrEzD01CeuNg4BNKOtKZEpYaDIB+RIte1U=";

    repo = "lwt_log";

    tag = finalAttrs.version;

    hash = "sha256-ODTD3KceEnrEzD01CeuNg4BNKOtKZEpYaDIB+RIte1U=";

  };



  propagatedBuildInputs = [ lwt ];
@@ -25,5 +23,6 @@ buildDunePackage rec { 
    homepage = "https://github.com/aantron/lwt_log";

    license = lib.licenses.lgpl21;

    maintainers = [ lib.maintainers.vbgl ];

    broken = lib.versionAtLeast lwt.version "6.0.0";

  };

}
 
})