Skip to content

compilers/ghc: grooming various versions#84980

Closed
ggreif wants to merge 6 commits intoNixOS:haskell-updatesfrom
ggreif:haskell-updates
Closed

compilers/ghc: grooming various versions#84980
ggreif wants to merge 6 commits intoNixOS:haskell-updatesfrom
ggreif:haskell-updates

Conversation

@ggreif
Copy link
Contributor

@ggreif ggreif commented Apr 11, 2020 •
edited
Loading

Motivation for this change

removing GHC v8.8.1
typofixes and structuredAttrs maintenance

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

peti and others added 5 commits April 11, 2020 02:31
@peti
hackage-packages.nix: automatic Haskell package set update
ec3f150 
This update was generated by hackage2nix v2.15.1 from Hackage revision
commercialhaskell/all-cabal-hashes@53eef6b.
@ggreif
ghcHEAD: bump to 8.11.20200403 (NixOS#84217)
6c7abfe 
* 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
@ggreif
compilers/ghc: fix a few typos
8d37a78
@globin @ggreif
ghc883: fix structuredAttrs build
c8aa986
@ggreif
compilers/ghc: apply structuredAttrs patch to other ghcs
a65438c 
Ported from:

> [haskell-updates c8aa986] ghc883: fix structuredAttrs build
>  Author: Robin Gloster <mail@glob.in>
>  Date: Sat Apr 4 19:21:31 2020 +0200
>  1 file changed, 3 insertions(+), 3 deletions(-)
@ggreif ggreif changed the base branch from master to haskell-updates April 11, 2020 09:58
@ofborg ofborg bot added 6.topic: haskell General-purpose, statically typed, purely functional programming language 8.has: documentation This PR adds or changes documentation and removed 8.has: documentation This PR adds or changes documentation labels Apr 11, 2020
@ofborg ofborg bot requested review from kosmikus and peti April 11, 2020 10:05
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Apr 11, 2020
@cdepillabout
Copy link
Member

cdepillabout commented Apr 11, 2020

@GrahamcOfBorg build ghc
@GrahamcOfBorg build haskellPackages.lens

@ofborg ofborg bot added 8.has: documentation This PR adds or changes documentation 8.has: clean-up This PR removes packages or removes other cruft labels Apr 11, 2020
@ggreif
Copy link
Contributor Author

ggreif commented Apr 11, 2020

@GrahamcOfBorg build elmPackages.elm

@peti peti mentioned this pull request Apr 17, 2020
Merged
7 tasks
@peti peti force-pushed the haskell-updates branch 2 times, most recently from 5c17368 to d6aedf7 Compare April 17, 2020 18:51
peti
peti requested changes Apr 17, 2020
View reviewed changes
Copy link
Member

@peti peti left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I would love to merge this PR, but it contains changes to hackage-packges.nix that don't belong here, IMHO. Can you please edit the PR to drop all changes to that file?

peti
peti approved these changes Apr 17, 2020
View reviewed changes
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.

Never mind .... I just cherry-picked the relevant changes into the haskell-updates branch as 36d14d053893268ab05d19512a69769208446759 et al.

@peti
Copy link
Member

peti commented Apr 17, 2020

Merged to haskell-updates.

@peti peti closed this Apr 17, 2020
@ggreif
Copy link
Contributor Author

ggreif commented Apr 17, 2020

No idea how I got those pkgs/development/haskell-modules/hackage-packages.nix :-o

@peti Thanks for doing this!

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

Reviewers

@peti peti peti approved these changes

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@infinisil infinisil Awaiting requested review from infinisil

@kosmikus kosmikus Awaiting requested review from kosmikus

Assignees

No one assigned

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ggreif @cdepillabout @peti @globin