Debian Codegraph @

debian/patches/newer-deps

raw
1 --- a/stack.cabal
2 +++ b/stack.cabal
3 @@ -150,7 +150,7 @@ source-repository head
4
5 custom-setup
6 setup-depends:
7 - Cabal >=3.10.3.0 && <3.12,
8 + Cabal >=3.12 && <3.13,
9 base >=4.14.3.0 && <5,
10 filepath >=1.4.301.0
11
12 @@ -423,7 +423,7 @@ library
13 -optP-Wno-nonportable-include-path -Widentities
14
15 build-depends:
16 - Cabal >=3.8.1.0 && <3.12,
17 + Cabal >=3.12 && <3.13,
18 aeson >=2.0.3.0,
19 aeson-warning-parser >=0.1.1,
20 ansi-terminal >=1.0.2,
21 @@ -551,7 +551,7 @@ executable stack
22 -optP-Wno-nonportable-include-path -threaded -rtsopts
23
24 build-depends:
25 - Cabal >=3.8.1.0 && <3.12,
26 + Cabal >=3.12 && <3.13,
27 aeson >=2.0.3.0,
28 aeson-warning-parser >=0.1.1,
29 ansi-terminal >=1.0.2,
30 @@ -660,7 +660,7 @@ executable stack-integration-test
31 -with-rtsopts=-N
32
33 build-depends:
34 - Cabal >=3.8.1.0 && <3.12,
35 + Cabal >=3.12 && <3.13,
36 aeson >=2.0.3.0,
37 aeson-warning-parser >=0.1.1,
38 ansi-terminal >=1.0.2,
39 @@ -785,7 +785,7 @@ test-suite stack-unit-test
40 -optP-Wno-nonportable-include-path -threaded
41
42 build-depends:
43 - Cabal >=3.8.1.0 && <3.12,
44 + Cabal >=3.12 && <3.13,
45 QuickCheck >=2.14.3,
46 aeson >=2.0.3.0,
47 aeson-warning-parser >=0.1.1,
48 --- a/src/Stack/Types/CompilerBuild.hs
49 +++ b/src/Stack/Types/CompilerBuild.hs
50 @@ -13,7 +13,7 @@ module Stack.Types.CompilerBuild
51 ) where
52
53 import Data.Aeson.Types ( FromJSON, parseJSON, withText )
54 -import Data.Text as T
55 +import Data.Text as T hiding ( show )
56 import Stack.Prelude
57
58 -- | Build of the compiler distribution (e.g. standard, gmp4, tinfo6)
59 --- a/src/Stack/SDist.hs
60 +++ b/src/Stack/SDist.hs
61 @@ -573,18 +573,7 @@ checkPackageInExtractedTarball pkgDir =
62 , flow "for common mistakes using Cabal version"
63 , fromString $ versionString cabalVersion <> "."
64 ]
65 - let pkgChecks =
66 - -- MSS 2017-12-12: Try out a few different variants of pkgDesc to try
67 - -- and provoke an error or warning. I don't know why, but when using
68 - -- `Just pkgDesc`, it appears that Cabal does not detect that `^>=` is
69 - -- used with `cabal-version: 1.24` or earlier. It seems like pkgDesc
70 - -- (the one we create) does not populate the `buildDepends` field,
71 - -- whereas flattenPackageDescription from Cabal does. In any event,
72 - -- using `Nothing` seems more logical for this check anyway, and the
73 - -- fallback to `Just pkgDesc` is just a crazy sanity check.
74 - case Check.checkPackage gpd Nothing of
75 - [] -> Check.checkPackage gpd (Just pkgDesc)
76 - x -> x
77 + let pkgChecks = Check.checkPackage gpd
78 fileChecks <-
79 liftIO $ Check.checkPackageFiles minBound pkgDesc (toFilePath pkgDir)
80 let checks = pkgChecks ++ fileChecks