From 222002fe198ed83e24d8925c33d7f76ce3fe7a1b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 7 Apr 2023 11:06:48 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.lwt=5Fssl:=201.1.3=20=E2=86=92=20?= =?UTF-8?q?1.2.0=20(#225107)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ocamlPackages.lwt_ssl: 1.1.3 → 1.2.0 * ocamlPackages.ssl: use Dune 3 --- pkgs/development/ocaml-modules/lwt_ssl/default.nix | 14 +++++++------- pkgs/development/ocaml-modules/ssl/default.nix | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/pkgs/development/ocaml-modules/lwt_ssl/default.nix index c33f623529a6..7b74d92c2e50 100644 --- a/pkgs/development/ocaml-modules/lwt_ssl/default.nix +++ b/pkgs/development/ocaml-modules/lwt_ssl/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, buildDunePackage, ssl, lwt }: +{ lib, fetchurl, buildDunePackage, ssl, lwt }: buildDunePackage rec { pname = "lwt_ssl"; - version = "1.1.3"; + version = "1.2.0"; - src = fetchFromGitHub { - owner = "aantron"; - repo = "lwt_ssl"; - rev = version; - sha256 = "sha256-d/jkTI/D2LVi9nrndRGgqg6ca1FcmRKknR7YXyA7gWw="; + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/ocsigen/lwt_ssl/releases/download/${version}/lwt_ssl-${version}.tbz"; + hash = "sha256-swIK0nrs83fhw/J0Cgizbcu6mR+EMGZRE1dBBUiImnc="; }; propagatedBuildInputs = [ ssl lwt ]; diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 7eca606f93fc..67e841ae1b31 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -12,6 +12,8 @@ buildDunePackage rec { pname = "ssl"; version = "0.5.13"; + duneVersion = "3"; + src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ssl";