nixpkgs: merge nixos-unstable

1 files changed, 8 insertions, 4 deletions

diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix
index 83146ef9104b..ee0c3b5b00cc 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,21 +1,25 @@
 { lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml
-, cppo, ocaml-migrate-parsetree, ocplib-endian, result
+, cppo, dune-configurator, ocaml-migrate-parsetree, ocplib-endian, result
 , mmap, seq
+, ocaml-syntax-shims
 }:
 
 let inherit (lib) optional versionAtLeast; in
 
 buildDunePackage rec {
   pname = "lwt";
-  version = "5.3.0";
+  version = "5.4.0";
+
+  useDune2 = true;
 
   src = fetchzip {
     url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz";
-    sha256 = "15hgy3220m2b8imipa514n7l65m1h5lc6l1hanqwwvs7ghh2aqp2";
+    sha256 = "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d";
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ cppo ocaml-migrate-parsetree ]
+  buildInputs = [ cppo dune-configurator ocaml-migrate-parsetree ]
+   ++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims
    ++ optional (!versionAtLeast ocaml.version "4.07") ncurses;
   propagatedBuildInputs = [ libev mmap ocplib-endian seq result ];