Skip to content

Commit

Permalink
Merge pull request #6222 from commercialhaskell/fix5639
Browse files Browse the repository at this point in the history
Fix #5639 Backport efficient ghc-pkg unregister
  • Loading branch information
mpilgrem authored Sep 13, 2023
2 parents 46587bf + a4de03c commit 4eadbac
Show file tree
Hide file tree
Showing 8 changed files with 698 additions and 17 deletions.
9 changes: 9 additions & 0 deletions .hlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
# Stack's code generally avoids the use of C preprocessor (CPP) directives.
- name: CPP
within:
- GHC.Utils.GhcPkg.Main.Compat
- Stack.BuildInfo
- Stack.Constants
# The following list provides an inventory of the small number of modules
Expand All @@ -91,6 +92,14 @@
name:
- CPP
- PackageImports
# GHC.Utils.GhcPkg.Main.Compat's code largely comes from the GHC repository.
- within: GHC.Utils.GhcPkg.Main.Compat
name:
- FlexibleInstances
- KindSignatures
- MultiParamTypeClasses
- ScopedTypeVariables
- TupleSections

# Not considered useful hints
- ignore:
Expand Down
17 changes: 16 additions & 1 deletion doc/maintainers/stack_errors.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,18 @@
In connection with considering Stack's support of the
[Haskell Error Index](https://errors.haskell.org/) initiative, this page seeks
to take stock of the errors that Stack itself can raise, by reference to the
`master` branch of the Stack repository. Last updated: 2023-07-24.
`master` branch of the Stack repository. Last updated: 2023-09-02.

* `GHC.GHC.Utils.GhcPkg.Main.Compat`

~~~haskell
[S-6512] = CannotParse String String String
[S-3384] | CannotOpenDBForModification FilePath IOException
[S-1430] | SingleFileDBUnsupported FilePath
[S-5996] | ParsePackageInfoExceptions String
[S-3189] | CannotFindPackage PackageArg (Maybe FilePath)

~~~

* `Stack.main`: catches exceptions from action `commandLineHandler`.

Expand Down Expand Up @@ -122,6 +133,10 @@ to take stock of the errors that Stack itself can raise, by reference to the
[S-2483] | ExecutableToRunNotFound
~~~

- `Stack.GhcPkg`

`[S-6716]` used in `unregisterGhcPkgIds`

- `Stack.Ghci.GhciException`

~~~haskell
Expand Down
3 changes: 2 additions & 1 deletion package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ dependencies:
- filepath
- fsnotify >= 0.4.1
- generic-deriving
- ghc-boot
- hi-file-parser >= 0.1.4.0
- hpack >= 0.35.3
- hpc
Expand Down Expand Up @@ -110,7 +111,7 @@ dependencies:
- project-template
- random
- rio >= 0.1.22.0
- rio-prettyprint >= 0.1.4.0
- rio-prettyprint >= 0.1.5.0
- split
- stm
- tar
Expand Down
Loading

0 comments on commit 4eadbac

Please sign in to comment.