Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extended project files (conditionals and imports) #7783

Merged
merged 30 commits into from
Mar 31, 2022
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
4dd4975
initial parser pass
gbaz Oct 4, 2021
2ccd991
first compiling pass
gbaz Oct 28, 2021
e807d2d
get more stuff sort of working
gbaz Nov 29, 2021
ca7499a
conditional parsing actually works
gbaz Nov 30, 2021
26a4cb7
Merge branch 'master' into gb/extended-project-files
gbaz Nov 30, 2021
0c6e6e3
error cleanup and downloads
gbaz Jan 3, 2022
912205c
thread through http transport
gbaz Jan 3, 2022
e2a6259
Merge branch 'master' into gb/extended-project-files
gbaz Jan 3, 2022
e0607be
fix merge
gbaz Jan 3, 2022
ec3763f
better errors and use extended project parsing uniformly
gbaz Jan 5, 2022
21ebfc1
elif support, maybe?
gbaz Jan 5, 2022
bd0031e
fix outdated cmd, add tests, docs
gbaz Jan 6, 2022
e8ae8e0
fix docs
gbaz Jan 7, 2022
0b2e15c
Merge branch 'master' into gb/extended-project-files
gbaz Jan 10, 2022
189262c
use legacyReadFields parser
gbaz Jan 11, 2022
ca71ea7
Merge branch 'master' into gb/extended-project-files
gbaz Feb 1, 2022
1233acf
changelog
gbaz Feb 1, 2022
782892f
cyclical import detection
gbaz Feb 2, 2022
0fcc0b5
fix shadowing
gbaz Feb 2, 2022
9867fbc
add missing file
gbaz Feb 2, 2022
111ae08
Merge branch 'master' into gb/extended-project-files
gbaz Feb 21, 2022
4dc4789
Merge branch 'master' into gb/extended-project-files
gbaz Mar 25, 2022
5d59b18
finish merge
gbaz Mar 25, 2022
c12ef88
Merge branch 'master' into gb/extended-project-files
gbaz Mar 26, 2022
f812afb
fix outstanding merge issue
gbaz Mar 26, 2022
f3c8704
use existing config available when checking for compiler for package …
gbaz Mar 28, 2022
e70d6f9
review comments
gbaz Mar 30, 2022
7525a7d
add missing test file
gbaz Mar 31, 2022
2496a7d
Update pr-7783
gbaz Mar 31, 2022
e562334
Merge branch 'master' into gb/extended-project-files
mergify[bot] Mar 31, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix merge
gbaz committed Jan 3, 2022
commit e0607be72b96e0216b4624d40333837ae62bc863
10 changes: 5 additions & 5 deletions cabal-install/src/Distribution/Deprecated/ParseUtils.hs
Original file line number Diff line number Diff line change
@@ -105,6 +105,11 @@ instance Monad ParseResult where
ParseOk ws x >>= f = case f x of
ParseFailed err -> ParseFailed err
ParseOk ws' x' -> ParseOk (ws'++ws) x'
#if !(MIN_VERSION_base(4,9,0))
fail = parseResultFail
#elif !(MIN_VERSION_base(4,13,0))
fail = Fail.fail
#endif

instance Foldable ParseResult where
foldMap _ (ParseFailed _ ) = mempty
@@ -114,11 +119,6 @@ instance Traversable ParseResult where
traverse _ (ParseFailed err) = pure (ParseFailed err)
traverse f (ParseOk ws x) = ParseOk ws <$> f x

#if !(MIN_VERSION_base(4,9,0))
fail = parseResultFail
#elif !(MIN_VERSION_base(4,13,0))
fail = Fail.fail
#endif

instance Fail.MonadFail ParseResult where
fail = parseResultFail