From 41b485f7c4aba8b9f8c1d29387194b09b344085e Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Wed, 19 May 2021 11:51:35 +0200 Subject: [PATCH] dune.nix: Include dune version in warning when dune is not supported as dune 1 and dune 2 have different version ranges here --- pkgs/development/tools/ocaml/dune/1.nix | 2 +- pkgs/development/tools/ocaml/dune/2.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/1.nix b/pkgs/development/tools/ocaml/dune/1.nix index a16b3ab23f2..ad908787911 100644 --- a/pkgs/development/tools/ocaml/dune/1.nix +++ b/pkgs/development/tools/ocaml/dune/1.nix @@ -2,7 +2,7 @@ if !lib.versionAtLeast ocaml.version "4.02" || lib.versionAtLeast ocaml.version "4.12" -then throw "dune is not available for OCaml ${ocaml.version}" +then throw "dune 1 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index f1365792fbc..2acc7e5bdf3 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, ocaml, findlib }: if lib.versionOlder ocaml.version "4.08" -then throw "dune is not available for OCaml ${ocaml.version}" +then throw "dune 2 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec {