Skip to content

Commit

Permalink
dune_2: 2.6.2 -> 2.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
marsam authored and vbgl committed Aug 24, 2020
1 parent 6072bac commit 548bd1e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Expand Up @@ -7,7 +7,7 @@ buildDunePackage rec {

inherit (dune_2) src version;

minimumOCamlVersion = "4.07";
minimumOCamlVersion = "4.08";

dontAddPrefix = true;

Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/tools/ocaml/dune/2.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, ocaml, findlib }:

if stdenv.lib.versionOlder ocaml.version "4.07"
if stdenv.lib.versionOlder ocaml.version "4.08"
then throw "dune is not available for OCaml ${ocaml.version}"
else

stdenv.mkDerivation rec {
pname = "dune";
version = "2.6.2";
version = "2.7.0";

src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
sha256 = "1sc8ax198z42vhc3l6i04kknm9g44whifjivs19qgi3sybrw2vjg";
sha256 = "058wiyncczbmlfxj3cnwn5n68wkmbaf4mgjm2bkp2hffpn2wl5xl";
};

buildInputs = [ ocaml findlib ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/ocaml-packages.nix
Expand Up @@ -220,7 +220,7 @@ let
dune = callPackage ../development/tools/ocaml/dune { };

dune_2 =
if lib.versionAtLeast ocaml.version "4.07"
if lib.versionAtLeast ocaml.version "4.08"
then callPackage ../development/tools/ocaml/dune/2.nix { }
else if lib.versionAtLeast ocaml.version "4.02"
then pkgs.dune_2
Expand Down

0 comments on commit 548bd1e

Please sign in to comment.