public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dune.nix: Include dune version in warning when dune is not supported

Browse Source 
as dune 1 and dune 2 have different version ranges here
This commit is contained in:
Joachim Breitner 2021-05-19 11:51:35 +02:00 committed by Vincent Laporte
parent e62ec73827
commit 41b485f7c4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/ocaml/dune/1.nix
View File

@ -2,7 +2,7 @@
if !lib.versionAtLeast ocaml.version "4.02" if !lib.versionAtLeast ocaml.version "4.02"
|| lib.versionAtLeast ocaml.version "4.12" || 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 else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/development/tools/ocaml/dune/2.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, ocaml, findlib }: { lib, stdenv, fetchurl, ocaml, findlib }:
if lib.versionOlder ocaml.version "4.08" 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 else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {