Date: Sunday, May 15, 2022 @ 04:01:16 Author: felixonmars Revision: 1206161
archrelease: copy trunk to community-staging-x86_64 Added: stack/repos/community-staging-x86_64/PKGBUILD (from rev 1206160, stack/trunk/PKGBUILD) stack/repos/community-staging-x86_64/ghc9.patch (from rev 1206160, stack/trunk/ghc9.patch) stack/repos/community-staging-x86_64/stack.install (from rev 1206160, stack/trunk/stack.install) Deleted: stack/repos/community-staging-x86_64/PKGBUILD stack/repos/community-staging-x86_64/ghc9.patch stack/repos/community-staging-x86_64/stack.install ---------------+ PKGBUILD | 158 +++++++++++------------ ghc9.patch | 376 ++++++++++++++++++++++++++++---------------------------- stack.install | 8 - 3 files changed, 271 insertions(+), 271 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-05-15 04:00:58 UTC (rev 1206160) +++ PKGBUILD 2022-05-15 04:01:16 UTC (rev 1206161) @@ -1,79 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Arch Haskell Team <arch-hask...@haskell.org> - -pkgname=stack -pkgver=2.7.5 -pkgrel=54 -pkgdesc="The Haskell Tool Stack" -url="https://github.com/commercialhaskell/stack" -license=("BSD") -arch=('x86_64') -depends=('ghc-libs' 'haskell-aeson' 'haskell-annotated-wl-pprint' 'haskell-ansi-terminal' - 'haskell-async' 'haskell-attoparsec' 'haskell-base64-bytestring' 'haskell-casa-client' - 'haskell-casa-types' 'haskell-colour' 'haskell-conduit' 'haskell-conduit-extra' - 'haskell-cryptonite' 'haskell-cryptonite-conduit' 'haskell-echo' - 'haskell-extra' 'haskell-file-embed' 'haskell-filelock' 'haskell-fsnotify' - 'haskell-generic-deriving' 'haskell-githash' 'haskell-hackage-security' 'haskell-hashable' - 'haskell-hi-file-parser' 'haskell-hpack' 'haskell-http-client' 'haskell-http-client-tls' - 'haskell-http-conduit' 'haskell-http-download' 'haskell-http-types' 'haskell-memory' - 'haskell-microlens' 'haskell-mintty' 'haskell-mono-traversable' 'haskell-mustache' - 'haskell-neat-interpolation' 'haskell-network-uri' 'haskell-open-browser' - 'haskell-optparse-applicative' 'haskell-optparse-generic' 'haskell-optparse-simple' - 'haskell-pantry' 'haskell-path' 'haskell-path-io' 'haskell-persistent' - 'haskell-persistent-sqlite' 'haskell-primitive' 'haskell-project-template' - 'haskell-retry' 'haskell-rio' 'haskell-rio-prettyprint' 'haskell-split' - 'haskell-streaming-commons' 'haskell-tar' 'haskell-temporary' 'haskell-text-metrics' - 'haskell-th-reify-many' 'haskell-tls' 'haskell-typed-process' 'haskell-unicode-transforms' - 'haskell-unix-compat' 'haskell-unliftio' 'haskell-unordered-containers' 'haskell-vector' - 'haskell-yaml' 'haskell-zip-archive' 'haskell-zlib') -makedepends=('ghc' 'uusi' 'git' 'haskell-quickcheck' 'haskell-hspec' 'haskell-hspec-discover' - 'haskell-raw-strings-qq' 'haskell-smallcheck') -checkdepends=('cabal-install') -conflicts=('haskell-stack') -replaces=('haskell-stack') -install="stack.install" -source=("git+https://github.com/commercialhaskell/stack.git#tag=v$pkgver" - ghc9.patch) -sha512sums=('SKIP' - '5229f2f6a32bf8d317a2fc7a7bb16c0698359255c2ec6cbe74cbc78799aa170d4e174e6e182478e52d7040f12f32b7a2b9c246f185d79b6e3f295ccb59f3f3b8') - -prepare() { - cd $pkgname - patch -p1 -i ../ghc9.patch - uusi -d semigroups -d persistent-template $pkgname.cabal -} - -build() { - cd $pkgname - - runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname --enable-tests \ - --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid --ghc-option=-fllvm \ - -f-disable-git-info -f-integration-tests -f-static -f-hide-dependency-versions -f-supported-build \ - --ghc-option='-pie' - runhaskell Setup build $MAKEFLAGS - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -check() { - cd $pkgname - # cabal update - LD_LIBRARY_PATH="$PWD"/dist/build PATH="$PWD"/dist/build/stack:"$PATH" runhaskell Setup test --show-details=direct - # Integration tests will result in 4 failures on Arch currently -} - -package() { - cd $pkgname - - install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh" - install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh" - runhaskell Setup copy --destdir="${pkgdir}" - install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE - - LD_PRELOAD=$(ls "$pkgdir"/usr/lib/libHSstack-*-ghc*.so) "${pkgdir}"/usr/bin/stack --bash-completion-script /usr/bin/stack > stack_completion_script - install -Dm644 stack_completion_script "${pkgdir}/usr/share/bash-completion/completions/stack" -} Copied: stack/repos/community-staging-x86_64/PKGBUILD (from rev 1206160, stack/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-05-15 04:01:16 UTC (rev 1206161) @@ -0,0 +1,79 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Arch Haskell Team <arch-hask...@haskell.org> + +pkgname=stack +pkgver=2.7.5 +pkgrel=55 +pkgdesc="The Haskell Tool Stack" +url="https://github.com/commercialhaskell/stack" +license=("BSD") +arch=('x86_64') +depends=('ghc-libs' 'haskell-aeson' 'haskell-annotated-wl-pprint' 'haskell-ansi-terminal' + 'haskell-async' 'haskell-attoparsec' 'haskell-base64-bytestring' 'haskell-casa-client' + 'haskell-casa-types' 'haskell-colour' 'haskell-conduit' 'haskell-conduit-extra' + 'haskell-cryptonite' 'haskell-cryptonite-conduit' 'haskell-echo' + 'haskell-extra' 'haskell-file-embed' 'haskell-filelock' 'haskell-fsnotify' + 'haskell-generic-deriving' 'haskell-githash' 'haskell-hackage-security' 'haskell-hashable' + 'haskell-hi-file-parser' 'haskell-hpack' 'haskell-http-client' 'haskell-http-client-tls' + 'haskell-http-conduit' 'haskell-http-download' 'haskell-http-types' 'haskell-memory' + 'haskell-microlens' 'haskell-mintty' 'haskell-mono-traversable' 'haskell-mustache' + 'haskell-neat-interpolation' 'haskell-network-uri' 'haskell-open-browser' + 'haskell-optparse-applicative' 'haskell-optparse-generic' 'haskell-optparse-simple' + 'haskell-pantry' 'haskell-path' 'haskell-path-io' 'haskell-persistent' + 'haskell-persistent-sqlite' 'haskell-primitive' 'haskell-project-template' + 'haskell-retry' 'haskell-rio' 'haskell-rio-prettyprint' 'haskell-split' + 'haskell-streaming-commons' 'haskell-tar' 'haskell-temporary' 'haskell-text-metrics' + 'haskell-th-reify-many' 'haskell-tls' 'haskell-typed-process' 'haskell-unicode-transforms' + 'haskell-unix-compat' 'haskell-unliftio' 'haskell-unordered-containers' 'haskell-vector' + 'haskell-yaml' 'haskell-zip-archive' 'haskell-zlib') +makedepends=('ghc' 'uusi' 'git' 'haskell-quickcheck' 'haskell-hspec' 'haskell-hspec-discover' + 'haskell-raw-strings-qq' 'haskell-smallcheck') +checkdepends=('cabal-install') +conflicts=('haskell-stack') +replaces=('haskell-stack') +install="stack.install" +source=("git+https://github.com/commercialhaskell/stack.git#tag=v$pkgver" + ghc9.patch) +sha512sums=('SKIP' + '5229f2f6a32bf8d317a2fc7a7bb16c0698359255c2ec6cbe74cbc78799aa170d4e174e6e182478e52d7040f12f32b7a2b9c246f185d79b6e3f295ccb59f3f3b8') + +prepare() { + cd $pkgname + patch -p1 -i ../ghc9.patch + uusi -d semigroups -d persistent-template $pkgname.cabal +} + +build() { + cd $pkgname + + runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ + --prefix=/usr --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname --enable-tests \ + --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid --ghc-option=-fllvm \ + -f-disable-git-info -f-integration-tests -f-static -f-hide-dependency-versions -f-supported-build \ + --ghc-option='-pie' + runhaskell Setup build $MAKEFLAGS + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +check() { + cd $pkgname + # cabal update + LD_LIBRARY_PATH="$PWD"/dist/build PATH="$PWD"/dist/build/stack:"$PATH" runhaskell Setup test --show-details=direct + # Integration tests will result in 4 failures on Arch currently +} + +package() { + cd $pkgname + + install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh" + install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh" + runhaskell Setup copy --destdir="${pkgdir}" + install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE + + LD_PRELOAD=$(ls "$pkgdir"/usr/lib/libHSstack-*-ghc*.so) "${pkgdir}"/usr/bin/stack --bash-completion-script /usr/bin/stack > stack_completion_script + install -Dm644 stack_completion_script "${pkgdir}/usr/share/bash-completion/completions/stack" +} Deleted: ghc9.patch =================================================================== --- ghc9.patch 2022-05-15 04:00:58 UTC (rev 1206160) +++ ghc9.patch 2022-05-15 04:01:16 UTC (rev 1206161) @@ -1,188 +0,0 @@ -From fcd320129b19b2d216ea4cfa63a2731fb00e9067 Mon Sep 17 00:00:00 2001 -From: Brandon Chinn <bran...@leapyear.io> -Date: Fri, 4 Jun 2021 16:40:56 -0700 -Subject: [PATCH 2/6] Fix Flag => PackageFlag - ---- - src/Stack/BuildPlan.hs | 2 +- - src/Stack/Package.hs | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/Stack/BuildPlan.hs b/src/Stack/BuildPlan.hs -index 36f82236e..c5c80efc6 100644 ---- a/src/Stack/BuildPlan.hs -+++ b/src/Stack/BuildPlan.hs -@@ -224,7 +224,7 @@ selectPackageBuildPlan platform compiler pool gpd = - flagCombinations :: NonEmpty [(FlagName, Bool)] - flagCombinations = mapM getOptions (genPackageFlags gpd) - where -- getOptions :: C.Flag -> NonEmpty (FlagName, Bool) -+ getOptions :: C.PackageFlag -> NonEmpty (FlagName, Bool) - getOptions f - | flagManual f = (fname, flagDefault f) :| [] - | flagDefault f = (fname, True) :| [(fname, False)] -diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs -index 4db50d2a4..d9bca7af5 100644 ---- a/src/Stack/Package.hs -+++ b/src/Stack/Package.hs -@@ -128,7 +128,7 @@ resolvePackage packageConfig gpkg = - (resolvePackageDescription packageConfig gpkg) - - packageFromPackageDescription :: PackageConfig -- -> [D.Flag] -+ -> [PackageFlag] - -> PackageDescriptionPair - -> Package - packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkgNoMod pkg) = -@@ -935,9 +935,9 @@ resolvePackageDescription packageConfig (GenericPackageDescription desc defaultF - -- | Make a map from a list of flag specifications. - -- - -- What is @flagManual@ for? --flagMap :: [Flag] -> Map FlagName Bool -+flagMap :: [PackageFlag] -> Map FlagName Bool - flagMap = M.fromList . map pair -- where pair :: Flag -> (FlagName, Bool) -+ where pair :: PackageFlag -> (FlagName, Bool) - pair = flagName &&& flagDefault - - data ResolveConditions = ResolveConditions -@@ -986,7 +986,7 @@ resolveConditions rc addDeps (CondNode lib deps cs) = basic <> children - case v of - OS os -> os == rcOS rc - Arch arch -> arch == rcArch rc -- Flag flag -> -+ PackageFlag flag -> - fromMaybe False $ M.lookup flag (rcFlags rc) - -- NOTE: ^^^^^ This should never happen, as all flags - -- which are used must be declared. Defaulting to - -From 675763a51ef98f5e95e3241dd6b184a646b1af36 Mon Sep 17 00:00:00 2001 -From: Brandon Chinn <bran...@leapyear.io> -Date: Fri, 4 Jun 2021 16:55:30 -0700 -Subject: [PATCH 3/6] Fix CabalSpecVersion - ---- - src/Stack/Package.hs | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs -index d9bca7af5..fca039140 100644 ---- a/src/Stack/Package.hs -+++ b/src/Stack/Package.hs -@@ -32,6 +32,7 @@ import Data.List (find, isPrefixOf, unzip) - import qualified Data.Map.Strict as M - import qualified Data.Set as S - import qualified Data.Text as T -+import Distribution.CabalSpecVersion (CabalSpecVersion, cabalSpecMinimumLibraryVersion) - import Distribution.Compiler - import Distribution.ModuleName (ModuleName) - import qualified Distribution.ModuleName as Cabal -@@ -190,7 +191,7 @@ packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkg - (library pkg) - , packageBuildType = buildType pkg - , packageSetupDeps = msetupDeps -- , packageCabalSpec = either orLaterVersion id $ specVersionRaw pkg -+ , packageCabalSpec = orLaterVersion $ mkVersion $ cabalSpecMinimumLibraryVersion $ specVersion pkg - } - where - extraLibNames = S.union subLibNames foreignLibNames -@@ -696,7 +697,7 @@ packageDescModulesAndFiles pkg = do - - -- | Resolve globbing of files (e.g. data files) to absolute paths. - resolveGlobFiles -- :: Version -- ^ cabal file version -+ :: CabalSpecVersion -- ^ cabal file version - -> [String] - -> RIO Ctx (Set (Path Abs File)) - resolveGlobFiles cabalFileVersion = - -From 95f2147a669c4c685a8b43f30c4602897efb0a3a Mon Sep 17 00:00:00 2001 -From: Brandon Chinn <bran...@leapyear.io> -Date: Fri, 4 Jun 2021 16:55:40 -0700 -Subject: [PATCH 4/6] Fix GenericPackageDescription - ---- - src/Stack/Build.hs | 2 +- - src/Stack/Package.hs | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Stack/Build.hs b/src/Stack/Build.hs -index 23b9a9719..856903bed 100644 ---- a/src/Stack/Build.hs -+++ b/src/Stack/Build.hs -@@ -358,7 +358,7 @@ checkComponentsBuildable lps = - checkSubLibraryDependencies :: HasLogFunc env => [ProjectPackage] -> RIO env () - checkSubLibraryDependencies proj = do - forM_ proj $ \p -> do -- C.GenericPackageDescription _ _ lib subLibs foreignLibs exes tests benches <- liftIO $ cpGPD . ppCommon $ p -+ C.GenericPackageDescription _ _ _ lib subLibs foreignLibs exes tests benches <- liftIO $ cpGPD . ppCommon $ p - - let dependencies = concatMap getDeps subLibs <> - concatMap getDeps foreignLibs <> -diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs -index fca039140..39aad4d2f 100644 ---- a/src/Stack/Package.hs -+++ b/src/Stack/Package.hs -@@ -863,7 +863,7 @@ data PackageDescriptionPair = PackageDescriptionPair - resolvePackageDescription :: PackageConfig - -> GenericPackageDescription - -> PackageDescriptionPair --resolvePackageDescription packageConfig (GenericPackageDescription desc defaultFlags mlib subLibs foreignLibs' exes tests benches) = -+resolvePackageDescription packageConfig (GenericPackageDescription desc _ defaultFlags mlib subLibs foreignLibs' exes tests benches) = - PackageDescriptionPair - { pdpOrigBuildable = go False - , pdpModifiedBuildable = go True - -From 0c87cd3529b7958dd16bd829ba933aa76f8b6ca5 Mon Sep 17 00:00:00 2001 -From: Brandon Chinn <bran...@leapyear.io> -Date: Fri, 4 Jun 2021 17:01:01 -0700 -Subject: [PATCH 5/6] Fix generatePackageVersionMacros - ---- - src/Stack/Build/Execute.hs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs -index a409313f0..606a8a722 100644 ---- a/src/Stack/Build/Execute.hs -+++ b/src/Stack/Build/Execute.hs -@@ -1207,7 +1207,7 @@ withSingleContext ActionContext {..} ee@ExecuteEnv {..} task@Task {..} allDeps m - let macroDeps = mapMaybe snd matchedDeps - cppMacrosFile = setupDir </> relFileSetupMacrosH - cppArgs = ["-optP-include", "-optP" ++ toFilePath cppMacrosFile] -- writeBinaryFileAtomic cppMacrosFile (encodeUtf8Builder (T.pack (C.generatePackageVersionMacros macroDeps))) -+ writeBinaryFileAtomic cppMacrosFile (encodeUtf8Builder (T.pack (C.generatePackageVersionMacros (packageVersion package) macroDeps))) - return (packageDBArgs ++ depsArgs ++ cppArgs) - - -- This branch is usually taken for builds, and - -From 5d7cabfef49814426c30c0ee4f08cbd3242d49fa Mon Sep 17 00:00:00 2001 -From: Brandon Chinn <bran...@leapyear.io> -Date: Fri, 4 Jun 2021 17:04:16 -0700 -Subject: [PATCH 6/6] Fix ModuleReexport - ---- - src/Stack/Script.hs | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Stack/Script.hs b/src/Stack/Script.hs -index a0196fac0..0d469357c 100644 ---- a/src/Stack/Script.hs -+++ b/src/Stack/Script.hs -@@ -18,6 +18,7 @@ import Distribution.Compiler (CompilerFlavor (..)) - import Distribution.ModuleName (ModuleName) - import qualified Distribution.PackageDescription as PD - import qualified Distribution.Types.CondTree as C -+import qualified Distribution.Types.ModuleReexport as ModuleReexport - import Distribution.Types.PackageName (mkPackageName) - import Distribution.Types.VersionRange (withinRange) - import Distribution.System (Platform (..)) -@@ -266,7 +267,7 @@ allExposedModules gpd = do - mlibrary = snd . C.simplifyCondTree checkCond <$> PD.condLibrary gpd - pure $ case mlibrary of - Just lib -> PD.exposedModules lib ++ -- map PD.moduleReexportName (PD.reexportedModules lib) -+ map ModuleReexport.moduleReexportName (PD.reexportedModules lib) - Nothing -> mempty - - -- | The Stackage project introduced the concept of hidden packages, Copied: stack/repos/community-staging-x86_64/ghc9.patch (from rev 1206160, stack/trunk/ghc9.patch) =================================================================== --- ghc9.patch (rev 0) +++ ghc9.patch 2022-05-15 04:01:16 UTC (rev 1206161) @@ -0,0 +1,188 @@ +From fcd320129b19b2d216ea4cfa63a2731fb00e9067 Mon Sep 17 00:00:00 2001 +From: Brandon Chinn <bran...@leapyear.io> +Date: Fri, 4 Jun 2021 16:40:56 -0700 +Subject: [PATCH 2/6] Fix Flag => PackageFlag + +--- + src/Stack/BuildPlan.hs | 2 +- + src/Stack/Package.hs | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/Stack/BuildPlan.hs b/src/Stack/BuildPlan.hs +index 36f82236e..c5c80efc6 100644 +--- a/src/Stack/BuildPlan.hs ++++ b/src/Stack/BuildPlan.hs +@@ -224,7 +224,7 @@ selectPackageBuildPlan platform compiler pool gpd = + flagCombinations :: NonEmpty [(FlagName, Bool)] + flagCombinations = mapM getOptions (genPackageFlags gpd) + where +- getOptions :: C.Flag -> NonEmpty (FlagName, Bool) ++ getOptions :: C.PackageFlag -> NonEmpty (FlagName, Bool) + getOptions f + | flagManual f = (fname, flagDefault f) :| [] + | flagDefault f = (fname, True) :| [(fname, False)] +diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs +index 4db50d2a4..d9bca7af5 100644 +--- a/src/Stack/Package.hs ++++ b/src/Stack/Package.hs +@@ -128,7 +128,7 @@ resolvePackage packageConfig gpkg = + (resolvePackageDescription packageConfig gpkg) + + packageFromPackageDescription :: PackageConfig +- -> [D.Flag] ++ -> [PackageFlag] + -> PackageDescriptionPair + -> Package + packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkgNoMod pkg) = +@@ -935,9 +935,9 @@ resolvePackageDescription packageConfig (GenericPackageDescription desc defaultF + -- | Make a map from a list of flag specifications. + -- + -- What is @flagManual@ for? +-flagMap :: [Flag] -> Map FlagName Bool ++flagMap :: [PackageFlag] -> Map FlagName Bool + flagMap = M.fromList . map pair +- where pair :: Flag -> (FlagName, Bool) ++ where pair :: PackageFlag -> (FlagName, Bool) + pair = flagName &&& flagDefault + + data ResolveConditions = ResolveConditions +@@ -986,7 +986,7 @@ resolveConditions rc addDeps (CondNode lib deps cs) = basic <> children + case v of + OS os -> os == rcOS rc + Arch arch -> arch == rcArch rc +- Flag flag -> ++ PackageFlag flag -> + fromMaybe False $ M.lookup flag (rcFlags rc) + -- NOTE: ^^^^^ This should never happen, as all flags + -- which are used must be declared. Defaulting to + +From 675763a51ef98f5e95e3241dd6b184a646b1af36 Mon Sep 17 00:00:00 2001 +From: Brandon Chinn <bran...@leapyear.io> +Date: Fri, 4 Jun 2021 16:55:30 -0700 +Subject: [PATCH 3/6] Fix CabalSpecVersion + +--- + src/Stack/Package.hs | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs +index d9bca7af5..fca039140 100644 +--- a/src/Stack/Package.hs ++++ b/src/Stack/Package.hs +@@ -32,6 +32,7 @@ import Data.List (find, isPrefixOf, unzip) + import qualified Data.Map.Strict as M + import qualified Data.Set as S + import qualified Data.Text as T ++import Distribution.CabalSpecVersion (CabalSpecVersion, cabalSpecMinimumLibraryVersion) + import Distribution.Compiler + import Distribution.ModuleName (ModuleName) + import qualified Distribution.ModuleName as Cabal +@@ -190,7 +191,7 @@ packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkg + (library pkg) + , packageBuildType = buildType pkg + , packageSetupDeps = msetupDeps +- , packageCabalSpec = either orLaterVersion id $ specVersionRaw pkg ++ , packageCabalSpec = orLaterVersion $ mkVersion $ cabalSpecMinimumLibraryVersion $ specVersion pkg + } + where + extraLibNames = S.union subLibNames foreignLibNames +@@ -696,7 +697,7 @@ packageDescModulesAndFiles pkg = do + + -- | Resolve globbing of files (e.g. data files) to absolute paths. + resolveGlobFiles +- :: Version -- ^ cabal file version ++ :: CabalSpecVersion -- ^ cabal file version + -> [String] + -> RIO Ctx (Set (Path Abs File)) + resolveGlobFiles cabalFileVersion = + +From 95f2147a669c4c685a8b43f30c4602897efb0a3a Mon Sep 17 00:00:00 2001 +From: Brandon Chinn <bran...@leapyear.io> +Date: Fri, 4 Jun 2021 16:55:40 -0700 +Subject: [PATCH 4/6] Fix GenericPackageDescription + +--- + src/Stack/Build.hs | 2 +- + src/Stack/Package.hs | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Stack/Build.hs b/src/Stack/Build.hs +index 23b9a9719..856903bed 100644 +--- a/src/Stack/Build.hs ++++ b/src/Stack/Build.hs +@@ -358,7 +358,7 @@ checkComponentsBuildable lps = + checkSubLibraryDependencies :: HasLogFunc env => [ProjectPackage] -> RIO env () + checkSubLibraryDependencies proj = do + forM_ proj $ \p -> do +- C.GenericPackageDescription _ _ lib subLibs foreignLibs exes tests benches <- liftIO $ cpGPD . ppCommon $ p ++ C.GenericPackageDescription _ _ _ lib subLibs foreignLibs exes tests benches <- liftIO $ cpGPD . ppCommon $ p + + let dependencies = concatMap getDeps subLibs <> + concatMap getDeps foreignLibs <> +diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs +index fca039140..39aad4d2f 100644 +--- a/src/Stack/Package.hs ++++ b/src/Stack/Package.hs +@@ -863,7 +863,7 @@ data PackageDescriptionPair = PackageDescriptionPair + resolvePackageDescription :: PackageConfig + -> GenericPackageDescription + -> PackageDescriptionPair +-resolvePackageDescription packageConfig (GenericPackageDescription desc defaultFlags mlib subLibs foreignLibs' exes tests benches) = ++resolvePackageDescription packageConfig (GenericPackageDescription desc _ defaultFlags mlib subLibs foreignLibs' exes tests benches) = + PackageDescriptionPair + { pdpOrigBuildable = go False + , pdpModifiedBuildable = go True + +From 0c87cd3529b7958dd16bd829ba933aa76f8b6ca5 Mon Sep 17 00:00:00 2001 +From: Brandon Chinn <bran...@leapyear.io> +Date: Fri, 4 Jun 2021 17:01:01 -0700 +Subject: [PATCH 5/6] Fix generatePackageVersionMacros + +--- + src/Stack/Build/Execute.hs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs +index a409313f0..606a8a722 100644 +--- a/src/Stack/Build/Execute.hs ++++ b/src/Stack/Build/Execute.hs +@@ -1207,7 +1207,7 @@ withSingleContext ActionContext {..} ee@ExecuteEnv {..} task@Task {..} allDeps m + let macroDeps = mapMaybe snd matchedDeps + cppMacrosFile = setupDir </> relFileSetupMacrosH + cppArgs = ["-optP-include", "-optP" ++ toFilePath cppMacrosFile] +- writeBinaryFileAtomic cppMacrosFile (encodeUtf8Builder (T.pack (C.generatePackageVersionMacros macroDeps))) ++ writeBinaryFileAtomic cppMacrosFile (encodeUtf8Builder (T.pack (C.generatePackageVersionMacros (packageVersion package) macroDeps))) + return (packageDBArgs ++ depsArgs ++ cppArgs) + + -- This branch is usually taken for builds, and + +From 5d7cabfef49814426c30c0ee4f08cbd3242d49fa Mon Sep 17 00:00:00 2001 +From: Brandon Chinn <bran...@leapyear.io> +Date: Fri, 4 Jun 2021 17:04:16 -0700 +Subject: [PATCH 6/6] Fix ModuleReexport + +--- + src/Stack/Script.hs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Stack/Script.hs b/src/Stack/Script.hs +index a0196fac0..0d469357c 100644 +--- a/src/Stack/Script.hs ++++ b/src/Stack/Script.hs +@@ -18,6 +18,7 @@ import Distribution.Compiler (CompilerFlavor (..)) + import Distribution.ModuleName (ModuleName) + import qualified Distribution.PackageDescription as PD + import qualified Distribution.Types.CondTree as C ++import qualified Distribution.Types.ModuleReexport as ModuleReexport + import Distribution.Types.PackageName (mkPackageName) + import Distribution.Types.VersionRange (withinRange) + import Distribution.System (Platform (..)) +@@ -266,7 +267,7 @@ allExposedModules gpd = do + mlibrary = snd . C.simplifyCondTree checkCond <$> PD.condLibrary gpd + pure $ case mlibrary of + Just lib -> PD.exposedModules lib ++ +- map PD.moduleReexportName (PD.reexportedModules lib) ++ map ModuleReexport.moduleReexportName (PD.reexportedModules lib) + Nothing -> mempty + + -- | The Stackage project introduced the concept of hidden packages, Deleted: stack.install =================================================================== --- stack.install 2022-05-15 04:00:58 UTC (rev 1206160) +++ stack.install 2022-05-15 04:01:16 UTC (rev 1206161) @@ -1,4 +0,0 @@ -post_install() { - echo "You need to either 1) install latest stable ghc package from [community] or 2) install ncurses5-compat-libs from AUR for the prebuilt binaries installed by stack to work." -} - Copied: stack/repos/community-staging-x86_64/stack.install (from rev 1206160, stack/trunk/stack.install) =================================================================== --- stack.install (rev 0) +++ stack.install 2022-05-15 04:01:16 UTC (rev 1206161) @@ -0,0 +1,4 @@ +post_install() { + echo "You need to either 1) install latest stable ghc package from [community] or 2) install ncurses5-compat-libs from AUR for the prebuilt binaries installed by stack to work." +} +