From e1b9556f87ba339b2cee43905286ab559e5fc402 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 30 Sep 2019 19:57:19 +0000
Subject: [PATCH] =?UTF-8?q?ocamlPackages.ocsigen=5Fserver:=202.11.0=20?=
 =?UTF-8?q?=E2=86=92=202.15.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ocamlPackages.ssl: 0.5.5 → 0.5.9
---
 .../ocaml-modules/ocsigen-server/default.nix  |  4 +--
 .../development/ocaml-modules/ssl/default.nix | 26 ++++++++-----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index df484b230c2..426fecf3915 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -13,14 +13,14 @@ let mkpath = p: n:
 in
 
 stdenv.mkDerivation rec {
-  version = "2.11.0";
+  version = "2.15.0";
   pname = "ocsigenserver";
 
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "ocsigenserver";
     rev = version;
-    sha256 = "0y1ngki7w9s10ip7nj9qb7254bd5sp01xxz16sxyj7l7qz603hy2";
+    sha256 = "15qdkxcbl9c1bbn0fh9awjw0hjn7r6awcn288a9vyxln7icdbifw";
   };
 
   buildInputs = [ which makeWrapper ocaml findlib
diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index b24d799cf28..5ee77425a2f 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -1,29 +1,25 @@
-{ stdenv, fetchzip, which, openssl, ocaml, findlib }:
+{ lib, buildDunePackage, fetchFromGitHub, pkg-config, openssl }:
 
-stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-ssl-${version}";
-  version = "0.5.5";
+buildDunePackage rec {
+  pname = "ssl";
+  version = "0.5.9";
 
-  src = fetchzip {
-    url = "https://github.com/savonet/ocaml-ssl/releases/download/${version}/ocaml-ssl-${version}.tar.gz";
-    sha256 = "0j5zvsx51dg5r7sli7bakv7gfd29z890h0xzi876pg9vywwz9w7l";
+  src = fetchFromGitHub {
+    owner = "savonet";
+    repo = "ocaml-ssl";
+    rev = version;
+    sha256 = "04h02rvzrwp886n5hsx84rnc9b150iggy38g5v1x1rwz3pkdnmf0";
   };
 
-  buildInputs = [which ocaml findlib];
-
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [openssl];
 
-  dontAddPrefix = true;
-
-  createFindlibDestdir = true;
-
   meta = {
     homepage = http://savonet.rastageeks.org/;
     description = "OCaml bindings for libssl ";
     license = "LGPL+link exception";
-    platforms = ocaml.meta.platforms or [];
     maintainers = [
-      stdenv.lib.maintainers.z77z
+      lib.maintainers.z77z
     ];
   };
 }