From 2a911ab2e76fc12ebe24b9e91b05b1b578f347e9 Mon Sep 17 00:00:00 2001 From: Etienne Marais Date: Mon, 3 Mar 2025 14:32:24 +0100 Subject: [PATCH] config: enable build progress by default Signed-off-by: Etienne Marais --- boot/configure.ml | 5 ++--- flake.nix | 1 - src/dune_rules/setup.defaults.ml | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/boot/configure.ml b/boot/configure.ml index 42e25d29564..953cb76f359 100644 --- a/boot/configure.ml +++ b/boot/configure.ml @@ -18,7 +18,7 @@ let out = ;; let default_toggles : (string * [ `Disabled | `Enabled ]) list = - [ "toolchains", `Enabled; "pkg_build_progress", `Disabled; "lock_dev_tool", `Disabled ] + [ "toolchains", `Enabled; "pkg_build_progress", `Enabled; "lock_dev_tool", `Disabled ] ;; let toggles = ref default_toggles @@ -94,8 +94,7 @@ let () = user-wide directory." ) ; ( "--pkg-build-progress" , toggle "pkg_build_progress" - , " Enable the displaying of package build progress.\n\ - \ This flag is experimental and shouldn't be relied on by packagers." ) + , " Enable the displaying of package build progress.") ; ( "--lock-dev-tool" , toggle "lock_dev_tool" , " Enable ocamlformat dev-tool, allows 'dune fmt' to build ocamlformat and use \ diff --git a/flake.nix b/flake.nix index 6ba86645563..3d676e68a8c 100644 --- a/flake.nix +++ b/flake.nix @@ -55,7 +55,6 @@ add-experimental-configure-flags = pkg: pkg.overrideAttrs { configureFlags = [ - "--pkg-build-progress" "enable" "--lock-dev-tool" "enable" ]; }; diff --git a/src/dune_rules/setup.defaults.ml b/src/dune_rules/setup.defaults.ml index 4515addf7bc..14ac63a5674 100644 --- a/src/dune_rules/setup.defaults.ml +++ b/src/dune_rules/setup.defaults.ml @@ -13,5 +13,5 @@ let roots : string option Install.Roots.t = let prefix : string option = None let toolchains = `Enabled -let pkg_build_progress = `Disabled +let pkg_build_progress = `Enabled let lock_dev_tool = `Disabled