From ff910956e9ff28596537c604453c12c4bef5fd44 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 6 Oct 2023 07:17:26 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.kafka=5Flwt:=20disable=20for=20OC?= =?UTF-8?q?aml=20=E2=89=A5=205.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/kafka/default.nix | 2 -- pkgs/development/ocaml-modules/kafka/lwt.nix | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix index 7636942033a9..28c380a4616d 100644 --- a/pkgs/development/ocaml-modules/kafka/default.nix +++ b/pkgs/development/ocaml-modules/kafka/default.nix @@ -5,8 +5,6 @@ buildDunePackage rec { pname = "kafka"; version = "0.5"; - useDune2 = true; - src = fetchurl { url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${version}/kafka-${version}.tbz"; sha256 = "0m9212yap0a00hd0f61i4y4fna3141p77qj3mm7jl1h4q60jdhvy"; diff --git a/pkgs/development/ocaml-modules/kafka/lwt.nix b/pkgs/development/ocaml-modules/kafka/lwt.nix index a6cef66b2761..da931d6e8bff 100644 --- a/pkgs/development/ocaml-modules/kafka/lwt.nix +++ b/pkgs/development/ocaml-modules/kafka/lwt.nix @@ -1,13 +1,18 @@ { buildDunePackage +, ocaml +, lib , kafka , lwt , cmdliner }: +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "kafka_lwt is not available for OCaml ${ocaml.version}" + buildDunePackage rec { pname = "kafka_lwt"; - inherit (kafka) version useDune2 src; + inherit (kafka) version src; buildInputs = [ cmdliner ];