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

Fix use of multiple subdirs in cabal.project #790

Merged
merged 1 commit into from Jul 28, 2020
Merged

Conversation

hamishmack
Copy link
Collaborator

It is now possible to specify multiple subdirs in a
source-repository-package block. This change fixes the parser
code in haskell.nix so that it understands.

It is now possible to specify multiple subdirs in a
`source-repository-package` block.  This change fixes the parser
code in haskell.nix so that it understands.
@michaelpj
Copy link
Collaborator

Ah, I know why we got away with this: we've started using the lookupSha256 argument instead of the magic comments (which, tbh, I like a lot more), so we don't rely on this parsing.

@hamishmack
Copy link
Collaborator Author

Ah, I know why we got away with this: we've started using the lookupSha256 argument instead of the magic comments (which, tbh, I like a lot more), so we don't rely on this parsing.

I'm not sure that would make a difference. The code that makes lookupSha256 and sha256map work still replaces the source-package-repository and was only ever putting in one path to replace it (so cabal v2-configure should only have found one of the .cabal files).

@michaelpj
Copy link
Collaborator

Then I have no idea how our CI build is passing!

@hamishmack
Copy link
Collaborator Author

I think it is using stackProject' rather than cabalProject'.

@michaelpj
Copy link
Collaborator

Ah yes of course, I forgot I hadn't changed that yet!

@hamishmack hamishmack merged commit 251c899 into master Jul 28, 2020
@iohk-bors iohk-bors bot deleted the hkm/cabal-subdirs branch July 28, 2020 02:20
nc6 added a commit to IntersectMBO/ouroboros-network that referenced this pull request Aug 3, 2020
This is needed to get
input-output-hk/haskell.nix#790, which supports
the multiple subdirs option in cabal.
nc6 added a commit to IntersectMBO/ouroboros-network that referenced this pull request Aug 3, 2020
This is needed to get
input-output-hk/haskell.nix#790, which supports
the multiple subdirs option in cabal.
nc6 added a commit to IntersectMBO/ouroboros-network that referenced this pull request Aug 3, 2020
This is needed to get
input-output-hk/haskell.nix#790, which supports
the multiple subdirs option in cabal.
mrBliss pushed a commit to IntersectMBO/ouroboros-network that referenced this pull request Aug 11, 2020
This is needed to get
input-output-hk/haskell.nix#790, which supports
the multiple subdirs option in cabal.
mrBliss pushed a commit to IntersectMBO/ouroboros-network that referenced this pull request Aug 12, 2020
This is needed to get
input-output-hk/haskell.nix#790, which supports
the multiple subdirs option in cabal.
mrBliss pushed a commit to IntersectMBO/cardano-node that referenced this pull request Aug 12, 2020
This is needed to get
input-output-hk/haskell.nix#790, which supports
the multiple subdirs option in cabal.
mrBliss pushed a commit to IntersectMBO/ouroboros-network that referenced this pull request Aug 13, 2020
This is needed to get
input-output-hk/haskell.nix#790, which supports
the multiple subdirs option in cabal.
booniepepper pushed a commit to booniepepper/haskell.nix that referenced this pull request Feb 4, 2022
It is now possible to specify multiple subdirs in a
`source-repository-package` block.  This change fixes the parser
code in haskell.nix so that it understands.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants