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

Haskell updates #69886

Merged
merged 30 commits into from Oct 2, 2019
Merged

Haskell updates #69886

merged 30 commits into from Oct 2, 2019

Conversation

domenkozar
Copy link
Member

No description provided.

TravisWhitaker and others added 10 commits September 25, 2019 17:03
This update was generated by hackage2nix v2.15.0 from Hackage revision
commercialhaskell/all-cabal-hashes@43ab240.
This update was generated by hackage2nix v2.15.0 from Hackage revision
commercialhaskell/all-cabal-hashes@05d7197.
Without this change, the build fails with:

```
Warning:
    This package indirectly depends on multiple versions of the same package. This is very likely to cause a compile failure.
      package hackage-db (hackage-db-2.0.1-AliTRXEJBGFAEMpONOEnbV) requires Cabal-2.4.0.1
      package hpack (hpack-0.32.0-1iJuukTWmC4EGkYhAiFeII) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
      package distribution-nixpkgs (distribution-nixpkgs-1.3.1-82Z2DCdLAUs8Q2gjtlPLz5) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
      package cabal2nix (cabal2nix-2.15.0) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
      package cabal2nix (cabal2nix-2.15.0) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
      package cabal2nix (cabal2nix-2.15.0) requires Cabal-3.0.0.0-CD1INMNwoxXIKVgcu1nec5
```
This update was generated by hackage2nix v2.15.0 from Hackage revision
commercialhaskell/all-cabal-hashes@47b2f92.
`niv` used to depend on the broken `github`. The dependency was removed
and `niv` builds fine.
@domenkozar
Copy link
Member Author

@GrahamcOfBorg build cachix niv cabal2nix

@domenkozar
Copy link
Member Author

@GrahamcOfBorg eval

Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

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

👎

This branch is in no shape for a merge. Some of the changes to configuration-hackage2nix.yaml didn't even have a chance to take effect yet because the generator wasn't run since they were added.

@domenkozar
Copy link
Member Author

Sure, I'd like to understand what's missing and help out. I should have opened a draft PR, but too late :)

@domenkozar
Copy link
Member Author

@GrahamcOfBorg build cachix niv cabal2nix

@domenkozar
Copy link
Member Author

@peti https://hydra.nixos.org/eval/1545587 looks good

@domenkozar
Copy link
Member Author

@peti what's left?

This update was generated by hackage2nix v2.15.0-1-g5325ccd from Hackage revision
commercialhaskell/all-cabal-hashes@36c2589.
@peti
Copy link
Member

peti commented Oct 1, 2019

@peti what's left?

Haddock is currently broken.

Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

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

We need a working haddock, I suppose: https://hydra.nixos.org/eval/1546016

@domenkozar
Copy link
Member Author

OK. I'm going to make another release of cachix and we can merge this tomorrow.

This update was generated by hackage2nix v2.15.0-1-g5325ccd from Hackage revision
commercialhaskell/all-cabal-hashes@c3176c0.
@domenkozar
Copy link
Member Author

Released, if you update the set we can fix haddock and merge.

This update was generated by hackage2nix v2.15.0-1-g5325ccd from Hackage revision
commercialhaskell/all-cabal-hashes@b51789e.
@domenkozar
Copy link
Member Author

domenkozar commented Oct 1, 2019

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 70dddd52252..4604a941ae8 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2488,11 +2488,7 @@ extra-packages:
   - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
   - haddock < 2.17                      # required on GHC 7.10.x
   - haddock == 2.17.*                   # required on GHC 8.0.x
-  - haddock-api == 2.15.*               # required on GHC 7.8.x
-  - haddock-api == 2.16.*               # required on GHC 7.10.x
-  - haddock-api == 2.17.*               # required on GHC 8.0.x
-  - haddock-library == 1.2.*            # required for haddock-api-2.16.x
-  - haddock-library == 1.4.3            # required for haddock-api-2.17.x
+  - haddock-api == 2.22.*               # 2.23.* breaks on GHC 8.6
   - happy <1.19.6                       # newer versions break Agda
   - haskell-gi-overloading == 0.0       # gi-* packages use this dependency to disable overloading support
   - haskell-src-exts == 1.19.*          # required by hindent and structured-haskell-mode

This should fix it I guess + an override.

This update was generated by hackage2nix v2.15.0-1-g5325ccd from Hackage revision
commercialhaskell/all-cabal-hashes@845035f.
@domenkozar
Copy link
Member Author

@peti does the above patch look good?

@peti
Copy link
Member

peti commented Oct 2, 2019

@peti does the above patch look good?

Yes, it looks good to me. I'm not sure whether other haddock packages will build properly with a version of haddock-api that's older than their own ... but they might. I haven't checked.

@domenkozar
Copy link
Member Author

@peti cool, if you can regenerate the packages I'll verify they build and we can merge.

This update was generated by hackage2nix v2.15.0-1-g5325ccd from Hackage revision
commercialhaskell/all-cabal-hashes@54d61d7.
@peti
Copy link
Member

peti commented Oct 2, 2019

Ff you can regenerate the packages I'll verify they build and we can merge.

Done. In case you are not aware of the video, https://www.youtube.com/watch?v=qX0mgtSm360 might be of interest.

@domenkozar
Copy link
Member Author

$ nix-build -A haskellPackages.haddock
/nix/store/whfsdjijy0arma080lw8s087gl11pbsy-haddock-2.22.0

It seems to work again. Going to merge after CI passes the evaluation checks.

@domenkozar domenkozar merged commit cb4332e into master Oct 2, 2019
@peti
Copy link
Member

peti commented Oct 2, 2019

I would not have merged the branch in this state. I would have liked to do more clean-up first. 😞

@domenkozar
Copy link
Member Author

I really wanted nixpkgs master fixed, seems like the cleanup can be done on top of this work? :)

@peti
Copy link
Member

peti commented Oct 2, 2019

Well, if you don't want to take my interests seriously, then I guess I'll just file that under "experience".

@domenkozar
Copy link
Member Author

@peti I've asked you (multiple times) in this PR:

  • that I'd really like to get this merged
  • what do you think is missing

You approved the PR, then said we have to fix haddock. I've shown you the diff I applied (which I simplified).

So I'm quite certain I did my best to give you a chance to communicate what you'd like to do.

@domenkozar
Copy link
Member Author

That said, thanks for the video, I'll watch it.

@chkno chkno mentioned this pull request Oct 24, 2019
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants