Merge pull request #168049 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
NixOS · Apr 21, 2022 · 1a763b8 · 1a763b8
2 parents 76b6862 + ddbc061
commit 1a763b8
Show file tree

Hide file tree

Showing 18 changed files with 465 additions and 598 deletions.
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
 {
-  "commit": "6387c3141750050e170d6ac030c063536c39aede",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6387c3141750050e170d6ac030c063536c39aede.tar.gz",
-  "sha256": "1w9vy5ky3aqqnkldxqdvma21qz3myhc961xmgh1iqn60q03j4d2j",
-  "msg": "Update from Hackage at 2022-04-06T22:24:53Z"
+  "commit": "e5167f06cba67fa268ebafb97f5ccbffe412cd2a",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e5167f06cba67fa268ebafb97f5ccbffe412cd2a.tar.gz",
+  "sha256": "1ihkrjk7a24wbzjz4wlx3mdh88bbq4665l1ld7gxs5jaimcmhn5j",
+  "msg": "Update from Hackage at 2022-04-09T11:23:17Z"
 }
diff --git a/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix b/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix
@@ -1,8 +1,37 @@
-{ haskellLib }:
+{ haskellLib, fetchpatch, buildPackages }:
 
-let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
+let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak markUnbroken overrideCabal;
 in self: super: {
-  ghcjs = doJailbreak (super.ghcjs.overrideScope (self: super: {
+  ghcjs = overrideCabal (drv: {
+    # Jailbreak and patch can be dropped after https://github.com/ghcjs/ghcjs/pull/833
+    jailbreak = true;
+    patches = drv.patches or [] ++ [
+      (fetchpatch {
+        name = "ghcjs-aeson-2.0.patch";
+        url = "https://github.com/ghcjs/ghcjs/commit/9ef1f92d740e8503d15d91699f57db147f0474cc.patch";
+        sha256 = "0cgxcy6b5870bv4kj54n3bzcqinh4gl4w4r78dg43h2mblhkzbnj";
+      })
+    ];
+  }) (super.ghcjs.overrideScope (self: super: {
     optparse-applicative = self.optparse-applicative_0_15_1_0;
+    webdriver = overrideCabal (drv: {
+      patches = drv.patches or [] ++ [
+        # Patch for aeson 2.0 which adds a lower bound on it, so we don't apply it globally
+        # Pending https://github.com/kallisti-dev/hs-webdriver/pull/183
+        (fetchpatch {
+          name = "webdriver-aeson-2.0.patch";
+          url = "https://github.com/georgefst/hs-webdriver/commit/90ded63218da17fc0bd9f9b208b0b3f60b135757.patch";
+          sha256 = "1xvkk51r2v020xlmci5n1fd1na8raa332lrj7r9f0ijsyfvnqlv0";
+          excludes = [ "webdriver.cabal" ];
+        })
+      ];
+      # Fix line endings so patch applies
+      prePatch = drv.prePatch or "" + ''
+        find . -name '*.hs' | xargs "${buildPackages.dos2unix}/bin/dos2unix"
+      '';
+
+      jailbreak = true;
+      broken = false;
+    }) super.webdriver;
   }));
 }
diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix
@@ -2,6 +2,7 @@
 , pkgsHostHost
 , callPackage
 , fetchgit
+, fetchpatch
 , ghcjsSrcJson ? null
 , ghcjsSrc ? fetchgit (lib.importJSON ghcjsSrcJson)
 , bootPkgs
@@ -36,7 +37,7 @@ let
       })
 
       (callPackage ./common-overrides.nix {
-        inherit haskellLib;
+        inherit haskellLib fetchpatch buildPackages;
       })
       ghcjsDepOverrides
     ]);

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -252,7 +252,7 @@ self: super: {
   binary-protocol = dontCheck super.binary-protocol;    # http://hydra.cryp.to/build/499749/log/raw
   binary-search = dontCheck super.binary-search;
   bits = dontCheck super.bits;                          # http://hydra.cryp.to/build/500239/log/raw
-  bloodhound = dontCheck super.bloodhound;
+  bloodhound = dontCheck super.bloodhound;              # https://github.com/plow-technologies/quickcheck-arbitrary-template/issues/10
   buildwrapper = dontCheck super.buildwrapper;
   burst-detection = dontCheck super.burst-detection;    # http://hydra.cryp.to/build/496948/log/raw
   cabal-meta = dontCheck super.cabal-meta;              # http://hydra.cryp.to/build/497892/log/raw
@@ -2584,6 +2584,15 @@ self: super: {
   # 2022-03-16: Upstream stopped updating bounds https://github.com/haskell-hvr/base-noprelude/pull/15
   base-noprelude = doJailbreak super.base-noprelude;
 
+  # Manually upgrade cryptostore to work around
+  # https://github.com/ocheron/cryptostore/issues/7
+  cryptostore = assert super.cryptostore.version == "0.2.1.0"; overrideCabal {
+    version = "0.2.2.0";
+    sha256 = "0n70amg7y2qwfjhj4xaqjia46fbabba9l2g19ry191m7c4zp1skx";
+    revision = null;
+    editedCabalFile = null;
+  } super.cryptostore;
+
   # 2022-03-16: Bounds need to be loosened https://github.com/obsidiansystems/dependent-sum-aeson-orphans/issues/10
   dependent-sum-aeson-orphans = doJailbreak super.dependent-sum-aeson-orphans;
 

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -89,20 +89,22 @@ self: super: {
   mime-string = disableOptimization super.mime-string;
 
   # Older compilers need the latest ghc-lib to build this package.
-  hls-hlint-plugin = addBuildDepend self.ghc-lib super.hls-hlint-plugin;
+  hls-hlint-plugin = addBuildDepend self.ghc-lib (overrideCabal (drv: {
+      # Workaround for https://github.com/haskell/haskell-language-server/issues/2728
+      postPatch = ''
+        sed -i 's/(GHC.RealSrcSpan x,/(GHC.RealSrcSpan x Nothing,/' src/Ide/Plugin/Hlint.hs
+      '';
+    })
+     super.hls-hlint-plugin);
 
   haskell-language-server = appendConfigureFlags [
-      "-f-fourmolu"
       "-f-stylishhaskell"
       "-f-brittany"
-      "-f-hlint"
     ]
-  (super.haskell-language-server.override {
-    # Not buildable on 8.10
-    hls-fourmolu-plugin = null;
-    # https://github.com/haskell/haskell-language-server/issues/2728
-    hls-hlint-plugin = null;
-  });
+  super.haskell-language-server;
+
+  # has a restrictive lower bound on Cabal
+  fourmolu = doJailbreak super.fourmolu;
 
   # ormolu 0.3 requires Cabal == 3.4
   ormolu = super.ormolu_0_2_0_0;

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -131,18 +131,23 @@ self: super: {
 
   mime-string = disableOptimization super.mime-string;
 
+  # Older compilers need the latest ghc-lib to build this package.
+  hls-hlint-plugin = addBuildDepend self.ghc-lib (overrideCabal (drv: {
+      # Workaround for https://github.com/haskell/haskell-language-server/issues/2728
+      postPatch = ''
+        sed -i 's/(GHC.RealSrcSpan x,/(GHC.RealSrcSpan x Nothing,/' src/Ide/Plugin/Hlint.hs
+      '';
+    })
+     super.hls-hlint-plugin);
+
   haskell-language-server = appendConfigureFlags [
-      "-f-fourmolu"
       "-f-stylishhaskell"
       "-f-brittany"
-      "-f-hlint"
     ]
-  (super.haskell-language-server.override {
-    # Not buildable on 8.8
-    hls-fourmolu-plugin = null;
-    # https://github.com/haskell/haskell-language-server/issues/2728
-    hls-hlint-plugin = null;
-  });
+  super.haskell-language-server;
+
+  # has a restrictive lower bound on Cabal
+  fourmolu = doJailbreak super.fourmolu;
 
   # OneTuple needs hashable instead of ghc-prim for GHC < 9
   OneTuple = super.OneTuple.override {

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -357,6 +357,7 @@ broken-packages:
   - binary-communicator
   - binary-derive
   - binary-ext
+  - binary-generic-combinators
   - binary-indexed-tree
   - binary-protocol
   - binary-tree
@@ -433,7 +434,6 @@ broken-packages:
   - blockfrost-api
   - blockhash
   - Blogdown
-  - bloodhound
   - bloomfilter-redis
   - blubber-server
   - bludigon
@@ -1688,6 +1688,7 @@ broken-packages:
   - ghcup
   - ghc-usage
   - gh-labeler
+  - gi-adwaita
   - giak
   - gi-cogl
   - Gifcurry
@@ -2546,6 +2547,7 @@ broken-packages:
   - hylolib
   - hyperdrive
   - hyperfunctions
+  - hyper-haskell-server
   - hyperion
   - hyperloglogplus
   - hyperscript
@@ -2779,6 +2781,7 @@ broken-packages:
   - kangaroo
   - karabiner-config
   - katip-datadog
+  - katip-elasticsearch
   - katip-kafka
   - katip-logzio
   - katip-scalyr-scribe
@@ -3331,6 +3334,7 @@ broken-packages:
   - msgpack
   - msgpack-binary
   - msgpack-persist
+  - msgpack-types
   - msh
   - msi-kb-backlit
   - MTGBuilder
@@ -3596,6 +3600,7 @@ broken-packages:
   - open-signals
   - opensoundcontrol-ht
   - openssh-protocol
+  - opentelemetry-extra
   - opentelemetry-http-client
   - opentheory-char
   - opentok
@@ -4025,6 +4030,7 @@ broken-packages:
   - process-leksah
   - process-listlike
   - processmemory
+  - procex
   - procrastinating-variable
   - procstat
   - prof2pretty
@@ -4331,6 +4337,7 @@ broken-packages:
   - robin
   - robots-txt
   - roc-cluster
+  - roc-id
   - roku-api
   - rollbar-client
   - rollbar-hs

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -68,8 +68,7 @@ core-packages:
 # tracked in stackage.yaml. Adding conflicting overrides with stackage here will
 # not work.
 default-package-overrides:
-  # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
-  # not yet available in Nixpkgs
+  # gi-gdkx11-4.x requires gtk-4.x, but stackage still restricts gi-gtk to 3.*
   - gi-gdkx11 < 4
   # reflex-dom-pandoc is only used by neuron which needs a version < 1.0.0.0
   - reflex-dom-pandoc < 1.0.0.0