[Git][haskell-team/DHG_packages][master] stack: Upgrading from 2.15.7 to 3.7.1
Clint Adams (@clint)
gitlab at salsa.debian.org
Sun Feb 15 15:57:16 GMT 2026
Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
5fb8469a by Clint Adams at 2026-02-15T10:56:42-05:00
stack: Upgrading from 2.15.7 to 3.7.1
- - - - -
5 changed files:
- p/haskell-stack/debian/changelog
- p/haskell-stack/debian/control
- p/haskell-stack/debian/patches/disable-network-tests
- + p/haskell-stack/debian/patches/newer-deps
- p/haskell-stack/debian/patches/series
Changes:
=====================================
p/haskell-stack/debian/changelog
=====================================
@@ -1,8 +1,13 @@
-haskell-stack (2.15.7-2) UNRELEASED; urgency=medium
+haskell-stack (3.7.1-1) unstable; urgency=medium
+ [ Scott Talbert ]
* Build using dh-haskell
- -- Scott Talbert <swt at techie.net> Sun, 09 Nov 2025 21:12:08 -0500
+ [ Clint Adams ]
+ * New upstream version.
+ * Patch to build with Cabal 3.12. closes: #1127990.
+
+ -- Clint Adams <clint at debian.org> Sat, 14 Feb 2026 18:18:48 -0500
haskell-stack (2.15.7-1) unstable; urgency=medium
=====================================
p/haskell-stack/debian/control
=====================================
@@ -18,50 +18,137 @@ Build-Depends:
libghc-base64-bytestring-dev (>= 1.2.1.0),
libghc-casa-client-dev (>= 0.0.2),
libghc-companion-dev (>= 0.1.0),
- libghc-conduit-dev (>= 1.3.5),
- libghc-conduit-extra-dev (>= 1.3.6),
- libghc-crypton-dev (>= 0.34),
+ libghc-companion-prof,
+ libghc-conduit-dev (>= 1.3.6.1),
+ libghc-conduit-prof,
+ libghc-conduit-extra-dev (>= 1.3.7),
+ libghc-conduit-extra-prof,
+ libghc-crypton-dev (>= 1.0.4),
+ libghc-crypton-prof,
libghc-echo-dev (>= 0.1.4),
- libghc-extra-dev (>= 1.7.14),
+ libghc-echo-prof,
+ libghc-extra-dev (>= 1.7.16),
+ libghc-extra-prof,
libghc-file-embed-dev (>= 0.0.16.0),
libghc-filelock-dev (>= 0.1.1.7),
libghc-fsnotify-dev (>= 0.4.1),
- libghc-generic-deriving-dev (>= 1.14.5),
- libghc-hi-file-parser-dev (>= 0.1.6.0),
+ libghc-fsnotify-prof,
+ libghc-generic-deriving-dev (>= 1.14.6),
+ libghc-generic-deriving-prof,
+ libghc-githash-dev (>= 0.1.7.0),
+ libghc-githash-prof,
+ libghc-hashable-dev (>= 1.4.7.0),
+ libghc-hashable-prof,
+ libghc-hi-file-parser-dev (>= 0.1.7.0),
+ libghc-hi-file-parser-prof,
libghc-hpack-dev (>= 0.36.0),
- libghc-http-client-dev (>= 0.7.17),
+ libghc-hpack-prof,
+ libghc-hspec-dev,
+ libghc-hspec-prof,
+ libghc-http-client-dev (>= 0.7.19),
+ libghc-http-client-prof,
libghc-http-client-tls-dev (>= 0.3.6.2),
- libghc-http-conduit-dev (>= 2.3.8.3),
+ libghc-http-client-tls-prof,
+ libghc-http-conduit-dev (>= 2.3.9.1),
+ libghc-http-conduit-prof,
libghc-http-download-dev (>= 0.2.1.0),
libghc-http-types-dev (>= 0.12.4),
libghc-memory-dev (>= 0.18.0),
libghc-microlens-dev (>= 0.4.13.1),
- libghc-mustache-dev (>= 2.4.2),
+ libghc-microlens-prof,
+ libghc-mustache-dev (>= 2.4.3.1),
+ libghc-mustache-prof,
libghc-neat-interpolation-dev (>= 0.5.1.4),
- libghc-open-browser-dev (>= 0.2.1.0),
+ libghc-neat-interpolation-prof,
+ libghc-open-browser-dev (>= 0.2.1.1),
+ libghc-open-browser-prof,
libghc-optparse-applicative-dev (>= 0.18.1.0),
- libghc-pantry-dev (>= 0.9.3.2),
- libghc-pantry-dev (<< 0.10.0),
+ libghc-optparse-applicative-prof,
+ libghc-optparse-simple-dev (>= 0.1.1.4),
+ libghc-optparse-simple-prof,
+ libghc-pantry-dev (>= 0.10.1),
+ libghc-pantry-prof,
libghc-path-dev (>= 0.9.5),
- libghc-path-io-dev (>= 1.8.1),
+ libghc-path-prof,
+ libghc-path-io-dev (>= 1.8.2),
+ libghc-path-io-prof,
libghc-persistent-dev (>= 2.14.0.0),
- libghc-persistent-dev (<< 2.15),
+ libghc-persistent-dev (<< 2.18),
+ libghc-persistent-prof,
libghc-persistent-sqlite-dev (>= 2.13.3.0),
libghc-project-template-dev (>= 0.2.1.0),
- libghc-random-dev (>= 1.2.1.2),
+ libghc-project-template-prof,
+ libghc-random-dev (>= 1.2.1.3),
+ libghc-random-prof,
+ libghc-raw-strings-qq-dev,
+ libghc-raw-strings-qq-prof,
libghc-rio-dev (>= 0.1.22.0),
libghc-rio-prettyprint-dev (>= 0.1.8.0),
libghc-split-dev (>= 0.2.5),
- libghc-tar-dev (>= 0.5.1.1),
- libghc-unix-compat-dev (>= 0.7.1),
+ libghc-split-prof,
+ libghc-tar-dev (>= 0.6.2.0),
+ libghc-tar-prof,
+ libghc-unix-compat-dev (>= 0.7.4),
+ libghc-unix-compat-prof,
libghc-unordered-containers-dev (>= 0.2.20),
- libghc-vector-dev (>= 0.13.1.0),
+ libghc-unordered-containers-prof,
+ libghc-vector-dev (>= 0.13.2.0),
+ libghc-vector-prof,
libghc-yaml-dev (>= 0.11.11.2),
- libghc-zlib-dev (>= 0.6.3.0),
- libghc-quickcheck2-dev (>= 2.14.3),
- libghc-hspec-dev (>= 2.11.8),
- libghc-raw-strings-qq-dev (>= 1.1),
-Standards-Version: 4.7.0
+ libghc-yaml-prof,
+ libghc-zlib-dev (>= 0.7.1.0),
+ libghc-zlib-prof,
+Build-Depends-Indep: ghc-doc,
+ libghc-aeson-doc,
+ libghc-aeson-warning-parser-doc,
+ libghc-ansi-terminal-doc,
+ libghc-async-doc,
+ libghc-attoparsec-doc,
+ libghc-base64-bytestring-doc,
+ libghc-casa-client-doc,
+ libghc-companion-doc,
+ libghc-conduit-doc,
+ libghc-conduit-extra-doc,
+ libghc-crypton-doc,
+ libghc-echo-doc,
+ libghc-extra-doc,
+ libghc-file-embed-doc,
+ libghc-filelock-doc,
+ libghc-fsnotify-doc,
+ libghc-generic-deriving-doc,
+ libghc-githash-doc,
+ libghc-hashable-doc,
+ libghc-hi-file-parser-doc,
+ libghc-hpack-doc,
+ libghc-http-client-doc,
+ libghc-http-client-tls-doc,
+ libghc-http-conduit-doc,
+ libghc-http-download-doc,
+ libghc-http-types-doc,
+ libghc-memory-doc,
+ libghc-microlens-doc,
+ libghc-mustache-doc,
+ libghc-neat-interpolation-doc,
+ libghc-open-browser-doc,
+ libghc-optparse-applicative-doc,
+ libghc-optparse-simple-doc,
+ libghc-pantry-doc,
+ libghc-path-doc,
+ libghc-path-io-doc,
+ libghc-persistent-doc,
+ libghc-persistent-sqlite-doc,
+ libghc-project-template-doc,
+ libghc-random-doc,
+ libghc-rio-doc,
+ libghc-rio-prettyprint-doc,
+ libghc-split-doc,
+ libghc-tar-doc,
+ libghc-unix-compat-doc,
+ libghc-unordered-containers-doc,
+ libghc-vector-doc,
+ libghc-yaml-doc,
+ libghc-zlib-doc,
+Standards-Version: 4.7.3
Homepage: https://haskellstack.org
Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-stack
Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-stack]
=====================================
p/haskell-stack/debian/patches/disable-network-tests
=====================================
@@ -1,8 +1,6 @@
-Index: b/tests/unit/Stack/ConfigSpec.hs
-===================================================================
--- a/tests/unit/Stack/ConfigSpec.hs
+++ b/tests/unit/Stack/ConfigSpec.hs
-@@ -275,27 +275,27 @@ spec = beforeAll setup $ do
+@@ -284,26 +284,26 @@ spec = beforeAll setup $ do
bopts.haddockForHackage `shouldBe` True
bopts.forceDirty `shouldBe` True
@@ -15,7 +13,7 @@ Index: b/tests/unit/Stack/ConfigSpec.hs
- setCurrentDirectory childDir
- loadConfig' $ \config -> liftIO $ do
- bc <- runRIO config $ withBuildConfig ask
-- view projectRootL bc `shouldBe` parentDir
+- view configFileRootL bc `shouldBe` parentDir
+ -- it "finds the config file in a parent directory" $ inTempDir $ do
+ -- writeFile "package.yaml" "name: foo"
+ -- writeFile (toFilePath stackDotYaml) sampleConfig
@@ -25,7 +23,7 @@ Index: b/tests/unit/Stack/ConfigSpec.hs
+ -- setCurrentDirectory childDir
+ -- loadConfig' $ \config -> liftIO $ do
+ -- bc <- runRIO config $ withBuildConfig ask
-+ -- view projectRootL bc `shouldBe` parentDir
++ -- view configFileRootL bc `shouldBe` parentDir
- it "respects the STACK_YAML env variable" $ inTempDir $ do
- withSystemTempDir "config-is-here" $ \dir -> do
@@ -35,8 +33,7 @@ Index: b/tests/unit/Stack/ConfigSpec.hs
- withEnvVar "STACK_YAML" stackYamlFp $
- loadConfig' $ \config -> liftIO $ do
- bc <- runRIO config $ withBuildConfig ask
-- bc.stackYaml `shouldBe` dir </> stackDotYaml
-- parent bc.stackYaml `shouldBe` dir
+- bc.configFile `shouldBe` Right (dir </> stackDotYaml)
+ -- it "respects the STACK_YAML env variable" $ inTempDir $ do
+ -- withSystemTempDir "config-is-here" $ \dir -> do
+ -- let stackYamlFp = toFilePath (dir </> stackDotYaml)
@@ -45,8 +42,7 @@ Index: b/tests/unit/Stack/ConfigSpec.hs
+ -- withEnvVar "STACK_YAML" stackYamlFp $
+ -- loadConfig' $ \config -> liftIO $ do
+ -- bc <- runRIO config $ withBuildConfig ask
-+ -- bc.stackYaml `shouldBe` dir </> stackDotYaml
-+ -- parent bc.stackYaml `shouldBe` dir
++ -- bc.configFile `shouldBe` Right (dir </> stackDotYaml)
it "STACK_YAML can be relative" $ inTempDir $ do
parentDir <- getCurrentDirectory >>= parseAbsDir
=====================================
p/haskell-stack/debian/patches/newer-deps
=====================================
@@ -0,0 +1,80 @@
+--- a/stack.cabal
++++ b/stack.cabal
+@@ -150,7 +150,7 @@ source-repository head
+
+ custom-setup
+ setup-depends:
+- Cabal >=3.10.3.0 && <3.12,
++ Cabal >=3.12 && <3.13,
+ base >=4.14.3.0 && <5,
+ filepath >=1.4.301.0
+
+@@ -423,7 +423,7 @@ library
+ -optP-Wno-nonportable-include-path -Widentities
+
+ build-depends:
+- Cabal >=3.8.1.0 && <3.12,
++ Cabal >=3.12 && <3.13,
+ aeson >=2.0.3.0,
+ aeson-warning-parser >=0.1.1,
+ ansi-terminal >=1.0.2,
+@@ -551,7 +551,7 @@ executable stack
+ -optP-Wno-nonportable-include-path -threaded -rtsopts
+
+ build-depends:
+- Cabal >=3.8.1.0 && <3.12,
++ Cabal >=3.12 && <3.13,
+ aeson >=2.0.3.0,
+ aeson-warning-parser >=0.1.1,
+ ansi-terminal >=1.0.2,
+@@ -660,7 +660,7 @@ executable stack-integration-test
+ -with-rtsopts=-N
+
+ build-depends:
+- Cabal >=3.8.1.0 && <3.12,
++ Cabal >=3.12 && <3.13,
+ aeson >=2.0.3.0,
+ aeson-warning-parser >=0.1.1,
+ ansi-terminal >=1.0.2,
+@@ -785,7 +785,7 @@ test-suite stack-unit-test
+ -optP-Wno-nonportable-include-path -threaded
+
+ build-depends:
+- Cabal >=3.8.1.0 && <3.12,
++ Cabal >=3.12 && <3.13,
+ QuickCheck >=2.14.3,
+ aeson >=2.0.3.0,
+ aeson-warning-parser >=0.1.1,
+--- a/src/Stack/Types/CompilerBuild.hs
++++ b/src/Stack/Types/CompilerBuild.hs
+@@ -13,7 +13,7 @@ module Stack.Types.CompilerBuild
+ ) where
+
+ import Data.Aeson.Types ( FromJSON, parseJSON, withText )
+-import Data.Text as T
++import Data.Text as T hiding ( show )
+ import Stack.Prelude
+
+ -- | Build of the compiler distribution (e.g. standard, gmp4, tinfo6)
+--- a/src/Stack/SDist.hs
++++ b/src/Stack/SDist.hs
+@@ -573,18 +573,7 @@ checkPackageInExtractedTarball pkgDir =
+ , flow "for common mistakes using Cabal version"
+ , fromString $ versionString cabalVersion <> "."
+ ]
+- let pkgChecks =
+- -- MSS 2017-12-12: Try out a few different variants of pkgDesc to try
+- -- and provoke an error or warning. I don't know why, but when using
+- -- `Just pkgDesc`, it appears that Cabal does not detect that `^>=` is
+- -- used with `cabal-version: 1.24` or earlier. It seems like pkgDesc
+- -- (the one we create) does not populate the `buildDepends` field,
+- -- whereas flattenPackageDescription from Cabal does. In any event,
+- -- using `Nothing` seems more logical for this check anyway, and the
+- -- fallback to `Just pkgDesc` is just a crazy sanity check.
+- case Check.checkPackage gpd Nothing of
+- [] -> Check.checkPackage gpd (Just pkgDesc)
+- x -> x
++ let pkgChecks = Check.checkPackage gpd
+ fileChecks <-
+ liftIO $ Check.checkPackageFiles minBound pkgDesc (toFilePath pkgDir)
+ let checks = pkgChecks ++ fileChecks
=====================================
p/haskell-stack/debian/patches/series
=====================================
@@ -1 +1,2 @@
disable-network-tests
+newer-deps
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/5fb8469abc737cb863068ec84110b908c1c06cd9
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/5fb8469abc737cb863068ec84110b908c1c06cd9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20260215/a639d143/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list