From 0dd4a0a8d154fb8f938d8e914759d28b4a152a5c Mon Sep 17 00:00:00 2001 From: theGhostJW Date: Thu, 6 Feb 2025 11:39:54 +1100 Subject: [PATCH 1/4] Update cabal-package-description-file.rst make the documentation around the ``manual`` flag a little clearer --- doc/cabal-package-description-file.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/cabal-package-description-file.rst b/doc/cabal-package-description-file.rst index 86aab056c0d..52675e09501 100644 --- a/doc/cabal-package-description-file.rst +++ b/doc/cabal-package-description-file.rst @@ -2462,10 +2462,12 @@ Configuration Flags :default: ``False`` :since: 1.6 - By default, Cabal will first try to satisfy dependencies with the - default flag value and then, if that is not possible, with the - negated value. However, if the flag is manual, then the default - value (which can be overridden by commandline flags) will be used. + Cabal normally tries to resolve dependencies using the flag's ``default`` + value first. If that fails, it automatically retries with the negated + default value. However, if the ``manual`` flag is set to ``True``, Cabal + will not retry with the negated value, and dependency resolution will fail + if the default value doesn't work. Note that the default value can still + be overridden using command-line flags. .. _conditional-blocks: From 90f0fdfdb6fc883a015e88fe1acd4acaf0150b18 Mon Sep 17 00:00:00 2001 From: theGhostJW Date: Thu, 6 Feb 2025 12:08:25 +1100 Subject: [PATCH 2/4] Update cabal-package-description-file.rst update description of manual flag --- doc/cabal-package-description-file.rst | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/doc/cabal-package-description-file.rst b/doc/cabal-package-description-file.rst index 52675e09501..32aab37fd26 100644 --- a/doc/cabal-package-description-file.rst +++ b/doc/cabal-package-description-file.rst @@ -2462,12 +2462,11 @@ Configuration Flags :default: ``False`` :since: 1.6 - Cabal normally tries to resolve dependencies using the flag's ``default`` - value first. If that fails, it automatically retries with the negated - default value. However, if the ``manual`` flag is set to ``True``, Cabal - will not retry with the negated value, and dependency resolution will fail - if the default value doesn't work. Note that the default value can still - be overridden using command-line flags. + By default, Cabal tries to resolve dependencies using the flag's ``default`` value. + If that fails, it retires with the negated default value. However, if the flag is + marked as ``manual``, Cabal will only use the default value and will not retry + with the negated default. Note that the default value can still be overridden + using command-line flags. .. _conditional-blocks: From abea3f080fa468eb7e031e2ca644b783c73a8966 Mon Sep 17 00:00:00 2001 From: theGhostJW Date: Thu, 6 Feb 2025 12:22:59 +1100 Subject: [PATCH 3/4] Update cabal-package-description-file.rst - whitespace --- doc/cabal-package-description-file.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/cabal-package-description-file.rst b/doc/cabal-package-description-file.rst index 32aab37fd26..61143cf56e9 100644 --- a/doc/cabal-package-description-file.rst +++ b/doc/cabal-package-description-file.rst @@ -2462,11 +2462,11 @@ Configuration Flags :default: ``False`` :since: 1.6 - By default, Cabal tries to resolve dependencies using the flag's ``default`` value. - If that fails, it retires with the negated default value. However, if the flag is - marked as ``manual``, Cabal will only use the default value and will not retry - with the negated default. Note that the default value can still be overridden - using command-line flags. + By default, Cabal tries to resolve dependencies using the flag's ``default`` value. + If that fails, it retires with the negated default value. However, if the flag is + marked as ``manual``, Cabal will only use the default value and will not retry + with the negated default. Note that the default value can still be overridden + using command-line flags. .. _conditional-blocks: From bab996aef3094231fc76b9fa80f1332a28f0ef16 Mon Sep 17 00:00:00 2001 From: theGhostJW Date: Mon, 10 Feb 2025 07:01:05 +1100 Subject: [PATCH 4/4] Update doc/cabal-package-description-file.rst Co-authored-by: Javier Sagredo --- doc/cabal-package-description-file.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/cabal-package-description-file.rst b/doc/cabal-package-description-file.rst index 61143cf56e9..112da61f3b8 100644 --- a/doc/cabal-package-description-file.rst +++ b/doc/cabal-package-description-file.rst @@ -2463,7 +2463,7 @@ Configuration Flags :since: 1.6 By default, Cabal tries to resolve dependencies using the flag's ``default`` value. - If that fails, it retires with the negated default value. However, if the flag is + If that fails, it tries again with the negated default value. However, if the flag is marked as ``manual``, Cabal will only use the default value and will not retry with the negated default. Note that the default value can still be overridden using command-line flags.