From b28b8118f2b528f236133ffef79d0ad693f320a2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 8 Dec 2022 07:20:52 +0100
Subject: [PATCH] =?UTF-8?q?ocamlPackages.sha:=201.15.1=20=E2=86=92=201.15.?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/compilers/haxe/default.nix       |  4 ++--
 .../ocaml-modules/plotkicadsch/default.nix        |  1 +
 pkgs/development/ocaml-modules/sha/default.nix    | 15 ++++++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index 58370c1a15a2..a05c59a6ef87 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -11,7 +11,7 @@ let
       ptmap
       camlp5
       sha
-      dune_2
+      dune_3
       luv
       extlib
     ] else if lib.versionAtLeast version "4.0"
@@ -23,7 +23,7 @@ let
       ptmap
       camlp5
       sha
-      dune_2
+      dune_3
       luv
       extlib-1-7-7
     ] else with ocaml-ng.ocamlPackages_4_05; [
diff --git a/pkgs/development/ocaml-modules/plotkicadsch/default.nix b/pkgs/development/ocaml-modules/plotkicadsch/default.nix
index e08fcdfeb2f3..27b3a0ac5ee7 100644
--- a/pkgs/development/ocaml-modules/plotkicadsch/default.nix
+++ b/pkgs/development/ocaml-modules/plotkicadsch/default.nix
@@ -17,6 +17,7 @@
 
 buildDunePackage rec {
   pname = "plotkicadsch";
+  duneVersion = "3";
 
   inherit (kicadsch) src version;
 
diff --git a/pkgs/development/ocaml-modules/sha/default.nix b/pkgs/development/ocaml-modules/sha/default.nix
index 4cbb658b6549..4d400d32844a 100644
--- a/pkgs/development/ocaml-modules/sha/default.nix
+++ b/pkgs/development/ocaml-modules/sha/default.nix
@@ -1,25 +1,22 @@
-{ lib, fetchurl, buildDunePackage, stdlib-shims, dune-configurator, ounit }:
+{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit2 }:
 
 buildDunePackage rec {
   pname = "sha";
-  version = "1.15.1";
+  version = "1.15.2";
+  duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/djs55/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
-    sha256 = "sha256-cRtjydvwgXgimi6F3C48j7LrWgfMO6m9UJKjKlxvp0Q=";
+    url = "https://github.com/djs55/ocaml-${pname}/releases/download/${version}/${pname}-${version}.tbz";
+    hash = "sha256-P71Xs5p8QAaOtBrh7MuhQJOL6144BqTLvXlZOyGD/7c=";
   };
 
-  useDune2 = true;
-
-  buildInputs = [ dune-configurator ];
-
   propagatedBuildInputs = [
     stdlib-shims
   ];
 
   doCheck = true;
   checkInputs = [
-    ounit
+    ounit2
   ];
 
   meta = with lib; {