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

Jump to bottom

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

Merged
merged 32 commits into from Jan 8, 2021
Merged

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

merged 32 commits into from Jan 8, 2021

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 self-assigned this Jan 2, 2021
@peti peti mentioned this pull request Jan 2, 2021
Merged
@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
@peti
hackage-packages.nix: automatic Haskell package set update
c6bed7e 
This update was generated by hackage2nix v2.15.6 from Hackage revision
commercialhaskell/all-cabal-hashes@55e6fe8.
@markus1189
haskellPackages.holmes: unbreak
00a90e9 
Thanks to i-am-tom/holmes#15 `holmes` now
builds successfully 🎉
@markus1189
haskellPackages.arbtt: unbreak
a9acf8e 
Thanks to nomeata/arbtt#43 `arbtt` now
builds successfully 🎉
@markus1189
haskellPackages.threadscope: jailbreak to fix build
d812bb9
@cdepillabout
Merge pull request #108460 from markus1189/unbreak-arbtt
d89f456 
haskellPackages.arbtt: unbreak
@cdepillabout
Merge pull request #108459 from markus1189/unbreak-holmes
8f5c69c 
haskellPackages.holmes: unbreak
@peti
hackage-packages.nix: automatic Haskell package set update
ff1008e 
This update was generated by hackage2nix v2.15.6 from Hackage revision
commercialhaskell/all-cabal-hashes@8a3e09d.
@cdepillabout
spago: 0.18 -> 0.19
be17bea
@cdepillabout
Merge pull request #108629 from cdepillabout/update-spago-0.19
cb0119c 
spago: 0.18 -> 0.19
@peti
Stackage Nightly 2021-01-05
7f8e739
@peti
hackage-packages.nix: automatic Haskell package set update
7e27206 
This update was generated by hackage2nix v2.15.6 from Hackage revision
commercialhaskell/all-cabal-hashes@552a413.
@Anton-Latukha
haskellPackages.cryptohash-sha512: dontCheck
0f888c7 
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.
@Anton-Latukha
haskellPackages.hnix-store-remote: unbreak, fix deps
9f4b9b3
@Anton-Latukha
haskellPackages.hnix: fix deps
cfce290
@peti
Merge remote-tracking branch 'origin/master' into haskell-updates.
b6ba72e
@peti
hackage-packages.nix: automatic Haskell package set update
bdc8c8b 
This update was generated by hackage2nix v2.15.6 from Hackage revision
commercialhaskell/all-cabal-hashes@5f0e4ae.
@cdepillabout
Merge pull request #108470 from markus1189/threadscope-jailbreak
c871aec 
haskellPackages.threadscope: jailbreak to fix build
@cleverca22
profiteur: jailbreak and un-break
662eba1
@cdepillabout
haskellPackages.profiteur: remove unnecessary parens
8ff0049
@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.

peti and others added 2 commits January 8, 2021 20:32
maralorn and others added 6 commits January 8, 2021 20:57
@maralorn
haskelPackages.haskell-language-server: 0.7.1 -> 0.8.0
7829f94
@peti
Merge branch '2020-12-31-upd-haskell-packages' of git://github.com/An…
8e68a5e 
…ton-Latukha/nixpkgs into Anton-Latukha-2020-12-31-upd-haskell-packages.
@peti
Merge pull request #108807 from maralorn/hls
063a716 
haskelPackages.haskell-language-server: 0.7.1 -> 0.8.0
@peti
hackage-packages.nix: automatic Haskell package set update
4c16190 
This update was generated by hackage2nix v2.15.6 from Hackage revision
commercialhaskell/all-cabal-hashes@545d5ca.
@peti
hackage2nix: update list of broken builds
7e26c12 
Ping @jb55 for 'elm-export-persistent'.
@peti
hackage-packages.nix: automatic Haskell package set update
9a61689 
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
Reviewers

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

Assignees

@peti peti

Labels
6.topic: haskell 8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 2501-5000 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@peti @cdepillabout @markus1189 @Anton-Latukha @cleverca22 @domenkozar @maralorn