From 2575346f009f487543d8ca415fe9a411e6273d91 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 21 Oct 2022 08:39:26 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.zmq:=2020180726=20=E2=86=92=205.1?= =?UTF-8?q?.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/zmq/default.nix | 17 +++++++---------- pkgs/development/ocaml-modules/zmq/lwt.nix | 3 ++- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix index 9779004085c..267566d7ba0 100644 --- a/pkgs/development/ocaml-modules/zmq/default.nix +++ b/pkgs/development/ocaml-modules/zmq/default.nix @@ -1,17 +1,14 @@ -{ lib, fetchFromGitHub, buildDunePackage, dune-configurator, czmq, stdint }: +{ lib, fetchurl, buildDunePackage, dune-configurator, czmq, stdint }: buildDunePackage rec { - minimumOCamlVersion = "4.03"; pname = "zmq"; - version = "20180726"; + version = "5.1.5"; - useDune2 = true; + duneVersion = "3"; - src = fetchFromGitHub { - owner = "issuu"; - repo = "ocaml-zmq"; - rev = "d312a8458d6b688f75470248f11875fbbfa5bb1a"; - sha256 = "1f5l4bw78y4drabhyvmpj3z8k30bill33ca7bzhr02m55yf6gqpf"; + src = fetchurl { + url = "https://github.com/issuu/ocaml-zmq/releases/download/${version}/zmq-lwt-${version}.tbz"; + sha256 = "sha256-mUfRPatLPFeSzWDwCIoFaVl85VkvDch4i6pOn3Kme1Y="; }; buildInputs = [ czmq dune-configurator ]; @@ -22,6 +19,6 @@ buildDunePackage rec { description = "ZeroMQ bindings for OCaml"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ akavel ]; - inherit (src.meta) homepage; + homepage = "https://engineering.issuu.com/ocaml-zmq/"; }; } diff --git a/pkgs/development/ocaml-modules/zmq/lwt.nix b/pkgs/development/ocaml-modules/zmq/lwt.nix index 6717e787f19..f6408933452 100644 --- a/pkgs/development/ocaml-modules/zmq/lwt.nix +++ b/pkgs/development/ocaml-modules/zmq/lwt.nix @@ -2,7 +2,8 @@ buildDunePackage { pname = "zmq-lwt"; - inherit (zmq) version src useDune2 meta; + inherit (zmq) version src meta; + duneVersion = "3"; propagatedBuildInputs = [ zmq ocaml_lwt ]; }