From 1777055209e8a44d39144d256dea9a73c1e6bdc9 Mon Sep 17 00:00:00 2001
From: Cedric Cellier <rixed@happyleptic.org>
Date: Tue, 26 Mar 2019 11:04:59 +0100
Subject: [PATCH] ocamlPackages.stdint: 0.5.0 -> 0.5.1

---
 pkgs/development/ocaml-modules/stdint/default.nix | 15 ++++++++-------
 pkgs/development/ocaml-modules/zmq/default.nix    |  4 ----
 .../ocaml-modules/zmq/ocaml-zmq-issue43.patch     | 11 -----------
 3 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch

diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix
index 129f9dd7289..0b8f83a1ea3 100644
--- a/pkgs/development/ocaml-modules/stdint/default.nix
+++ b/pkgs/development/ocaml-modules/stdint/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune }:
 
 stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-stdint-${version}";
-  version = "0.5.0";
+  pname = "stdint";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
+  version = "0.5.1";
   src = fetchFromGitHub {
     owner = "andrenth";
     repo = "ocaml-stdint";
     rev = version;
-    sha256 = "1xjzqq13m7cqrfwa6vcwxirm17w8bx025dgnjqjgd3k2lxfgd1j7";
+    sha256 = "0z2z77m3clna9m9k0f8fd1400cdlglvy1kr893qs3907b3v0c057";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild ];
-  configurePhase = "ocaml setup.ml -configure --prefix $out";
+  buildInputs = [ ocaml findlib dune ];
 
-  createFindlibDestdir = true;
+  buildPhase = "dune build -p ${pname}";
+  inherit (dune) installPhase;
 
   meta = {
     description = "Various signed and unsigned integers for OCaml";
diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix
index 2a186409371..d454d244959 100644
--- a/pkgs/development/ocaml-modules/zmq/default.nix
+++ b/pkgs/development/ocaml-modules/zmq/default.nix
@@ -11,10 +11,6 @@ buildDunePackage rec {
     sha256 = "1f5l4bw78y4drabhyvmpj3z8k30bill33ca7bzhr02m55yf6gqpf";
   };
 
-  patches = [
-    ./ocaml-zmq-issue43.patch
-  ];
-
   buildInputs = [ czmq ];
 
   propagatedBuildInputs = [ stdint ];
diff --git a/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch b/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch
deleted file mode 100644
index 0d01e8b45f3..00000000000
--- a/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/zmq/src/caml_zmq_stubs.c	1970-01-01 01:00:01.000000000 +0100
-+++ source/zmq/src/caml_zmq_stubs.c	1970-01-01 01:00:01.000000000 +0100
-@@ -35,7 +35,7 @@
- #include "socket.h"
- #include "msg.h"
- 
--#include <uint64.h>
-+#include <ocaml_stdint/uint64.h>
- 
- /**
-  * Version