[Git][haskell-team/DHG_packages][master] stack: Upgrading from 2.9.3.1 to 2.15.7
Ilias Tsitsimpis (@iliastsi)
gitlab at salsa.debian.org
Thu Oct 24 14:31:26 BST 2024
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
3473d2f0 by Ilias Tsitsimpis at 2024-10-24T16:31:17+03:00
stack: Upgrading from 2.9.3.1 to 2.15.7
- - - - -
6 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/fix-build
- − p/haskell-stack/debian/patches/remove-mintty.patch
- p/haskell-stack/debian/patches/series
Changes:
=====================================
p/haskell-stack/debian/changelog
=====================================
@@ -1,8 +1,9 @@
-haskell-stack (2.9.3.1-2) UNRELEASED; urgency=medium
+haskell-stack (2.15.7-1) unstable; urgency=medium
* Declare compliance with Debian policy 4.7.0
+ * New upstream release
- -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 11 Sep 2024 15:18:19 +0300
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Thu, 24 Oct 2024 14:55:47 +0300
haskell-stack (2.9.3.1-1) unstable; urgency=medium
=====================================
p/haskell-stack/debian/control
=====================================
@@ -9,77 +9,58 @@ Build-Depends:
cdbs,
debhelper (>= 10),
haskell-devscripts,
- ghc (>= 9.4),
+ ghc (>= 9.6),
libghc-aeson-dev (>= 2.0.3.0),
- libghc-annotated-wl-pprint-dev,
- libghc-ansi-terminal-dev,
- libghc-async-dev,
- libghc-attoparsec-dev,
- libghc-base64-bytestring-dev,
- libghc-casa-client-dev,
- libghc-casa-types-dev,
- libghc-colour-dev,
- libghc-conduit-dev,
- libghc-conduit-extra-dev,
- libghc-cryptonite-dev,
- libghc-cryptonite-conduit-dev,
- libghc-echo-dev,
- libghc-extra-dev,
- libghc-file-embed-dev,
- libghc-filelock-dev,
+ libghc-aeson-warning-parser-dev (>= 0.1.1),
+ libghc-ansi-terminal-dev (>= 1.0.2),
+ libghc-async-dev (>= 2.2.5),
+ libghc-attoparsec-dev (>= 0.14.4),
+ 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-echo-dev (>= 0.1.4),
+ libghc-extra-dev (>= 1.7.14),
+ 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,
- libghc-hackage-security-dev,
- libghc-hashable-dev,
- libghc-hi-file-parser-dev,
- libghc-hpack-dev,
- libghc-http-client-dev,
- libghc-http-client-tls-dev,
- libghc-http-conduit-dev,
- libghc-http-download-dev,
- libghc-http-types-dev,
- libghc-memory-dev,
- libghc-microlens-dev,
- libghc-mono-traversable-dev,
- libghc-mustache-dev,
- libghc-neat-interpolation-dev,
- libghc-network-uri-dev,
- libghc-open-browser-dev,
- libghc-optparse-applicative-dev (>= 0.17.0.0),
- libghc-pantry-dev (>= 0.8.1),
- libghc-path-dev,
- libghc-path-io-dev,
- libghc-persistent-dev (>= 2.13.3.5),
+ libghc-generic-deriving-dev (>= 1.14.5),
+ libghc-hi-file-parser-dev (>= 0.1.6.0),
+ libghc-hpack-dev (>= 0.36.0),
+ libghc-http-client-dev (>= 0.7.17),
+ libghc-http-client-tls-dev (>= 0.3.6.2),
+ libghc-http-conduit-dev (>= 2.3.8.3),
+ 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-neat-interpolation-dev (>= 0.5.1.4),
+ libghc-open-browser-dev (>= 0.2.1.0),
+ libghc-optparse-applicative-dev (>= 0.18.1.0),
+ libghc-pantry-dev (>= 0.9.3.2),
+ libghc-pantry-dev (<< 0.10.0),
+ libghc-path-dev (>= 0.9.5),
+ libghc-path-io-dev (>= 1.8.1),
+ libghc-persistent-dev (>= 2.14.0.0),
libghc-persistent-dev (<< 2.15),
- libghc-persistent-sqlite-dev,
- libghc-persistent-template-dev,
- libghc-primitive-dev,
- libghc-project-template-dev,
- libghc-random-dev,
- libghc-retry-dev,
+ libghc-persistent-sqlite-dev (>= 2.13.3.0),
+ libghc-project-template-dev (>= 0.2.1.0),
+ libghc-random-dev (>= 1.2.1.2),
libghc-rio-dev (>= 0.1.22.0),
- libghc-rio-prettyprint-dev (>= 0.1.4.0),
- libghc-semigroups-dev,
- libghc-split-dev,
- libghc-streaming-commons-dev,
- libghc-tar-dev,
- libghc-temporary-dev,
- libghc-text-metrics-dev,
- libghc-th-reify-many-dev,
- libghc-tls-dev,
- libghc-typed-process-dev,
- libghc-unicode-transforms-dev,
- libghc-unix-compat-dev,
- libghc-unliftio-dev,
- libghc-unordered-containers-dev,
- libghc-vector-dev,
- libghc-yaml-dev,
- libghc-zip-archive-dev,
- libghc-zlib-dev,
- libghc-quickcheck2-dev,
- libghc-hspec-dev,
- libghc-raw-strings-qq-dev,
- libghc-smallcheck-dev,
+ 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-unordered-containers-dev (>= 0.2.20),
+ libghc-vector-dev (>= 0.13.1.0),
+ 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
Homepage: https://haskellstack.org
Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-stack
=====================================
p/haskell-stack/debian/patches/disable-network-tests
=====================================
@@ -1,10 +1,10 @@
-Index: b/src/test/Stack/ConfigSpec.hs
+Index: b/tests/unit/Stack/ConfigSpec.hs
===================================================================
---- a/src/test/Stack/ConfigSpec.hs
-+++ b/src/test/Stack/ConfigSpec.hs
-@@ -188,26 +188,26 @@ spec = beforeAll setup $ do
- boptsReconfigure `shouldBe` True
- boptsCabalVerbose `shouldBe` CabalVerbosity verbose
+--- a/tests/unit/Stack/ConfigSpec.hs
++++ b/tests/unit/Stack/ConfigSpec.hs
+@@ -275,27 +275,27 @@ spec = beforeAll setup $ do
+ bopts.haddockForHackage `shouldBe` True
+ bopts.forceDirty `shouldBe` True
- it "finds the config file in a parent directory" $ inTempDir $ do
- writeFile "package.yaml" "name: foo"
@@ -32,19 +32,21 @@ Index: b/src/test/Stack/ConfigSpec.hs
- let stackYamlFp = toFilePath (dir </> stackDotYaml)
- writeFile stackYamlFp sampleConfig
- writeFile (toFilePath dir ++ "/package.yaml") "name: foo"
-- withEnvVar "STACK_YAML" stackYamlFp $ loadConfig' $ \config -> liftIO $ do
-- BuildConfig{..} <- runRIO config $ withBuildConfig ask
-- bcStackYaml `shouldBe` dir </> stackDotYaml
-- parent bcStackYaml `shouldBe` dir
+- withEnvVar "STACK_YAML" stackYamlFp $
+- loadConfig' $ \config -> liftIO $ do
+- bc <- runRIO config $ withBuildConfig ask
+- bc.stackYaml `shouldBe` dir </> stackDotYaml
+- parent bc.stackYaml `shouldBe` dir
+ -- it "respects the STACK_YAML env variable" $ inTempDir $ do
+ -- withSystemTempDir "config-is-here" $ \dir -> do
+ -- let stackYamlFp = toFilePath (dir </> stackDotYaml)
+ -- writeFile stackYamlFp sampleConfig
+ -- writeFile (toFilePath dir ++ "/package.yaml") "name: foo"
-+ -- withEnvVar "STACK_YAML" stackYamlFp $ loadConfig' $ \config -> liftIO $ do
-+ -- BuildConfig{..} <- runRIO config $ withBuildConfig ask
-+ -- bcStackYaml `shouldBe` dir </> stackDotYaml
-+ -- parent bcStackYaml `shouldBe` dir
++ -- withEnvVar "STACK_YAML" stackYamlFp $
++ -- loadConfig' $ \config -> liftIO $ do
++ -- bc <- runRIO config $ withBuildConfig ask
++ -- bc.stackYaml `shouldBe` dir </> stackDotYaml
++ -- parent bc.stackYaml `shouldBe` dir
it "STACK_YAML can be relative" $ inTempDir $ do
parentDir <- getCurrentDirectory >>= parseAbsDir
=====================================
p/haskell-stack/debian/patches/fix-build deleted
=====================================
@@ -1,43 +0,0 @@
-From 086f93933d547736a7007fc4110f7816ef21f691 Mon Sep 17 00:00:00 2001
-From: Mike Pilgrem <mpilgrem at users.noreply.github.com>
-Date: Mon, 22 May 2023 22:12:45 +0100
-Subject: [PATCH] Fix #6125 Restore building Stack with Cabal flag
- disable-git-info
-
-Also extend CI to include `stack build --flag stack:disable-git-info`.
----
- .github/workflows/unit-tests.yml | 7 ++++---
- ChangeLog.md | 3 +++
- src/main/BuildInfo.hs | 11 ++++-------
- 3 files changed, 11 insertions(+), 10 deletions(-)
-
-Index: b/src/main/BuildInfo.hs
-===================================================================
---- a/src/main/BuildInfo.hs
-+++ b/src/main/BuildInfo.hs
-@@ -17,21 +17,18 @@ module BuildInfo
- #ifndef HIDE_DEP_VERSIONS
- import qualified Build_stack
- #endif
--#ifdef USE_GIT_INFO
- import Data.Version ( versionBranch )
--#else
--import Data.Version ( showVersion, versionBranch )
--#endif
- import Distribution.System ( buildArch )
- import qualified Distribution.Text as Cabal ( display )
- #ifdef USE_GIT_INFO
- import GitHash ( giCommitCount, giHash, tGitInfoCwdTry )
--#endif
--#ifdef USE_GIT_INFO
- import Options.Applicative.Simple ( simpleVersion )
- #endif
--import Stack.Prelude
- import qualified Paths_stack as Meta
-+import Stack.Prelude
-+#ifndef USE_GIT_INFO
-+import Stack.Types.Version ( showStackVersion )
-+#endif
-
- versionString' :: String
- #ifdef USE_GIT_INFO
=====================================
p/haskell-stack/debian/patches/remove-mintty.patch deleted
=====================================
@@ -1,40 +0,0 @@
-Description: Remove windows-used mintty dependency
-Author: Gianfranco Costamagna <locutusofborg at debian.org>
-Last-Update: 2018-01-03
-
-Index: b/stack.cabal
-===================================================================
---- a/stack.cabal
-+++ b/stack.cabal
-@@ -307,7 +307,6 @@ library
- , http-types
- , memory
- , microlens
-- , mintty
- , mono-traversable
- , mtl
- , mustache
-@@ -432,7 +431,6 @@ executable stack
- , http-types
- , memory
- , microlens
-- , mintty
- , mono-traversable
- , mtl
- , mustache
-@@ -556,7 +554,6 @@ executable stack-integration-test
- , http-types
- , memory
- , microlens
-- , mintty
- , mono-traversable
- , mtl
- , mustache
-@@ -687,7 +684,6 @@ test-suite stack-test
- , http-types
- , memory
- , microlens
-- , mintty
- , mono-traversable
- , mtl
- , mustache
=====================================
p/haskell-stack/debian/patches/series
=====================================
@@ -1,3 +1 @@
-remove-mintty.patch
disable-network-tests
-fix-build
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/3473d2f02d7da4045e08bbe5e724b8f83e6a2d59
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/3473d2f02d7da4045e08bbe5e724b8f83e6a2d59
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/20241024/632f3286/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list