From c7e8da62257a8ff5537c3b3c43eb68228f51e5df Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 2 Sep 2020 19:01:00 -0500 Subject: [PATCH] dune_2: 2.7.0 -> 2.7.1 https://github.com/ocaml/dune/releases/tag/2.7.1 --- .../ocaml-modules/dune-action-plugin/default.nix | 2 +- .../ocaml-modules/dune-build-info/default.nix | 2 +- .../ocaml-modules/dune-configurator/default.nix | 6 +++--- .../ocaml-modules/dune-glob/default.nix | 2 +- .../ocaml-modules/dune-private-libs/default.nix | 2 +- pkgs/development/tools/ocaml/dune/2.nix | 14 +++++++++++--- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix index fcb93aac799..65c55da6e3b 100644 --- a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix +++ b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "dune-action-plugin"; - inherit (dune_2) src version; + inherit (dune_2) src version patches; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/dune-build-info/default.nix b/pkgs/development/ocaml-modules/dune-build-info/default.nix index 3c828ebdcdb..5d9f105782b 100644 --- a/pkgs/development/ocaml-modules/dune-build-info/default.nix +++ b/pkgs/development/ocaml-modules/dune-build-info/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "dune-build-info"; - inherit (dune_2) src version; + inherit (dune_2) src version patches; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/dune-configurator/default.nix b/pkgs/development/ocaml-modules/dune-configurator/default.nix index aa12ebc8d79..16e365dd4f3 100644 --- a/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -1,15 +1,15 @@ -{ lib, buildDunePackage, dune_2, dune-private-libs }: +{ lib, buildDunePackage, dune_2, csexp, result }: buildDunePackage rec { pname = "dune-configurator"; useDune2 = true; - inherit (dune_2) src version; + inherit (dune_2) src version patches; dontAddPrefix = true; - propagatedBuildInputs = [ dune-private-libs ]; + propagatedBuildInputs = [ csexp result ]; meta = with lib; { description = "Helper library for gathering system configuration"; diff --git a/pkgs/development/ocaml-modules/dune-glob/default.nix b/pkgs/development/ocaml-modules/dune-glob/default.nix index 34b79068c11..c7c6f9be4ee 100644 --- a/pkgs/development/ocaml-modules/dune-glob/default.nix +++ b/pkgs/development/ocaml-modules/dune-glob/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "dune-glob"; - inherit (dune_2) src version; + inherit (dune_2) src version patches; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/pkgs/development/ocaml-modules/dune-private-libs/default.nix index 9eb253f02e5..8a635efa3a5 100644 --- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -5,7 +5,7 @@ buildDunePackage rec { useDune2 = true; - inherit (dune_2) src version; + inherit (dune_2) src version patches; minimumOCamlVersion = "4.08"; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index eac705294f3..30823b43acb 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib }: +{ stdenv, fetchurl, ocaml, findlib, fetchpatch }: if stdenv.lib.versionOlder ocaml.version "4.08" then throw "dune is not available for OCaml ${ocaml.version}" @@ -6,17 +6,25 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "058wiyncczbmlfxj3cnwn5n68wkmbaf4mgjm2bkp2hffpn2wl5xl"; + sha256 = "0lnfmc06yhbdiv6mmp0aksnnvzz4aw4zabrdg89p5msyzir3qrvn"; }; buildInputs = [ ocaml findlib ]; buildFlags = "release"; + patches = [ + # Fix setup.ml configure path. Remove with the next release. + (fetchpatch { + url = "https://github.com/ocaml/dune/commit/8a3d7f2f2015b71384caa07226d1a89dba9d6c25.patch"; + sha256 = "0dw4q10030h9xcdlxw2vp7qm0hd2qpkb98rir5d55m9vn65w8j28"; + }) + ]; + dontAddPrefix = true; installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ];