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

Update Haskell package set to LTS 16.12 (plus other fixes) #96560

Merged
merged 30 commits into from Sep 4, 2020
Merged

Conversation

@peti
Copy link
Member

@peti peti commented Aug 28, 2020

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-09-04 20:00 +02: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 added 2 commits Aug 28, 2020
Stackage wants us to stay at 2.9.x, but that version is really quite old now
and updating the new version actually simplifies our code because a couple of
overrides are no longer necessary.
peti added 6 commits Aug 29, 2020
This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision
commercialhaskell/all-cabal-hashes@ba17676.
This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision
commercialhaskell/all-cabal-hashes@f23325d.
This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision
commercialhaskell/all-cabal-hashes@f254e26.
This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision
commercialhaskell/all-cabal-hashes@a91f6a2.
This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision
commercialhaskell/all-cabal-hashes@c93a6c8.
@maralorn
Copy link
Contributor

@maralorn maralorn commented Sep 1, 2020

Question: When I understand it correctly friday is the date of branch off. Will we do this merge before branch off or will we backport it?
There are some fixes that should probably still reach 20.09.

@maralorn maralorn mentioned this pull request Sep 1, 2020
0 of 8 tasks complete
peti and others added 5 commits Sep 2, 2020
This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision
commercialhaskell/all-cabal-hashes@e85cb56.
haskellPackages.pandoc-crossref: mark unbroken
This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision
commercialhaskell/all-cabal-hashes@99b594f.
@peti
Copy link
Member Author

@peti peti commented Sep 3, 2020

Question: When I understand it correctly friday is the date of branch off. Will we do this merge before branch off or will we backport it?

I believe that back-porting important fixes into the release branch is the way to go.

maralorn and others added 10 commits Sep 3, 2020
hasura: 1.2.1 -> 1.3.1-beta.1
This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision
commercialhaskell/all-cabal-hashes@f491652.
haskellPackages.haskell-language-server: 0.3.0 -> 0.4.0
This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision
commercialhaskell/all-cabal-hashes@43aab36.
peti added 7 commits Sep 4, 2020
This update was generated by hackage2nix v2.15.5-15-g1073700 from Hackage revision
commercialhaskell/all-cabal-hashes@037ebc8.
This update was generated by hackage2nix v2.15.5-15-g1073700 from Hackage revision
commercialhaskell/all-cabal-hashes@85155b5.
This update was generated by hackage2nix v2.15.5-15-g1073700 from Hackage revision
commercialhaskell/all-cabal-hashes@18ef8de.
@peti peti merged commit efc5084 into master Sep 4, 2020
2 of 3 checks passed
2 of 3 checks passed
tests tests
Details
action
Details
Wait for ofborg This failed status will be cleared when ofborg finishes eval.
Details
@peti
Copy link
Member Author

@peti peti commented Sep 11, 2020

Next week (a.k.a. today) we'll merge #97784.

@jtojnar

This comment has been minimized.

Copy link
Contributor

@jtojnar jtojnar commented on 05bf532 Sep 14, 2020

Unfortunately, this breaks hakyll.

Edit: I tried fixing it with overrides but it is even uglier than the previous code and does not even work:

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0a61c0accb4..ff5e993bc71 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -140,11 +140,14 @@ self: super: {
   barbly = addBuildDepend super.barbly pkgs.darwin.apple_sdk.frameworks.AppKit;
 
   # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
-  hakyll = if pkgs.stdenv.isDarwin
-    then dontCheck (overrideCabal super.hakyll (drv: {
-      testToolDepends = [];
-    }))
-    else super.hakyll;
+  hakyll = (unmarkBroken (if pkgs.stdenv.isDarwin
+      then dontCheck (overrideCabal super.hakyll (drv: {
+        testToolDepends = [];
+      }))
+      else super.hakyll)).override {
+    pandoc = self.pandoc_2_9;
+    pandoc-citeproc = self.pandoc-citeproc_0_16;
+  };
 
   double-conversion = if !pkgs.stdenv.isDarwin
     then super.double-conversion
@@ -1470,6 +1473,16 @@ self: super: {
   pandoc-types = self.pandoc-types_1_21;
   rfc5051 = self.rfc5051_0_2;
 
+  # Legacy pandoc for hakyll & co.
+  pandoc_2_9 = super.pandoc.override {
+    pandoc-types = self.pandoc-types_1_20;
+    inherit (super) hslua jira-wiki-markup;
+  };
+  pandoc-citeproc_0_16 = super.pandoc-citeproc.override {
+    inherit (super) rfc5051;
+  };
+  pandoc-types_1_20 = super.pandoc-types;
+
   # INSERT NEW OVERRIDES ABOVE THIS LINE
 
 } // (let

This comment has been minimized.

Copy link
Member Author

@peti peti replied Sep 14, 2020

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.