From b825c4f2aaf5e62e77ffd1a9f7f0e70273c2639e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 25 Mar 2025 19:50:10 +0800 Subject: [PATCH] update to 3.1.1 --- .gitignore | 5 + sources | 10 +- stack-3.1.1.cabal | 870 +++++++++++++++++++++++++++ stack-disabled-global-warnings.patch | 10 +- stack.spec | 24 +- 5 files changed, 899 insertions(+), 20 deletions(-) create mode 100644 stack-3.1.1.cabal diff --git a/.gitignore b/.gitignore index 6b8a867..5725e3d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,8 @@ /project-template-0.2.1.0.tar.gz /rio-orphans-0.1.2.0.tar.gz /static-bytes-0.1.0.tar.gz +/stack-3.1.1.tar.gz +/hi-file-parser-0.1.7.0.tar.gz +/hpack-0.37.0.tar.gz +/open-browser-0.2.1.1.tar.gz +/pantry-0.10.0.tar.gz diff --git a/sources b/sources index e0cf060..1755358 100644 --- a/sources +++ b/sources @@ -1,18 +1,18 @@ -SHA512 (stack-2.15.7.tar.gz) = 0a0e2fca52b17e3fbc5091da9fc7dd639a50c37519ae8ea27954536381d63bda4e1f20ca047e061dc898cac35a0551c996ced6f8d87184fe8e5be03e03d3cb82 +SHA512 (stack-3.1.1.tar.gz) = 2990996e08297d2f4eb5f06750db1130e785e26e8c5a7302a533b4ded278793bd7be3bb2532bcd76270105b41f0dba2eceaaf2887142b5e315a6565b0b5a6cee SHA512 (aeson-warning-parser-0.1.1.tar.gz) = 86c10f3e1681ec8892ba396b9077f72b1975f23373db6f56a038ecc67cb48e8d7ba33c2396031d1b31fc9da3ead2e8c00ce27c2e3a02f8b52f53f5e3ed61610d SHA512 (casa-client-0.0.2.tar.gz) = 885ede1522142cf7b7c4ad2c49506974b349256e3537a3e6d05c45d1ef64f8144538a7bae90ae97fa3d5af4b2f24c5a1bd52dba847c677a0cec486992e5d654a SHA512 (casa-types-0.0.2.tar.gz) = a54bb7f15310878e0a4c0524749ba8c8de8537a60892d278941cacefb80ad9d31e9ba16dd236c196b6639758f281f9ae66911d04c39b0ec6e2b75db5127ad5bf SHA512 (companion-0.1.0.tar.gz) = 5220f0784d15e8763ac5eca34bf27c7b820a98daa7b14e6abefaf2735d0ba367ac8209b5a27d016ab1ce536973389d28a39fab9987c1827b8e849192b86e1cba SHA512 (crypton-conduit-0.2.3.tar.gz) = 2776ef49609c11a8379e4b9f7e9dcb40f4ad5c33924de6cfd9c9952106321b8959d2dbe4537905e1d55dfe577593d75d7c1f1ff47d26497dccfbba667fdf2257 SHA512 (filelock-0.1.1.7.tar.gz) = ca82dc7efde8a36dc4c7df63609159349d145e7de1fed6b9dcdc8c16b64cdddb3d13b838c39f363eb89ee82871cb2904e76cb833c5798319ed514815aac88e98 -SHA512 (hi-file-parser-0.1.6.0.tar.gz) = 49a29ce589440aa0554d8c1b26a2e97c2d55aff5e4a0fc63f102d8be4003572b5716f5819e64ddeb7c523e52d14b594208ca8179a959b5d1fe86435e6f7ca502 -SHA512 (hpack-0.36.1.tar.gz) = ee92ebc0cb6e37d228f4a4ffb2b2c1551fe160b8a5db065e8f61902cfe2f8c79ca8c443048d1ab60fc33c40e74015c14404666bca4e99b3d984d0d46b210c5e5 +SHA512 (hi-file-parser-0.1.7.0.tar.gz) = 5f97d8eaa14c23e400ae293f76817630170c8a49eb3eaee255685104f41d82bafb2620fe7e6637674461cde06df620426beb22d6ce53885fa6e7a4d013fdc97d +SHA512 (hpack-0.37.0.tar.gz) = 66796da16c406a3d3eea1d7a918966bdfb27dcd64820b4a4bc50c0ca86affc8e22251da1bea80c7f9906dc9d7a1e99e895423e3c6be17e44c560a88575532f89 SHA512 (http-download-0.2.1.0.tar.gz) = 75a208684bf4f116746a1015870a6bb2afbdd1a4b4c268b88f142b189e0e31c59b8d691606c3eb33be9b1637a0131c4d7cb48091179f22bba8d6d2919ce30e02 SHA512 (mintty-0.1.4.tar.gz) = f5c3231f342d24d7dc38b0281579aa6f272767451412ea84e1c248f77331d6740186cef0bb4144b7655a80914daa0b1f3573107a76c29c1d2e6a56e793532733 SHA512 (mustache-2.4.2.tar.gz) = 96e10988f8ccf15cd5939e16cd8d5f551853168a3719cd4717b3bb40c3227f540f4d955614e1d38385fb30f9a97351f260f79cfbc872da30eadb73bac1ebc315 SHA512 (neat-interpolation-0.5.1.4.tar.gz) = 16f62bee23984fabebd70e70311b24bc2e7835ba90cf84bb7bb6f4d84c097bf817e3f5d653c843117b63ed886b0e16511219a688e17bdcf62c16f659074d690f -SHA512 (open-browser-0.2.1.0.tar.gz) = 94ba71597c270b518742534b1b9b9a7ca0ede2eeb08a030b03cca6dbe6e5a2de363dc443bae907ca5c90b126aeb7dc5f5dd1eada95ca78a0ba1a8d472df4ada1 -SHA512 (pantry-0.9.3.2.tar.gz) = 6c109bc2dd08813103c072f288b5b67d577915a3401057f9c5aaae008306a1484c4ef72c4af818c67a1062793a6ae81bcc24c8d1d6f61d4de78625395bfb7b88 +SHA512 (open-browser-0.2.1.1.tar.gz) = d54b70d4be8aa9622610796952d4486ed8d943079238b054268a7663faa67e245e7a2da4aa701c322d6c315d91c4df6355890f4563b4e2b571ec9b0de274025b +SHA512 (pantry-0.10.0.tar.gz) = ed7c7e1114e74995002c369c3e3267ee0243e29a99068fc2f9a913835ea9e3866c8c7d31db2c7caebbdd694c658135c3e4c4b508dbe46c182d5e3e875df370bd SHA512 (project-template-0.2.1.0.tar.gz) = ed70f640e5197f7a6158b851dcd3990e77b7266f716be248ecfb012c4827dc688028aa78d649313203a274357f57e45e94371a09446c4404d3282add0d1a158c SHA512 (rio-orphans-0.1.2.0.tar.gz) = 85e883977e161161e5ba8f4fa6d13026d71f7367bac262307f9a8cfdc0316b71a490fcb6c15737919a6b4e73b3355b413161e09f5167c95b1f0c5a22c045f7ac SHA512 (static-bytes-0.1.0.tar.gz) = 6bccb86796f1afdc28dfa8b1b4c86503fe500dd3088488213fbc68ab2d0e2c358295b56acac024ecf62ed27a33036560716d253deaaaef21983cf1d7352c8deb diff --git a/stack-3.1.1.cabal b/stack-3.1.1.cabal new file mode 100644 index 0000000..a8e823c --- /dev/null +++ b/stack-3.1.1.cabal @@ -0,0 +1,870 @@ +cabal-version: 2.0 +name: stack +version: 3.1.1 +x-revision: 2 +license: BSD3 +license-file: LICENSE +maintainer: manny@fpcomplete.com +author: Commercial Haskell SIG +homepage: http://haskellstack.org +bug-reports: https://github.com/commercialhaskell/stack/issues +synopsis: The Haskell Tool Stack +description: + Please see the documentation at + for usage information. + . + If building a 'stack' executable for distribution, please download the + source code from + and build it using Stack itself in order to ensure identical behaviour + to official binaries. This package on Hackage is provided for convenience + and bootstrapping purposes. + . + Note that the API for the library is not currently stable, and may + change significantly, even between minor releases. It is + currently only intended for use by the executable. + +category: Development +build-type: Custom +extra-source-files: + CONTRIBUTING.md + ChangeLog.md + README.md + stack.yaml + doc/build_overview.md + doc/ChangeLog.md + doc/commands/bench_command.md + doc/commands/build_command.md + doc/commands/clean_command.md + doc/commands/config_command.md + doc/commands/docker_command.md + doc/commands/dot_command.md + doc/commands/eval_command.md + doc/commands/exec_command.md + doc/commands/ghc_command.md + doc/commands/ghci_command.md + doc/commands/haddock_command.md + doc/commands/hoogle_command.md + doc/commands/hpc_command.md + doc/commands/ide_command.md + doc/commands/index.md + doc/commands/init_command.md + doc/commands/install_command.md + doc/commands/list_command.md + doc/commands/ls_command.md + doc/commands/new_command.md + doc/commands/path_command.md + doc/commands/purge_command.md + doc/commands/query_command.md + doc/commands/repl_command.md + doc/commands/run_command.md + doc/commands/runghc_command.md + doc/commands/runhaskell_command.md + doc/commands/script_command.md + doc/commands/sdist_command.md + doc/commands/setup_command.md + doc/commands/templates_command.md + doc/commands/test_command.md + doc/commands/uninstall_command.md + doc/commands/unpack_command.md + doc/commands/update_command.md + doc/commands/upgrade_command.md + doc/commands/upload_command.md + doc/community/index.md + doc/configure/customisation_scripts.md + doc/configure/environment_variables.md + doc/configure/global_flags.md + doc/configure/index.md + doc/configure/yaml/index.md + doc/configure/yaml/non-project.md + doc/configure/yaml/project.md + doc/CONTRIBUTING.md + doc/dev_containers.md + doc/faq.md + doc/glossary.md + doc/install_and_upgrade.md + doc/maintainers/7zip.md + doc/maintainers/archive/README.md + doc/maintainers/archive/releases.md + doc/maintainers/docker.md + doc/maintainers/docker_images.md + doc/maintainers/ghc.md + doc/maintainers/haskellstack.org.md + doc/maintainers/msys.md + doc/maintainers/releases.md + doc/maintainers/self-hosted_runners.md + doc/maintainers/stack_errors.md + doc/maintainers/team_process.md + doc/other_resources.md + doc/README.md + doc/SIGNING_KEY.md + doc/topics/azure_ci.md + doc/topics/CI.md + doc/topics/custom_snapshot.md + doc/topics/debugging.md + doc/topics/developing_on_windows.md + doc/topics/docker_integration.md + doc/topics/editor_integration.md + doc/topics/haskell_and_c_code.md + doc/topics/index.md + doc/topics/lock_files.md + doc/topics/nix_integration.md + doc/topics/nonstandard_project_init.md + doc/topics/package_location.md + doc/topics/scripts.md + doc/topics/shell_autocompletion.md + doc/topics/snapshot_location.md + doc/topics/Stack_and_VS_Code.md + doc/topics/stack_root.md + doc/topics/stack_work.md + doc/topics/stack_yaml_vs_cabal_package_file.md + doc/topics/travis_ci.md + doc/tutorial/building_existing_projects.md + doc/tutorial/building_your_project.md + doc/tutorial/cabal_flags_and_ghc_options.md + doc/tutorial/executing_commands.md + doc/tutorial/hello_world_example.md + doc/tutorial/index.md + doc/tutorial/installed_package_databases.md + doc/tutorial/locations_used_by_stack.md + doc/tutorial/multi-package_projects.md + doc/tutorial/stack_build_synonyms.md + doc/tutorial/stack_build_targets.md + doc/tutorial/stack_configuration.md + doc/tutorial/tutorial_conclusion.md + doc/tutorial/using_ghc_interactively.md + src/setup-shim/StackSetupShim.hs + tests/unit/package-dump/ghc-7.10.txt + tests/unit/package-dump/ghc-7.8.4-osx.txt + tests/unit/package-dump/ghc-7.8.txt + tests/unit/package-dump/ghc-head.txt + tests/unit/Stack/Untar/test1.tar.gz + tests/unit/Stack/Untar/test2.tar.gz + cabal.project + cabal.config + +source-repository head + type: git + location: https://github.com/commercialhaskell/stack + +custom-setup + setup-depends: + Cabal >=3.10.3.0 && <3.12, + base >=4.14.3.0 && <5, + filepath >=1.4.300.1 + +flag developer-mode + description: By default, output extra developer information. + default: False + manual: True + +flag disable-git-info + description: + Disable inclusion of current Git information in the Stack executable when it is built. + + default: False + manual: True + +flag disable-stack-upload + description: + For use only during development and debugging. Disable 'stack upload' so that it does not make HTTP requests. Stack will output information about the HTTP request(s) that it would have made if the command was enabled. + + default: False + manual: True + +flag hide-dependency-versions + description: + Hides dependency versions from 'stack --version'. Used only when building a Stack executable for official release. Note to packagers/distributors: DO NOT OVERRIDE THIS FLAG IF YOU ARE BUILDING STACK ANY OTHER WAY (e.g. using Cabal or from Hackage), as it makes debugging support requests more difficult. + + default: False + manual: True + +flag integration-tests + description: Run the integration test suite. + default: False + manual: True + +flag static + description: + When building the Stack executable, or the stack-integration-test executable, pass the -static and -pthread flags to the linker used by GHC. + + default: False + manual: True + +flag supported-build + description: + If false, causes 'stack --version' to issue a warning about the build being unsupported. Used only when building a Stack executable for official release. Note to packagers/distributors: DO NOT OVERRIDE THIS FLAG IF YOU ARE BUILDING STACK ANY OTHER WAY (e.g. using Cabal or from Hackage), as it makes debugging support requests more difficult. + + default: False + manual: True + +library + exposed-modules: + Control.Concurrent.Execute + Data.Attoparsec.Args + Data.Attoparsec.Combinators + Data.Attoparsec.Interpreter + Data.Monoid.Map + GHC.Utils.GhcPkg.Main.Compat + Network.HTTP.StackClient + Options.Applicative.Args + Options.Applicative.Builder.Extra + Options.Applicative.Complicated + Path.CheckInstall + Path.Extended + Path.Extra + Path.Find + Stack + Stack.Build + Stack.Build.Cache + Stack.Build.ConstructPlan + Stack.Build.Execute + Stack.Build.ExecuteEnv + Stack.Build.ExecutePackage + Stack.Build.Haddock + Stack.Build.Installed + Stack.Build.Source + Stack.Build.Target + Stack.BuildInfo + Stack.BuildOpts + Stack.BuildPlan + Stack.CLI + Stack.Clean + Stack.Component + Stack.ComponentFile + Stack.Config + Stack.Config.Build + Stack.Config.ConfigureScript + Stack.Config.Docker + Stack.Config.Nix + Stack.ConfigCmd + Stack.Constants + Stack.Constants.Config + Stack.Constants.StackProgName + Stack.Coverage + Stack.DefaultColorWhen + Stack.DependencyGraph + Stack.Docker + Stack.DockerCmd + Stack.Dot + Stack.Eval + Stack.Exec + Stack.FileWatch + Stack.GhcPkg + Stack.Ghci + Stack.Ghci.Script + Stack.Hoogle + Stack.IDE + Stack.Init + Stack.List + Stack.Ls + Stack.Lock + Stack.New + Stack.Nix + Stack.Options.BenchParser + Stack.Options.BuildMonoidParser + Stack.Options.BuildParser + Stack.Options.CleanParser + Stack.Options.ConfigParser + Stack.Options.Completion + Stack.Options.DockerParser + Stack.Options.DotParser + Stack.Options.EvalParser + Stack.Options.ExecParser + Stack.Options.GhcBuildParser + Stack.Options.GhciParser + Stack.Options.GhcVariantParser + Stack.Options.GlobalParser + Stack.Options.HaddockParser + Stack.Options.HpcReportParser + Stack.Options.InitParser + Stack.Options.LogLevelParser + Stack.Options.LsParser + Stack.Options.NewParser + Stack.Options.NixParser + Stack.Options.PackageParser + Stack.Options.PathParser + Stack.Options.SDistParser + Stack.Options.ScriptParser + Stack.Options.SetupParser + Stack.Options.SnapshotParser + Stack.Options.TestParser + Stack.Options.UnpackParser + Stack.Options.UpgradeParser + Stack.Options.UploadParser + Stack.Options.Utils + Stack.Package + Stack.PackageDump + Stack.PackageFile + Stack.Path + Stack.Prelude + Stack.Query + Stack.Runners + Stack.Script + Stack.SDist + Stack.Setup + Stack.Setup.Installed + Stack.SetupCmd + Stack.SourceMap + Stack.Storage.Project + Stack.Storage.User + Stack.Storage.Util + Stack.Templates + Stack.Types.AddCommand + Stack.Types.AllowNewerDeps + Stack.Types.ApplyGhcOptions + Stack.Types.ApplyProgOptions + Stack.Types.Build + Stack.Types.Build.ConstructPlan + Stack.Types.Build.Exception + Stack.Types.BuildConfig + Stack.Types.BuildOpts + Stack.Types.BuildOptsCLI + Stack.Types.BuildOptsMonoid + Stack.Types.CabalConfigKey + Stack.Types.Cache + Stack.Types.Casa + Stack.Types.ColorWhen + Stack.Types.CompCollection + Stack.Types.CompilerBuild + Stack.Types.CompilerPaths + Stack.Types.Compiler + Stack.Types.Component + Stack.Types.ComponentUtils + Stack.Types.Config + Stack.Types.Config.Exception + Stack.Types.ConfigMonoid + Stack.Types.ConfigureOpts + Stack.Types.Curator + Stack.Types.Dependency + Stack.Types.DependencyTree + Stack.Types.Docker + Stack.Types.DockerEntrypoint + Stack.Types.DotConfig + Stack.Types.DotOpts + Stack.Types.DownloadInfo + Stack.Types.DumpLogs + Stack.Types.DumpPackage + Stack.Types.EnvConfig + Stack.Types.EnvSettings + Stack.Types.ExtraDirs + Stack.Types.FileDigestCache + Stack.Types.GHCDownloadInfo + Stack.Types.GHCVariant + Stack.Types.GhcOptionKey + Stack.Types.GhcOptions + Stack.Types.GhcPkgId + Stack.Types.GlobalOpts + Stack.Types.GlobalOptsMonoid + Stack.Types.Installed + Stack.Types.InterfaceOpt + Stack.Types.IsMutable + Stack.Types.LockFileBehavior + Stack.Types.MsysEnvironment + Stack.Types.NamedComponent + Stack.Types.Nix + Stack.Types.Package + Stack.Types.PackageFile + Stack.Types.PackageName + Stack.Types.ParentMap + Stack.Types.Platform + Stack.Types.Project + Stack.Types.ProjectAndConfigMonoid + Stack.Types.ProjectConfig + Stack.Types.PvpBounds + Stack.Types.Runner + Stack.Types.SCM + Stack.Types.SetupInfo + Stack.Types.Snapshot + Stack.Types.SourceMap + Stack.Types.StackYamlLoc + Stack.Types.Storage + Stack.Types.TemplateName + Stack.Types.UnusedFlags + Stack.Types.UploadOpts + Stack.Types.Version + Stack.Types.VersionedDownloadInfo + Stack.Types.WantedCompilerSetter + Stack.Uninstall + Stack.Unpack + Stack.Update + Stack.Upgrade + Stack.Upload + System.Info.ShortPathName + System.Permissions + System.Process.Pager + System.Terminal + Build_stack + Paths_stack + + hs-source-dirs: src + autogen-modules: + Build_stack + Paths_stack + + default-language: GHC2021 + ghc-options: + -fwrite-ide-info -hiedir=.hie -Wall -Wmissing-export-lists + -optP-Wno-nonportable-include-path -Widentities + + build-depends: + Cabal >=3.8.1.0 && <3.12, + aeson >=2.0.3.0, + aeson-warning-parser >=0.1.1, + ansi-terminal >=1.0.2, + array >=0.5.6.0, + async >=2.2.5, + attoparsec >=0.14.4, + base >=4.16.0.0 && <5, + base64-bytestring >=1.2.1.0, + bytestring >=0.11.5.3, + casa-client >=0.0.2, + companion >=0.1.0, + conduit >=1.3.5, + conduit-extra >=1.3.6, + containers >=0.6.7, + crypton >=0.34, + directory >=1.3.8.5, + echo >=0.1.4, + exceptions >=0.10.7, + extra >=1.7.16, + file-embed >=0.0.16.0, + filelock >=0.1.1.7, + filepath >=1.4.300.1, + fsnotify >=0.4.1, + generic-deriving >=1.14.5, + ghc-boot >=9.6.6, + hashable >=1.4.4.0, + hi-file-parser >=0.1.6.0, + hpack >=0.36.0, + hpc >=0.6.2.0, + http-client >=0.7.17, + http-client-tls >=0.3.6.2, + http-conduit >=2.3.8.3, + http-download >=0.2.1.0, + http-types >=0.12.4, + memory >=0.18.0, + microlens >=0.4.13.1, + mtl >=2.3.1, + mustache >=2.4.2, + neat-interpolation >=0.5.1.4, + open-browser >=0.2.1.0, + optparse-applicative >=0.18.1.0, + pantry >=0.10.0, + path >=0.9.5, + path-io >=1.8.2, + persistent >=2.14.0.0 && <2.15, + persistent-sqlite >=2.13.3.0, + pretty >=1.1.3.6, + process >=1.6.13.2, + project-template >=0.2.1.0, + random >=1.2.1.2, + rio >=0.1.22.0, + rio-prettyprint >=0.1.8.0, + split >=0.2.5, + stm >=2.5.1.0, + tar >=0.6.2.0, + template-haskell >=2.20.0.0, + text >=2.0.2, + time >=1.12.2, + transformers >=0.6.1.0, + unix-compat >=0.7.2, + unordered-containers >=0.2.20, + vector >=0.13.1.0, + yaml >=0.11.11.2, + zlib >=0.6.3.0 + + if os(windows) + cpp-options: -DWINDOWS + build-depends: Win32 >=2.13.3.0 + + else + build-tool-depends: hsc2hs:hsc2hs + build-depends: unix + + if (impl(ghc >=9.4.5) && os(windows)) + build-depends: network >=3.1.2.9 + + if flag(developer-mode) + cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=True + + else + cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=False + + if flag(disable-stack-upload) + cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=True + + else + cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=False + + if os(windows) + hs-source-dirs: src/windows/ + other-modules: + Stack.Constants.UsrLibDirs + Stack.Docker.Handlers + System.Posix.User + System.Uname + + else + c-sources: src/unix/cbits/uname.c + hs-source-dirs: src/unix/ + other-modules: + Stack.Constants.UsrLibDirs + Stack.Docker.Handlers + System.Uname + + if !flag(disable-git-info) + cpp-options: -DUSE_GIT_INFO + build-depends: + githash >=0.1.7.0, + optparse-simple >=0.1.1.4 + + if flag(hide-dependency-versions) + cpp-options: -DHIDE_DEP_VERSIONS + + if flag(supported-build) + cpp-options: -DSUPPORTED_BUILD + +executable stack + main-is: Main.hs + hs-source-dirs: app + other-modules: Paths_stack + autogen-modules: Paths_stack + default-language: GHC2021 + ghc-options: + -fwrite-ide-info -hiedir=.hie -Wall -Wmissing-export-lists + -optP-Wno-nonportable-include-path -threaded -rtsopts + + build-depends: + Cabal >=3.8.1.0 && <3.12, + aeson >=2.0.3.0, + aeson-warning-parser >=0.1.1, + ansi-terminal >=1.0.2, + array >=0.5.6.0, + async >=2.2.5, + attoparsec >=0.14.4, + base >=4.16.0.0 && <5, + base64-bytestring >=1.2.1.0, + bytestring >=0.11.5.3, + casa-client >=0.0.2, + companion >=0.1.0, + conduit >=1.3.5, + conduit-extra >=1.3.6, + containers >=0.6.7, + crypton >=0.34, + directory >=1.3.8.5, + echo >=0.1.4, + exceptions >=0.10.7, + extra >=1.7.16, + file-embed >=0.0.16.0, + filelock >=0.1.1.7, + filepath >=1.4.300.1, + fsnotify >=0.4.1, + generic-deriving >=1.14.5, + ghc-boot >=9.6.6, + hashable >=1.4.4.0, + hi-file-parser >=0.1.6.0, + hpack >=0.36.0, + hpc >=0.6.2.0, + http-client >=0.7.17, + http-client-tls >=0.3.6.2, + http-conduit >=2.3.8.3, + http-download >=0.2.1.0, + http-types >=0.12.4, + memory >=0.18.0, + microlens >=0.4.13.1, + mtl >=2.3.1, + mustache >=2.4.2, + neat-interpolation >=0.5.1.4, + open-browser >=0.2.1.0, + optparse-applicative >=0.18.1.0, + pantry >=0.10.0, + path >=0.9.5, + path-io >=1.8.2, + persistent >=2.14.0.0 && <2.15, + persistent-sqlite >=2.13.3.0, + pretty >=1.1.3.6, + process >=1.6.13.2, + project-template >=0.2.1.0, + random >=1.2.1.2, + rio >=0.1.22.0, + rio-prettyprint >=0.1.8.0, + split >=0.2.5, + stack, + stm >=2.5.1.0, + tar >=0.6.2.0, + template-haskell >=2.20.0.0, + text >=2.0.2, + time >=1.12.2, + transformers >=0.6.1.0, + unix-compat >=0.7.2, + unordered-containers >=0.2.20, + vector >=0.13.1.0, + yaml >=0.11.11.2, + zlib >=0.6.3.0 + + if os(windows) + cpp-options: -DWINDOWS + build-depends: Win32 >=2.13.3.0 + + else + build-tool-depends: hsc2hs:hsc2hs + build-depends: unix + + if (impl(ghc >=9.4.5) && os(windows)) + build-depends: network >=3.1.2.9 + + if flag(developer-mode) + cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=True + + else + cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=False + + if flag(disable-stack-upload) + cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=True + + else + cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=False + + if flag(static) + ld-options: -static -pthread + +executable stack-integration-test + main-is: IntegrationSpec.hs + hs-source-dirs: tests/integration tests/integration/lib + other-modules: + StackTest + Paths_stack + + autogen-modules: Paths_stack + default-language: GHC2021 + ghc-options: + -fwrite-ide-info -hiedir=.hie -Wall -Wmissing-export-lists + -optP-Wno-nonportable-include-path -threaded -rtsopts + -with-rtsopts=-N + + build-depends: + Cabal >=3.8.1.0 && <3.12, + aeson >=2.0.3.0, + aeson-warning-parser >=0.1.1, + ansi-terminal >=1.0.2, + array >=0.5.6.0, + async >=2.2.5, + attoparsec >=0.14.4, + base >=4.16.0.0 && <5, + base64-bytestring >=1.2.1.0, + bytestring >=0.11.5.3, + casa-client >=0.0.2, + companion >=0.1.0, + conduit >=1.3.5, + conduit-extra >=1.3.6, + containers >=0.6.7, + crypton >=0.34, + directory >=1.3.8.5, + echo >=0.1.4, + exceptions >=0.10.7, + extra >=1.7.16, + file-embed >=0.0.16.0, + filelock >=0.1.1.7, + filepath >=1.4.300.1, + fsnotify >=0.4.1, + generic-deriving >=1.14.5, + ghc-boot >=9.6.6, + hashable >=1.4.4.0, + hi-file-parser >=0.1.6.0, + hpack >=0.36.0, + hpc >=0.6.2.0, + hspec >=2.11.9, + http-client >=0.7.17, + http-client-tls >=0.3.6.2, + http-conduit >=2.3.8.3, + http-download >=0.2.1.0, + http-types >=0.12.4, + memory >=0.18.0, + microlens >=0.4.13.1, + mtl >=2.3.1, + mustache >=2.4.2, + neat-interpolation >=0.5.1.4, + open-browser >=0.2.1.0, + optparse-applicative >=0.18.1.0, + optparse-generic >=1.5.2, + pantry >=0.10.0, + path >=0.9.5, + path-io >=1.8.2, + persistent >=2.14.0.0 && <2.15, + persistent-sqlite >=2.13.3.0, + pretty >=1.1.3.6, + process >=1.6.13.2, + project-template >=0.2.1.0, + random >=1.2.1.2, + rio >=0.1.22.0, + rio-prettyprint >=0.1.8.0, + split >=0.2.5, + stm >=2.5.1.0, + tar >=0.6.2.0, + template-haskell >=2.20.0.0, + text >=2.0.2, + time >=1.12.2, + transformers >=0.6.1.0, + unix-compat >=0.7.2, + unordered-containers >=0.2.20, + vector >=0.13.1.0, + yaml >=0.11.11.2, + zlib >=0.6.3.0 + + if os(windows) + cpp-options: -DWINDOWS + build-depends: Win32 >=2.13.3.0 + + else + build-tool-depends: hsc2hs:hsc2hs + build-depends: unix + + if (impl(ghc >=9.4.5) && os(windows)) + build-depends: network >=3.1.2.9 + + if flag(developer-mode) + cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=True + + else + cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=False + + if flag(disable-stack-upload) + cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=True + + else + cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=False + + if !flag(integration-tests) + buildable: False + + if flag(static) + ld-options: -static -pthread + +test-suite stack-unit-test + type: exitcode-stdio-1.0 + main-is: Spec.hs + build-tool-depends: hspec-discover:hspec-discover + hs-source-dirs: tests/unit + other-modules: + Stack.ArgsSpec + Stack.Build.ExecuteSpec + Stack.Build.TargetSpec + Stack.Config.DockerSpec + Stack.ConfigSpec + Stack.DotSpec + Stack.Ghci.ScriptSpec + Stack.GhciSpec + Stack.LockSpec + Stack.NixSpec + Stack.PackageDumpSpec + Stack.Types.TemplateNameSpec + Stack.UploadSpec + Paths_stack + + autogen-modules: Paths_stack + default-language: GHC2021 + ghc-options: + -fwrite-ide-info -hiedir=.hie -Wall -Wmissing-export-lists + -optP-Wno-nonportable-include-path -threaded + + build-depends: + Cabal >=3.8.1.0 && <3.12, + QuickCheck >=2.14.3, + aeson >=2.0.3.0, + aeson-warning-parser >=0.1.1, + ansi-terminal >=1.0.2, + array >=0.5.6.0, + async >=2.2.5, + attoparsec >=0.14.4, + base >=4.16.0.0 && <5, + base64-bytestring >=1.2.1.0, + bytestring >=0.11.5.3, + casa-client >=0.0.2, + companion >=0.1.0, + conduit >=1.3.5, + conduit-extra >=1.3.6, + containers >=0.6.7, + crypton >=0.34, + directory >=1.3.8.5, + echo >=0.1.4, + exceptions >=0.10.7, + extra >=1.7.16, + file-embed >=0.0.16.0, + filelock >=0.1.1.7, + filepath >=1.4.300.1, + fsnotify >=0.4.1, + generic-deriving >=1.14.5, + ghc-boot >=9.6.6, + hashable >=1.4.4.0, + hi-file-parser >=0.1.6.0, + hpack >=0.36.0, + hpc >=0.6.2.0, + hspec >=2.11.9, + http-client >=0.7.17, + http-client-tls >=0.3.6.2, + http-conduit >=2.3.8.3, + http-download >=0.2.1.0, + http-types >=0.12.4, + memory >=0.18.0, + microlens >=0.4.13.1, + mtl >=2.3.1, + mustache >=2.4.2, + neat-interpolation >=0.5.1.4, + open-browser >=0.2.1.0, + optparse-applicative >=0.18.1.0, + pantry >=0.10.0, + path >=0.9.5, + path-io >=1.8.2, + persistent >=2.14.0.0 && <2.15, + persistent-sqlite >=2.13.3.0, + pretty >=1.1.3.6, + process >=1.6.13.2, + project-template >=0.2.1.0, + random >=1.2.1.2, + raw-strings-qq >=1.1, + rio >=0.1.22.0, + rio-prettyprint >=0.1.8.0, + split >=0.2.5, + stack, + stm >=2.5.1.0, + tar >=0.6.2.0, + template-haskell >=2.20.0.0, + text >=2.0.2, + time >=1.12.2, + transformers >=0.6.1.0, + unix-compat >=0.7.2, + unordered-containers >=0.2.20, + vector >=0.13.1.0, + yaml >=0.11.11.2, + zlib >=0.6.3.0 + + if os(windows) + cpp-options: -DWINDOWS + build-depends: Win32 >=2.13.3.0 + + else + build-tool-depends: hsc2hs:hsc2hs + build-depends: unix + + if (impl(ghc >=9.4.5) && os(windows)) + build-depends: network >=3.1.2.9 + + if flag(developer-mode) + cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=True + + else + cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=False + + if flag(disable-stack-upload) + cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=True + + else + cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=False + + if os(windows) + hs-source-dirs: tests/unit/windows/ + other-modules: Stack.Ghci.FakePaths + + else + hs-source-dirs: tests/unit/unix/ + other-modules: Stack.Ghci.FakePaths diff --git a/stack-disabled-global-warnings.patch b/stack-disabled-global-warnings.patch index fd4525d..6505260 100644 --- a/stack-disabled-global-warnings.patch +++ b/stack-disabled-global-warnings.patch @@ -4,7 +4,7 @@ diff -up stack-2.15.7/src/Stack/Config.hs~ stack-2.15.7/src/Stack/Config.hs @@ -435,9 +435,9 @@ configFromConfigMonoid fromFirst Constants.hackageBaseUrl configMonoid.hackageBaseUrl hideSourcePaths = fromFirstTrue configMonoid.hideSourcePaths - recommendUpgrade = fromFirstTrue configMonoid.recommendUpgrade + recommendStackUpgrade = fromFirstTrue configMonoid.recommendStackUpgrade - notifyIfNixOnPath = fromFirstTrue configMonoid.notifyIfNixOnPath - notifyIfGhcUntested = fromFirstTrue configMonoid.notifyIfGhcUntested - notifyIfCabalUntested = fromFirstTrue configMonoid.notifyIfCabalUntested @@ -19,8 +19,8 @@ diff -up stack-2.15.7/src/Stack/Types/ConfigMonoid.hs~ stack-2.15.7/src/Stack/Ty +++ stack-2.15.7/src/Stack/Types/ConfigMonoid.hs 2024-08-02 01:20:22.724711778 +0800 @@ -170,11 +170,11 @@ data ConfigMonoid = ConfigMonoid -- ^ See 'configHideSourcePaths' - , recommendUpgrade :: !FirstTrue - -- ^ See 'configRecommendUpgrade' + , recommendStackUpgrade :: !FirstTrue + -- ^ See 'configRecommendStackUpgrade' - , notifyIfNixOnPath :: !FirstTrue + , notifyIfNixOnPath :: !FirstFalse -- ^ See 'configNotifyIfNixOnPath' @@ -33,9 +33,9 @@ diff -up stack-2.15.7/src/Stack/Types/ConfigMonoid.hs~ stack-2.15.7/src/Stack/Ty , notifyIfArchUnknown :: !FirstTrue -- ^ See 'configNotifyIfArchUnknown' @@ -317,11 +317,11 @@ parseConfigMonoidObject rootDir obj = do - let styles = fromMaybe mempty $ configMonoidStylesUS <|> configMonoidStylesGB hideSourcePaths <- FirstTrue <$> obj ..:? configMonoidHideSourcePathsName - recommendUpgrade <- FirstTrue <$> obj ..:? configMonoidRecommendUpgradeName + recommendStackUpgrade <- + FirstTrue <$> obj ..:? configMonoidRecommendStackUpgradeName - notifyIfNixOnPath <- FirstTrue <$> obj ..:? configMonoidNotifyIfNixOnPathName + notifyIfNixOnPath <- FirstFalse <$> obj ..:? configMonoidNotifyIfNixOnPathName notifyIfGhcUntested <- diff --git a/stack.spec b/stack.spec index 98541f6..bb67b63 100644 --- a/stack.spec +++ b/stack.spec @@ -11,14 +11,14 @@ %global companion companion-0.1.0 %global cryptonconduit crypton-conduit-0.2.3 %global filelock filelock-0.1.1.7 -%global hifileparser hi-file-parser-0.1.6.0 -%global hpack hpack-0.36.1 +%global hifileparser hi-file-parser-0.1.7.0 +%global hpack hpack-0.37.0 %global httpdownload http-download-0.2.1.0 %global mintty mintty-0.1.4 %global mustache mustache-2.4.2 %global neatinterpolation neat-interpolation-0.5.1.4 -%global openbrowser open-browser-0.2.1.0 -%global pantry pantry-0.9.3.2 +%global openbrowser open-browser-0.2.1.1 +%global pantry pantry-0.10.0 %global projecttemplate project-template-0.2.1.0 %global rioorphans rio-orphans-0.1.2.0 %global staticbytes static-bytes-0.1.0 @@ -28,9 +28,9 @@ # testsuite missing deps: raw-strings-qq Name: %{pkg_name} -Version: 2.15.7 +Version: 3.1.1 # can only be reset when all subpkgs bumped -Release: 35%{?dist} +Release: 36%{?dist} Summary: Haskell stable package build tool License: BSD-3-Clause @@ -54,6 +54,7 @@ Source14: https://hackage.haskell.org/package/%{pantry}/%{pantry}.tar.gz Source15: https://hackage.haskell.org/package/%{projecttemplate}/%{projecttemplate}.tar.gz Source16: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz Source17: https://hackage.haskell.org/package/%{staticbytes}/%{staticbytes}.tar.gz +Source18: https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources Source20: stack-symlink-distro-ghc @@ -63,6 +64,7 @@ Patch0: stack-disabled-global-warnings.patch Patch1: stack-Setup-Platforms.patch # Begin cabal-rpm deps: +BuildRequires: dos2unix BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel @@ -91,6 +93,7 @@ BuildRequires: ghc-fsnotify-devel BuildRequires: ghc-generic-deriving-devel BuildRequires: ghc-ghc-boot-devel BuildRequires: ghc-githash-devel +BuildRequires: ghc-hashable-devel #BuildRequires: ghc-hi-file-parser-devel #BuildRequires: ghc-hpack-devel BuildRequires: ghc-hpc-devel @@ -159,6 +162,7 @@ BuildRequires: ghc-fsnotify-prof BuildRequires: ghc-generic-deriving-prof BuildRequires: ghc-ghc-boot-prof BuildRequires: ghc-githash-prof +BuildRequires: ghc-hashable-prof #BuildRequires: ghc-hi-file-parser-prof #BuildRequires: ghc-hpack-prof BuildRequires: ghc-hpc-prof @@ -216,11 +220,9 @@ BuildRequires: ghc-unliftio-core-prof %endif # for missing dep 'casa-types': BuildRequires: ghc-base16-bytestring-devel -BuildRequires: ghc-hashable-devel BuildRequires: ghc-path-pieces-devel %if %{with ghc_prof} BuildRequires: ghc-base16-bytestring-prof -BuildRequires: ghc-hashable-prof BuildRequires: ghc-path-pieces-prof %endif # for missing dep 'crypton-conduit': @@ -396,6 +398,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 +dos2unix -k -n %{SOURCE18} %{name}.cabal %autopatch -p1 # End cabal-rpm setup @@ -420,8 +423,6 @@ mkdir -p %{buildroot}%{_mandir}/man1/ help2man --no-info %{buildroot}%{_bindir}/%{name} > %{buildroot}%{_mandir}/man1/%{name}.1 # End cabal-rpm install -# open-browser -rm %{buildroot}%{_bindir}/example echo %{_bindir}/hpack >> %{hpack}/ghc-hpack.files echo %{_bindir}/haskell-mustache >> %{mustache}/ghc-mustache.files @@ -468,6 +469,9 @@ PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Tue Mar 25 2025 Jens Petersen - 3.1.1-36 +- https://hackage.haskell.org/package/stack-3.1.1/changelog + * Sun Jan 19 2025 Fedora Release Engineering - 2.15.7-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild