From 3b1cbcc92bbd97b890dde90805e5cae347846f9c Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Wed, 6 Jul 2022 02:21:03 -0300
Subject: [PATCH] ocamlPackages.yaml: 3.0.0 -> 3.1.0 (#180139)

ocamlPackages.ppx_deriving_yaml: 0.1.0 -> 0.1.1
---
 .../ppx_deriving_yaml/default.nix             |  8 +++-----
 .../ocaml-modules/yaml/default.nix            | 20 +++++++++----------
 .../ocaml-modules/yaml/yaml-sexp.nix          |  2 +-
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix
index 0dfd8edd5736..c6a0f6d0af65 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix
@@ -4,15 +4,13 @@
 
 buildDunePackage rec {
   pname = "ppx_deriving_yaml";
-  version = "0.1.0";
-
-  useDune2 = true;
+  version = "0.1.1";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${version}/ppx_deriving_yaml-v${version}.tbz";
-    sha256 = "kdonUD4Y8QhVSAFAafIpXBFPkS4pSScYwJbaWMn/6pA=";
+    url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${version}/ppx_deriving_yaml-${version}.tbz";
+    sha256 = "sha256-nR3568ULM6jaGG4H4+lLBTEJqh/ALHPiJxve40jPUxw=";
   };
 
   propagatedBuildInputs = [ ppxlib ppx_deriving yaml ];
diff --git a/pkgs/development/ocaml-modules/yaml/default.nix b/pkgs/development/ocaml-modules/yaml/default.nix
index 43481e4c7f38..62c8a565c870 100644
--- a/pkgs/development/ocaml-modules/yaml/default.nix
+++ b/pkgs/development/ocaml-modules/yaml/default.nix
@@ -1,24 +1,24 @@
-{ lib, fetchurl, buildDunePackage, ocaml
+{ lib, fetchurl, buildDunePackage
 , dune-configurator
-, bos, ctypes, fmt, logs, rresult
+, bos, ctypes, fmt, logs
 , mdx, alcotest, crowbar, junit_alcotest, ezjsonm
 }:
 
 buildDunePackage rec {
   pname = "yaml";
-  version = "3.0.0";
-
-  useDune2 = true;
+  version = "3.1.0";
 
   src = fetchurl {
-    url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-v${version}.tbz";
-    sha256 = "1iws6lbnrrd5hhmm7lczfvqp0aidx5xn7jlqk2s5rjfmj9qf4j2c";
+    url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-${version}.tbz";
+    sha256 = "sha256-0KngriGEpp5tcgK/43B9EEOdMacSQYYCNLGfAgRS7Mc=";
   };
 
+  minimalOCamlVersion = "4.13";
+
   buildInputs = [ dune-configurator ];
-  propagatedBuildInputs = [ bos ctypes rresult ];
-  # crowbar is not available for OCaml < 4.08
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  propagatedBuildInputs = [ bos ctypes ];
+
+  doCheck = true;
   checkInputs = [ fmt logs mdx.bin alcotest crowbar junit_alcotest ezjsonm ];
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix
index 960361458440..d6cab9cf7f2b 100644
--- a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix
+++ b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix
@@ -3,7 +3,7 @@
 buildDunePackage rec {
   pname = "yaml-sexp";
 
-  inherit (yaml) version src useDune2;
+  inherit (yaml) version src;
 
   propagatedBuildInputs = [ yaml ppx_sexp_conv sexplib ];