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

Remove unix constraint from cabal.project #5730

Merged
merged 1 commit into from
Nov 30, 2018
Merged

Conversation

phadej
Copy link
Collaborator

@phadej phadej commented Nov 26, 2018

Add bunch of installed constraints to cabal.project.local.travis


Please include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Any changes that could be relevant to users have been recorded in the changelog.
  • The documentation has been updated, if necessary.
  • If the change is docs-only, [ci skip] is used to avoid triggering the build bots.

Please also shortly describe how you tested your change. Bonus points for added tests!

@phadej
Copy link
Collaborator Author

phadej commented Nov 26, 2018

Will fail with

[ 10 of 220] Compiling Distribution.Compat.Directory ( Distribution/Compat/Directory.hs, /home/ogre/Documents/shared-haskell/cabal/dist-newstyle/build/x86_64-linux/ghc-7.8.4/Cabal-2.4.1.0/build/Distribution/Compat/Directory.o ) [System.Directory changed]

Distribution/Compat/Directory.hs:41:27:
    Not in scope: ‘<$>’
    Perhaps you meant one of these:
      ‘</>’ (imported from System.FilePath),
      ‘<.>’ (imported from System.FilePath)

Distribution/Compat/Directory.hs:41:55:
    Not in scope: ‘<*>’
    Perhaps you meant one of these:
      ‘</>’ (imported from System.FilePath),
      ‘<.>’ (imported from System.FilePath)

@phadej
Copy link
Collaborator Author

phadej commented Nov 26, 2018

@@ -1,5 +1,4 @@
packages: Cabal/ cabal-testsuite/ cabal-install/ solver-benchmarks/ pretty-show-1.6.16/
constraints: unix >= 2.7.1.0
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this breaks OSX build, then let's have an own cabal.project for OSX.

Copy link
Collaborator Author

@phadej phadej Nov 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... or

if os(osx)
  build-depends: unix >= 2.7.1.0

@23Skidoo 23Skidoo mentioned this pull request Nov 26, 2018
4 tasks
@phadej
Copy link
Collaborator Author

phadej commented Nov 26, 2018

The 7.8 and 7.6 failed, as was expected.

@phadej
Copy link
Collaborator Author

phadej commented Nov 26, 2018

Test/Cabal/Server.hs:257:45:
    Couldn't match type `[Char]' with `(ProcessHandle__, [Char])'

argh...

- Add bunch of installed constraints to cabal.project.local.travis
- Fix compat in D.Compat.Directory
- Compat (process-1.1/ghc-7.6) in cabal-testsuite
- validate.sh improvements
- Warningless cabal-testsuite build
@phadej phadej merged commit 6797a9e into 2.4 Nov 30, 2018
@phadej phadej deleted the remove-unix-constraiant branch November 30, 2018 13:56
@phadej
Copy link
Collaborator Author

phadej commented Nov 30, 2018

ping @23Skidoo I think Cabal should be fine with GHC-7.8 and 7.6 now.

(EDIT: i.e. one should make a sdist and test it in separation)

@23Skidoo
Copy link
Member

Great, thanks. I'll wait a week or so before making a bugfix lib:Cabal release.

23Skidoo pushed a commit to 23Skidoo/cabal that referenced this pull request Dec 4, 2018
Remove unix constraint from cabal.project

(cherry picked from commit 6797a9e)
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.

2 participants