From d9c8473d7f367ccb534b68c5d6a9672b30febc31 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 17:00:07 -0600
Subject: [PATCH] add changelogs for Cabal-3.6.2.0 and cabal-install-3.6.2.0
 (#7721) (#7722)

(cherry picked from commit c6cbebde484c19ff74353ce491afc46cd8fe2721)

# Conflicts:
#	changelog.d/issue-4683
#	changelog.d/option-argument-errors
#	changelog.d/pr-7296
#	changelog.d/pr-7358
#	changelog.d/pr-7536

Co-authored-by: Emily Pillmore <emilypi@cohomolo.gy>
---
 Cabal/ChangeLog.md                     |  6 ++++++
 cabal-install/changelog                |  4 ++++
 changelog.d/issue-4683                 |  4 ++++
 changelog.d/option-argument-errors     |  9 +++++++++
 changelog.d/pr-7296                    | 11 +++++++++++
 changelog.d/pr-7358                    | 21 +++++++++++++++++++++
 changelog.d/pr-7536                    |  4 ++++
 release-notes/Cabal-3.6.2.0.md         | 18 ++++++++++++++++++
 release-notes/cabal-install-3.6.2.0.md | 16 ++++++++++++++++
 9 files changed, 93 insertions(+)
 create mode 100644 changelog.d/issue-4683
 create mode 100644 changelog.d/option-argument-errors
 create mode 100644 changelog.d/pr-7296
 create mode 100644 changelog.d/pr-7358
 create mode 100644 changelog.d/pr-7536
 create mode 100644 release-notes/Cabal-3.6.2.0.md
 create mode 100644 release-notes/cabal-install-3.6.2.0.md

diff --git a/Cabal/ChangeLog.md b/Cabal/ChangeLog.md
index 4d574b60a2..5c70d3b050 100644
--- a/Cabal/ChangeLog.md
+++ b/Cabal/ChangeLog.md
@@ -1,3 +1,9 @@
+# 3.6.2.0 [Emily Pillmore](mailgo:emilypi@cohomolo.gy) October 2021
+  * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.6.2.0.md
+
+# 3.6.1.0 [Emily Pillmore](mailgo:emilypi@cohomolo.gy) August 2021
+  * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.6.1.0.md
+
 # 3.6.0.0 [Emily Pillmore](mailgo:emilypi@cohomolo.gy) August 2021
   * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.6.0.0.md
 
diff --git a/cabal-install/changelog b/cabal-install/changelog
index 068a26db51..5612b44f11 100644
--- a/cabal-install/changelog
+++ b/cabal-install/changelog
@@ -1,4 +1,8 @@
 -*-change-log-*-
+
+3.6.2.0 Emily Pillmore <emilypi@cohomolo.gy> October 2021
+	* See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.6.2.0.md
+
 3.6.0.0 Emily Pillmore <emilypi@cohomolo.gy> August 2021
 	* See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.6.0.0.md
 
diff --git a/changelog.d/issue-4683 b/changelog.d/issue-4683
new file mode 100644
index 0000000000..4bf6378552
--- /dev/null
+++ b/changelog.d/issue-4683
@@ -0,0 +1,4 @@
+synopsis: 'cabal check' to fail when no upper bounds for base or Cabal are present in setup dependencies
+packages: Cabal cabal-install
+issues: #4683
+prs: #5370 #7409
diff --git a/changelog.d/option-argument-errors b/changelog.d/option-argument-errors
new file mode 100644
index 0000000000..90d1f32d7e
--- /dev/null
+++ b/changelog.d/option-argument-errors
@@ -0,0 +1,9 @@
+synopsis: Handle option argument parse errors without 'error'
+packages: Cabal cabal-install
+prs: #7579
+issues: #7573
+description: {
+- Errors parsing arguments such as `-v=3` no longer result in
+  stack traces.
+- `Distribution.ReadE.readEOrFail` was removed.
+}
diff --git a/changelog.d/pr-7296 b/changelog.d/pr-7296
new file mode 100644
index 0000000000..2dbd0a0576
--- /dev/null
+++ b/changelog.d/pr-7296
@@ -0,0 +1,11 @@
+synopsis: Add 'preferred-versions' support for LocalIndexRepo
+packages: cabal-install
+prs: #7296
+issues: #7249 #5603
+
+description: {
+
+- `cabal outdated` honours the 'preferred-versions' file which might deprecate or prefer certain
+  versions of packages. In particular, if the only newer version of a package has been deprecated,
+  `cabal outdated` should not report that there are newer versions available.
+}
diff --git a/changelog.d/pr-7358 b/changelog.d/pr-7358
new file mode 100644
index 0000000000..9aea015d6e
--- /dev/null
+++ b/changelog.d/pr-7358
@@ -0,0 +1,21 @@
+synopsis: Expose `cabal-install` as library
+prs: #7358
+issues: #7224 #6090 #4798 #3781 #1597
+significance: significant
+description {
+
+- Exposes `cabal-install` as a library, bumping the `cabal-install` cabal version to 2.2, and removing the dogfooding framework surrounding `cabal-install` to facilitate easier testing.
+
+- Moves `cabal-install-solver` out to its own directory, and treats it as its own separate project. Addresses #6090, #7224, and #3781
+
+- Enable HPC coverage
+
+  - absorb `cabal-install-solver-dsl` module into the test modules, and
+    incorporate it into its own test target.
+
+  -  Splits out `cabal-install` unit tests from long-running tests.
+
+  - Adds proper subcomponent coverage masking so we can finally generate
+    baseline coverage reports for `cabal-install`.
+
+}
\ No newline at end of file
diff --git a/changelog.d/pr-7536 b/changelog.d/pr-7536
new file mode 100644
index 0000000000..26b139ab6d
--- /dev/null
+++ b/changelog.d/pr-7536
@@ -0,0 +1,4 @@
+synopsis: Add fields extra-libraries-static and extra-lib-dirs-static
+packages: Cabal
+prs: #7536
+issues: #7399 #6688
diff --git a/release-notes/Cabal-3.6.2.0.md b/release-notes/Cabal-3.6.2.0.md
new file mode 100644
index 0000000000..cce46775e0
--- /dev/null
+++ b/release-notes/Cabal-3.6.2.0.md
@@ -0,0 +1,18 @@
+### Significant changes
+
+
+- Make Paths_ modules work with non-standard preludes again [#5962](https://github.com/haskell/cabal/issues/5962)
+
+  - Generate Paths_ module with qualified Data.List.last import so that compatibility with non-standard preludes is not regressed compared to cabal 3.4.
+
+- Windows: redo the fix to breakage caused by new autoconf; the wrong fix made cabal sometimes fail with old autoconf [#7494](https://github.com/haskell/cabal/issues/7494) [#7649](https://github.com/haskell/cabal/issues/7649)
+
+  - Reverts #7510 that failed on Windows when used with pre-generated scripts included in packages such as network, time, process.
+  - Adds a subtler fix/workaround for the deficiencies of new autoconf versions on Windows.
+
+### Other changes
+
+
+- Regenerate bootstrap/ with GHC updated from 8.10.4 to 8.10.7
+
+  - This regenerates bootstrap plans using new package versions and also updating GHC from 8.10.4 to 8.10.7, as requested by GHC HQ.
diff --git a/release-notes/cabal-install-3.6.2.0.md b/release-notes/cabal-install-3.6.2.0.md
new file mode 100644
index 0000000000..19004ca46b
--- /dev/null
+++ b/release-notes/cabal-install-3.6.2.0.md
@@ -0,0 +1,16 @@
+### Significant changes
+
+- Make Paths_ modules work with non-standard preludes again [#5962](https://github.com/haskell/cabal/issues/5962)
+
+  - Generate Paths_ module with qualified Data.List.last import so that compatibility with non-standard preludes is not regressed compared to cabal 3.4.
+
+- Windows: redo the fix to breakage caused by new autoconf; the wrong fix made cabal sometimes fail with old autoconf [#7494](https://github.com/haskell/cabal/issues/7494) [#7649](https://github.com/haskell/cabal/issues/7649)
+
+  - Reverts #7510 that failed on Windows when used with pre-generated scripts included in packages such as network, time, process.
+  - Adds a subtler fix/workaround for the deficiencies of new autoconf versions on Windows.
+
+### Other changes
+
+- Regenerate bootstrap/ with GHC updated from 8.10.4 to 8.10.7
+
+  - This regenerates bootstrap plans using new package versions and also updating GHC from 8.10.4 to 8.10.7, as requested by GHC HQ.
-- 
GitLab