From 2813d6194b512b9d5aabdf586b96019863318085 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sat, 13 Nov 2021 22:11:48 -0500
Subject: [PATCH] ocamlPackages.bistro: unstable-2021-07-13 ->
 unstable-2021-11-13

---
 .../ocaml-modules/bistro/default.nix          | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix
index 87ab3d409e0..348d1bb97d4 100644
--- a/pkgs/development/ocaml-modules/bistro/default.nix
+++ b/pkgs/development/ocaml-modules/bistro/default.nix
@@ -15,25 +15,27 @@
 
 buildDunePackage rec {
   pname = "bistro";
-  version = "unstable-2021-07-13";
+  version = "unstable-2021-11-13";
 
   useDune2 = true;
 
   src = fetchFromGitHub {
     owner = "pveber";
     repo = pname;
-    rev = "4ce8d98f34f15ebf63ececccc9c763fec2b5fa6d";
-    sha256 = "sha256:16vxcdsj4dmswgm6igshs3hirz8jrg8l5b2xgcnxxgvsrc9sxljs";
+    rev = "fb285b2c6d8adccda3c71e2293bceb01febd6624";
+    sha256 = "sha256-JChDU1WH8W9Czkppx9SHiVIu9/7QFWJy2A89oksp0Ek=";
   };
 
-  # Fix build with ppxlib 0.23
-  postPatch = ''
-    substituteInPlace ppx/bistro_script.ml \
-      --replace 'Parser.parse_expression' 'Ocaml_common.Parser.parse_expression'
-  '';
-
   propagatedBuildInputs = [
-    base64 bos core lwt_react ocamlgraph ppx_sexp_conv rresult sexplib tyxml
+    base64
+    bos
+    core
+    lwt_react
+    ocamlgraph
+    ppx_sexp_conv
+    rresult
+    sexplib
+    tyxml
   ];
 
   minimalOCamlVersion = "4.12";
@@ -43,7 +45,5 @@ buildDunePackage rec {
     description = "Build and execute typed scientific workflows";
     maintainers = [ lib.maintainers.vbgl ];
     license = lib.licenses.gpl2;
-    # ppx-related build failure; see https://github.com/pveber/bistro/issues/49:
-    broken = lib.versionAtLeast ocaml.version "4.13";
   };
 }