Merge pull request #7923 from haskell/mergify/bp/master/pr-7734

Mikolaj · web-flow · commit 0986d1371363 · 2022-01-26T11:01:03.000+01:00
3.4.1.0 changelogs (backport #7734)
diff --git a/Cabal/ChangeLog.md b/Cabal/ChangeLog.md
@@ -7,9 +7,20 @@
 # 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
 
-# 3.4.0.0 [Oleg Grenrus](mailgo:oleg.grnerus@iki.fi) February 2021
+# 3.4.1.0 [Emily Pillmore](mailto:emilypi@cohomolo.gy) October 2021
+  * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.4.1.0.md
+
+# 3.4.0.0 [Oleg Grenrus](mailto:oleg.grnerus@iki.fi) February 2021
   * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.4.0.0.md
 
+# 3.2.1.0 [Oleg Grenrus](mailto:oleg.grenris@iki.fi) October 2020
+  * Pass `cxx-options` with `-optcxx` for GHC >= 8.10
+  * Use process jobs when calling subprocesses
+  * Require custom-setup for `cabal-version: 1.24` and later
+  * Accept `linux-androideabi` as an alias for Android
+  * Fix ghci being launched before other sources are built
+  * Require cabal-versions >=1.25 to be exact
+
 # 3.2.0.0 [Herbert Valerio Riedel](mailto:hvr@gnu.org) April 2020
   * Change free text `String` fields to use `ShortText` in package description
     and installed package info.
diff --git a/cabal-install/changelog b/cabal-install/changelog
@@ -6,6 +6,9 @@
 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
 
+3.4.1.0 Emily Pillmore <emilypi@cohomolo.gy> October 2021
+	* See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.4.1.0.md
+
 3.4.0.0 Oleg Grenrus <oleg.grenrus@iki.fi> February 2021
 	* See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.4.0.0.md
 
diff --git a/release-notes/Cabal-3.4.1.0.md b/release-notes/Cabal-3.4.1.0.md
@@ -0,0 +1,3 @@
+### Bugfixes
+
+- Backport windows fix for packages using autoconf >= 2.70 [!7668](https://github.com/haskell/cabal/pull/7668)
diff --git a/release-notes/cabal-install-3.4.1.0.md b/release-notes/cabal-install-3.4.1.0.md
@@ -0,0 +1,3 @@
+### Bugfixes
+
+- Backport windows fix for packages using autoconf >= 2.70 [!7668](https://github.com/haskell/cabal/pull/7668)

-Original file line number
+Diff line change
 .6.0.0 Emily Pillmore <[email protected]> August 2021
 	* See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.6.0.0.md
 +3.4.1.0 Emily Pillmore <[email protected]> October 2021
 +	* See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.4.1.0.md
++
 .4.0.0 Oleg Grenrus <[email protected]> February 2021
 	* See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.4.0.0.md
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+### Bugfixes`
	`2`	`+`
	`3`	`+- Backport windows fix for packages using autoconf >= 2.70 [!7668](https://github.com/haskell/cabal/pull/7668)`