diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-08-13 21:08:00 -0500 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2020-08-24 11:43:13 +0200 |
| commit | 548bd1e04f97ad4fb27953e5c580e6a159e74a82 (patch) | |
| tree | 8106e7d1ac38d290d7f2752f9f91bf09d72a208b /pkgs | |
| parent | 6072bac139d421e84de0032ef0a3e9f3db257803 (diff) | |
| download | nixpkgs-548bd1e04f97ad4fb27953e5c580e6a159e74a82.tar nixpkgs-548bd1e04f97ad4fb27953e5c580e6a159e74a82.tar.gz nixpkgs-548bd1e04f97ad4fb27953e5c580e6a159e74a82.tar.bz2 nixpkgs-548bd1e04f97ad4fb27953e5c580e6a159e74a82.tar.lz nixpkgs-548bd1e04f97ad4fb27953e5c580e6a159e74a82.tar.xz nixpkgs-548bd1e04f97ad4fb27953e5c580e6a159e74a82.tar.zst nixpkgs-548bd1e04f97ad4fb27953e5c580e6a159e74a82.zip | |
dune_2: 2.6.2 -> 2.7.0
https://github.com/ocaml/dune/releases/tag/2.7.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/ocaml-modules/dune-private-libs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/dune/2.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/pkgs/development/ocaml-modules/dune-private-libs/default.nix index 6161bd1fe8e..9eb253f02e5 100644 --- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -7,7 +7,7 @@ buildDunePackage rec { inherit (dune_2) src version; - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.08"; dontAddPrefix = true; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index d785302ebb5..eac705294f3 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/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 ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 110bc986b80..eb9bfe4290f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -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 |