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

Updates #30

Merged
merged 4 commits into from Oct 19, 2016

Conversation

Projects
None yet
2 participants
@phadej
Collaborator

phadej commented Oct 17, 2016

No description provided.

phadej added some commits Oct 17, 2016

Add bounds to Cabal
- lower bound: we need condBenchmarks
- upper bound: 1.25 will make e.g. `PackageName` opaque
Improve parsing of ~/.cabal/config
Use the Cabal own parser, to cope with upcoming cabal-install config
format

    repository hackage.haskell.org
      url: http://hackage.haskell.org/
      -- ...

Also add revision fields, though they are unused (see comments in code).
Show outdated Hide outdated Distribution/PackDeps.hs
@@ -108,7 +101,8 @@ addPackage m entry =
case Map.lookup package' m of
Nothing -> go package' version
Just PackInfo { piVersion = oldv } ->
if version > oldv
-- in 01-index.tar there are entries with some version

This comment has been minimized.

@snoyberg

snoyberg Oct 18, 2016

Owner

s/some/same ?

@snoyberg

snoyberg Oct 18, 2016

Owner

s/some/same ?

Show outdated Hide outdated Distribution/PackDeps.hs
maxVersion :: PackInfo -> PackInfo -> PackInfo
maxVersion pi1 pi2 = if piVersion pi1 <= piVersion pi2 then pi2 else pi1

This comment has been minimized.

@snoyberg

snoyberg Oct 18, 2016

Owner

Given that we're not actually doing the comparison on piRevision, is there any purpose to this change?

@snoyberg

snoyberg Oct 18, 2016

Owner

Given that we're not actually doing the comparison on piRevision, is there any purpose to this change?

@phadej

This comment has been minimized.

Show comment
Hide comment
@phadej

phadej Oct 19, 2016

Collaborator

Forcepushed

Collaborator

phadej commented Oct 19, 2016

Forcepushed

@snoyberg snoyberg merged commit 8c29885 into snoyberg:cli Oct 19, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@snoyberg

This comment has been minimized.

Show comment
Hide comment
@snoyberg

snoyberg Oct 19, 2016

Owner

Thanks!

Owner

snoyberg commented Oct 19, 2016

Thanks!

snoyberg added a commit that referenced this pull request Oct 19, 2016

@phadej phadej deleted the phadej:updates branch Oct 19, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment