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.

Sign up for GitHub

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

Jump to bottom

Update Haskell package set to LTS 15.8 (plus other fixes) #85178

Merged
merged 15 commits into from
Apr 17, 2020
Merged

Update Haskell package set to LTS 15.8 (plus other fixes) #85178

merged 15 commits into from
Apr 17, 2020

Conversation

peti
Copy link
Member

@peti peti commented Apr 13, 2020 •
edited
Loading

This PR is test-built by Hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. I'll fix up the remaining errors and merge it on Friday, 2020-04-17 20:00 CET. You can watch this live on Twitch at https://www.twitch.tv/peti343. In addition to the chat features offered by Twitch, there is also a voice conference at https://discord.gg/YTEa3XR that viewers can use to chat with me and with each other.

TODO

@peti peti self-assigned this Apr 13, 2020
@ofborg ofborg bot added 8.has: documentation This PR adds or changes documentation 8.has: package (new) This PR adds a new package labels Apr 13, 2020
@ofborg ofborg bot requested a review from kosmikus April 13, 2020 19:55
@nh2
Copy link
Contributor

nh2 commented Apr 17, 2020

One thing I'd like us to look into:

My CI failure against master says:

Configuring ghc-lib-parser-ex-8.8.5.8...
Setup: Encountered missing dependencies:
ghc-lib-parser -any

builder for '/nix/store/4bhjr2nz9i2lyffp6ivqwxf7dxakx4ch-ghc-lib-parser-ex-8.8.5.8.drv' failed with exit code 1

And indeed, hackage-packages.nix doesn't list in "ghc-lib-parser-ex" a dependency on ghc-lib-parser, even though the cabal file of that version lists the dependency.

@cdepillabout
Copy link
Member

@nh2 It looks like that dependency is behind a flag, which is maybe why cabal2nix isn't picking it up.

https://hackage.haskell.org/package/ghc-lib-parser-ex-8.8.5.8/ghc-lib-parser-ex.cabal

@nh2
Copy link
Contributor

nh2 commented Apr 17, 2020 •
edited
Loading

It looks like that dependency is behind a flag, which is maybe why cabal2nix isn't picking it up.

@cdepillabout Thanks! And it looks like the logic is changing again: shayne-fletcher/ghc-lib-parser-ex#42

I've asked in shayne-fletcher/ghc-lib-parser-ex#42 (comment).

@nh2 nh2 mentioned this pull request Apr 17, 2020
Merged
@guibou
Copy link
Contributor

guibou commented Apr 17, 2020

krank author here. I'm really happy that you are trying krank to track outdated overrides. Please, let me know (here or in krank issue tracker) if there is any improvement I can do.

@nh2
Copy link
Contributor

nh2 commented Apr 17, 2020

@guibou I hadn't known about krank until now, that sounds really useful also for my own projects (and especially ugprades of NixOS!).

No specific requests yet, but I noticed one thing: Given that krank is a Haskell program, could you add it to Stackage? That would significantly increase the chances that it itself will not break in nixpkgs (reducing maintenance effort over here), and will also make it much easier to get it to build e.g. in static-haskell-nix.

@guibou guibou mentioned this pull request Apr 17, 2020
Closed
@peti peti force-pushed the haskell-updates branch from 5eb51fc to 5c17368 Compare April 17, 2020 18:48
peti and others added 9 commits April 17, 2020 20:49
@peti
LTS Haskell 15.8
572e8f6
@peti
hackage2nix: unbreak hasql-pool
629af9f
@peti
hackage2nix: unbreak postgrest
83d84e6
@peti
hackage2nix: update list of broken builds to fix evaluation errors
fd63776
@peti
hackage-packages.nix: automatic Haskell package set update
fd11032 
This update was generated by hackage2nix v2.15.1 from Hackage revision
commercialhaskell/all-cabal-hashes@fcda256.
@ggreif @peti
ghcHEAD: bump to 8.11.20200403 (#84217)
7932fb2 
* ghcHEAD: bump to 8.11.20200403

* ghcHead: reduce diff vs. 8.10.1

dontAddExtraLibs was removed by accident (IMO) in ea19a8e

* ghcHEAD: add ability to use system libffi

- enable nixpkgs' libffi
- minimise diffs against 8.10.1
- remove patching

* remove configure warning about --with-curses-includes

configure: WARNING: unrecognized options: --with-curses-includes
@cdepillabout @peti
spago: 0.14.0 -> 0.15.1
a0612c2
@athas @peti
futhark: stop wrapping the executable
802dfc8
@turion @peti
haskell simple-affine-space: Disable test suite
a762316
jappeace and others added 5 commits April 17, 2020 20:50
@jappeace @peti
cut-the-crap: init at 1.0.0
b95534a
@mdorman @peti
cabal-install-parsers: update Cabal dependency
d59d157 
This also unbreaks `haskell-ci`.
@mikesperber @peti
haskell-tensorflow: unbreak
53cfd1d 
- get the current Git head of haskell-tensorflow
- adjust dependencies
@guibou @peti
haskellPackages.ghcWithPackages: fix for GHC 8.10
abc4f96 
This closes #79441.

ghcWithPackages is using `ghc-pkg recache` to build its package
database. By doing so, it overrides the `package.cache[.lock]` files.

Details are unclear, but GHC 8.10 changed a bit the behavior.
Previously, it was unconditionally replacing the files by new ones. Now
it tries to open (for modification) the files. These files are symlinks
to another nix derivation, which is hence read-only.

This commit removes the files before running `ghc-pkg recache`, hence it
will just write the new files.

Tested with `haskellPackages.ghcWithPackages` (i.e. GHC 8.8) and
`haskell.packages.ghc8101.ghcWithPackages` (i.e GHC 8.10) with the
following nix file, at the root of the nixpkgs repository:

```
with import ./. {
  overlays = [
    (
      self: super: {
        haskellPackages = super.haskell.packages.ghc8101.override {
          overrides = selfh: superh: {
             th-lift-instances = super.haskell.lib.doJailbreak superh.th-lift-instances;
             th-expand-syns    = super.haskell.lib.doJailbreak superh.th-expand-syns;
             th-reify-many     = super.haskell.lib.doJailbreak superh.th-reify-many;
             th-orphans        = super.haskell.lib.doJailbreak superh.th-orphans;
             haskell-src-meta  = super.haskell.lib.doJailbreak superh.haskell-src-meta;
          };
        };
      }
  )
  ];
};
haskellPackages.ghcWithPackages(p:[p.PyF])
```

This will test with GHC 8.10. Comment out the `overlays` to test with
GHC 8.8.
@peti
haskell-ghc-lib-parser-ex: fix build with GHC versions prior to 8.8.x
d6aedf7
@peti peti force-pushed the haskell-updates branch from 5c17368 to d6aedf7 Compare April 17, 2020 18:51
@peti peti merged commit e9687df into master Apr 17, 2020
@junjihashimoto junjihashimoto mentioned this pull request Apr 21, 2020
Closed
@peti
Copy link
Member Author

peti commented Apr 24, 2020

Next week we'll merge #85926.

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

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@infinisil infinisil Awaiting requested review from infinisil

@kosmikus kosmikus Awaiting requested review from kosmikus

Assignees

@peti peti

Labels
6.topic: haskell 8.has: clean-up 8.has: documentation This PR adds or changes documentation 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.