Skip to content

Update Haskell package set to Stackage Nightly 2021-01-02 (plus other fixes)#108252

Merged
peti merged 32 commits intomasterfrom
haskell-updates
Jan 8, 2021
Merged

Update Haskell package set to Stackage Nightly 2021-01-02 (plus other fixes)#108252
peti merged 32 commits intomasterfrom
haskell-updates

Conversation

@peti
Copy link
Member

@peti peti commented Jan 2, 2021

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, 2021-01-08 20:00 +01:00. 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.

@peti peti added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Jan 2, 2021
@peti peti self-assigned this Jan 2, 2021
@peti peti requested a review from cdepillabout as a code owner January 2, 2021 19:22
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jan 2, 2021
@cdepillabout
Copy link
Member

I've rebased the haskell-updates branch on top of master in order to make sure that haskell-updates includes #108362.

That PR changes configuration-common.nix, so I wanted to make sure that someone doesn't change configuration-common.nix here in haskell-updates, and then there is a merge conflict when @peti goes to merge it in.


This haskell-updates branch was originally at commit 32bfa83 before I rebased, and is now at commit 97c61d6.

@peti If you don't want me to do this in the future, please let me know.

peti and others added 19 commits January 5, 2021 02:30
This update was generated by hackage2nix v2.15.6 from Hackage revision
commercialhaskell/all-cabal-hashes@55e6fe8.
Thanks to i-am-tom/holmes#15 `holmes` now
builds successfully 🎉
Thanks to nomeata/arbtt#43 `arbtt` now
builds successfully 🎉
This update was generated by hackage2nix v2.15.6 from Hackage revision
commercialhaskell/all-cabal-hashes@8a3e09d.
This update was generated by hackage2nix v2.15.6 from Hackage revision
commercialhaskell/all-cabal-hashes@552a413.
base16-bytestring had new epoch (1.0) 3 month ago:

https://hackage.haskell.org/package/base16-bytestring-1.0.1.0/changelog

Which fixed the old return type to normal `Either String ByteString`.

`cryptohash-sha512` is stale for ~10-11 months and testsuite does not suport the
new `base16-bytesting` releases.
This update was generated by hackage2nix v2.15.6 from Hackage revision
commercialhaskell/all-cabal-hashes@5f0e4ae.
haskellPackages.threadscope: jailbreak to fix build
@peti
Copy link
Member Author

peti commented Jan 8, 2021

@maralorn, it appears that hls-explicit-imports-plugin won't compile:

Preprocessing library for hls-explicit-imports-plugin-0.1.0.0..
Building library for hls-explicit-imports-plugin-0.1.0.0..
[1 of 1] Compiling Ide.Plugin.ExplicitImports ( src/Ide/Plugin/ExplicitImports.hs, dist/build/Ide/Plugin/ExplicitImports.o, dist/build/Ide/Plugin/ExplicitImports.dyn_o )

src/Ide/Plugin/ExplicitImports.hs:32:1: error:
    Could not find module ‘Ide.Plugin’
    Use -v (or `:set -v` in ghci) to see a list of the files searched for.
   |
32 | import Ide.Plugin
   | ^^^^^^^^^^^^^^^^^

If you have the chance to take a look, then that would be very much appreciated. If all else fails, I'll try to fix the error later tonight during the livestream.

@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: 2501-5000 This PR causes many rebuilds on Darwin and should 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: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jan 8, 2021
@peti peti force-pushed the haskell-updates branch from eaee229 to 9aad7ef Compare January 8, 2021 19:32
peti and others added 2 commits January 8, 2021 20:32
@ofborg ofborg bot added the 8.has: clean-up This PR removes packages or removes other cruft label Jan 8, 2021
maralorn and others added 6 commits January 8, 2021 20:57
…ton-Latukha/nixpkgs into Anton-Latukha-2020-12-31-upd-haskell-packages.
haskelPackages.haskell-language-server: 0.7.1 -> 0.8.0
This update was generated by hackage2nix v2.15.6 from Hackage revision
commercialhaskell/all-cabal-hashes@545d5ca.
Ping @jb55 for 'elm-export-persistent'.
This update was generated by hackage2nix v2.15.6 from Hackage revision
commercialhaskell/all-cabal-hashes@545d5ca.
@peti peti merged commit c25fc73 into master Jan 8, 2021
@peti
Copy link
Member Author

peti commented Jan 11, 2021

@peti If you don't want me to do this in the future, please let me know.

Don't worry, just rebase as you see fit.

My approach is to do a normal merge of master into haskell-updates during the week because that typically won't cause merge conflicts for existing PRs (while re-basing sometimes does), but then I oftentimes do a final re-base on Friday, too, to straighten up and polish the commit history. Either way is fine, though.

@peti
Copy link
Member Author

peti commented Jan 11, 2021

We'll merge #109011 next week.

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

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: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should 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: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants