Merge haskell-updates PR #401105 into staging

Author: sternenseemann

doc/languages-frameworks/haskell.section.md

@@ -779,7 +779,7 @@ that depend on that library, you may want to use:
 
 ```nix
 haskellPackages.haskell-ci.overrideScope (self: super: {
-  Cabal = self.Cabal_3_14_1_1;
+  Cabal = self.Cabal_3_14_2_0;
 })
 ```
 

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "6fc5e0d20fed4a6e8ec26f6956786d0077f028b4",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6fc5e0d20fed4a6e8ec26f6956786d0077f028b4.tar.gz",
-  "sha256": "08vkrfn4s1jb680rq1flxas8hv04f5l715z0kh8sv909k3psbfak",
-  "msg": "Update from Hackage at 2025-03-30T11:13:14Z"
+  "commit": "611ebba3fc94becabf6cc6fbe713e4bfad592924",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/611ebba3fc94becabf6cc6fbe713e4bfad592924.tar.gz",
+  "sha256": "1gn3asjrzr6v7lcdg1vyrpv7xv74ldwbz517cvfhh2mxzrawrkmc",
+  "msg": "Update from Hackage at 2025-04-21T04:38:52Z"
 }

pkgs/development/haskell-modules/cabal2nix-unstable.nix

@@ -35,10 +35,10 @@
 }:
 mkDerivation {
   pname = "cabal2nix";
-  version = "unstable-2025-04-22";
+  version = "unstable-2025-04-30";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/e6ed81965def7775aabdda7456d0c13f626295ee.tar.gz";
-    sha256 = "1fh428r4wfrqjj77dxy1l3d9scm4ywz89rp7dhp07y3bq5yr7hs4";
+    url = "https://github.com/NixOS/cabal2nix/archive/fbe593fe71b916861b97117dfb91f7aae9c4fcce.tar.gz";
+    sha256 = "0sdyyawsz5zl2ffg4h4r3xcf73gfz9v0vgahccbp01if3m2g7p0y";
   };
   postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
   isLibrary = true;

pkgs/development/haskell-modules/configuration-common.nix

@@ -20,6 +20,30 @@ with haskellLib;
 
 self: super:
 {
+  # Hackage's accelerate is from 2020 and incomptible with our GHC.
+  # The existing derivation also has missing dependencies
+  # compared to the source from github.
+  # https://github.com/AccelerateHS/accelerate/issues/553
+  accelerate =
+    assert super.accelerate.version == "1.3.0.0";
+    lib.pipe super.accelerate [
+      (addBuildDepends [
+        self.double-conversion
+        self.formatting
+        self.microlens
+      ])
+
+      (overrideCabal (drv: {
+        version = "1.3.0.0-unstable-2025-04-25";
+        src = pkgs.fetchFromGitHub {
+          owner = "AccelerateHS";
+          repo = "accelerate";
+          rev = "3f681a5091eddf5a3b97f4cd0de32adc830e1117";
+          sha256 = "sha256-tCcl7wAls+5cBSrqbxfEAJngbV43OJcLJdaC4qqkBxc=";
+        };
+      }))
+    ];
+
   # https://github.com/ivanperez-keera/dunai/issues/427
   dunai = addBuildDepend self.list-transformer (enableCabalFlag "list-transformer" super.dunai);
 
@@ -34,7 +58,7 @@ self: super:
       Cabal-syntax = self.Cabal-syntax_3_12_1_0;
     }
   );
-  Cabal_3_14_1_1 =
+  Cabal_3_14_2_0 =
     overrideCabal
       (drv: {
         # Revert increased lower bound on unix since we have backported
@@ -47,15 +71,15 @@ self: super:
       })
       (
         doDistribute (
-          super.Cabal_3_14_1_1.override {
-            Cabal-syntax = self.Cabal-syntax_3_14_1_0;
+          super.Cabal_3_14_2_0.override {
+            Cabal-syntax = self.Cabal-syntax_3_14_2_0;
           }
         )
       );
 
   # Needs matching version of Cabal
   Cabal-hooks = super.Cabal-hooks.override {
-    Cabal = self.Cabal_3_14_1_1;
+    Cabal = self.Cabal_3_14_2_0;
   };
 
   # cabal-install needs most recent versions of Cabal and Cabal-syntax,
@@ -67,8 +91,8 @@ self: super:
         cabalInstallOverlay =
           cself: csuper:
           lib.optionalAttrs (lib.versionOlder self.ghc.version "9.12") {
-            Cabal = cself.Cabal_3_14_1_1;
-            Cabal-syntax = cself.Cabal-syntax_3_14_1_0;
+            Cabal = cself.Cabal_3_14_2_0;
+            Cabal-syntax = cself.Cabal-syntax_3_14_2_0;
           };
       in
       {
@@ -248,20 +272,6 @@ self: super:
     sha256 = "10zkvclyir3zf21v41zdsvg68vrkq89n64kv9k54742am2i4aygf";
   }) super.weeder;
 
-  # Allow aeson == 2.1.*
-  # https://github.com/hdgarrood/aeson-better-errors/issues/23
-  aeson-better-errors = lib.pipe super.aeson-better-errors [
-    doJailbreak
-    (appendPatches [
-      # https://github.com/hdgarrood/aeson-better-errors/pull/25
-      (fetchpatch {
-        name = "mtl-2-3.patch";
-        url = "https://github.com/hdgarrood/aeson-better-errors/commit/1ec49ab7d1472046b680b5a64ae2930515b47714.patch";
-        hash = "sha256-xuuocWxSoBDclVp0bJ9UrDamVcDVOAFgJIi/un1xBvk=";
-      })
-    ])
-  ];
-
   # Version 2.1.1 is deprecated, but part of Stackage LTS at the moment.
   # https://github.com/commercialhaskell/stackage/issues/7500
   # https://github.com/yesodweb/shakespeare/issues/280
@@ -478,7 +488,7 @@ self: super:
           name = "git-annex-${super.git-annex.version}-src";
           url = "git://git-annex.branchable.com/";
           rev = "refs/tags/" + super.git-annex.version;
-          sha256 = "18n6ah4d5i8qhx1s95zsb8bg786v0nv9hcjyxggrk88ya77maxha";
+          sha256 = "10prmih74h31fwv14inqavzmm25hmlr24h49h9lpxqd88dn3r9cd";
           # delete android and Android directories which cause issues on
           # darwin (case insensitive directory). Since we don't need them
           # during the build process, we can delete it to prevent a hash
@@ -899,16 +909,6 @@ self: super:
   # "base" dependency.
   haddock-cheatsheet = doJailbreak super.haddock-cheatsheet;
 
-  # https://github.com/Gabriella439/Haskell-MVC-Updates-Library/pull/1
-  mvc-updates = appendPatches [
-    (pkgs.fetchpatch {
-      name = "rename-pretraverse.patch";
-      url = "https://github.com/Gabriella439/Haskell-MVC-Updates-Library/commit/47b31202b761439947ffbc89ec1c6854c1520819.patch";
-      sha256 = "sha256-a6k3lWtXNYUIjWXR+vRAHz2bANq/2eM0F5FLL8Qt2lA=";
-      includes = [ "src/MVC/Updates.hs" ];
-    })
-  ] (doJailbreak super.mvc-updates);
-
   # Too strict bounds on bytestring < 0.12
   # https://github.com/Gabriella439/Haskell-Pipes-HTTP-Library/issues/18
   pipes-http = doJailbreak super.pipes-http;
@@ -1232,14 +1232,16 @@ self: super:
   # test suite requires git and does a bunch of git operations
   restless-git = dontCheck super.restless-git;
 
-  sensei = overrideCabal (drv: {
-    # sensei passes `-package hspec-meta` to GHC in the tests, but doesn't
-    # depend on it itself.
-    testHaskellDepends = drv.testHaskellDepends or [ ] ++ [ self.hspec-meta ];
-    # requires git at test-time *and* runtime, but we'll just rely on users to
-    # bring their own git at runtime.
-    testToolDepends = drv.testToolDepends or [ ] ++ [ pkgs.git ];
-  }) super.sensei;
+  # Missing test files
+  # https://github.com/pbrisbin/jsonpatch/issues/10
+  jsonpatch = overrideCabal (drv: {
+    testTargets =
+      lib.warnIf (lib.versionAtLeast drv.version "0.3.0.2")
+        "haskellPackages.jsonpatch: override can be dropped"
+        [
+          "readme" # disabled: "spec"
+        ];
+  }) super.jsonpatch;
 
   # Work around https://github.com/haskell/c2hs/issues/192.
   c2hs = dontCheck super.c2hs;
@@ -1460,22 +1462,7 @@ self: super:
   hjsmin = dontCheck super.hjsmin;
 
   # Remove for hail > 0.2.0.0
-  hail = overrideCabal (drv: {
-    patches = [
-      (fetchpatch {
-        # Relax dependency constraints,
-        # upstream PR: https://github.com/james-preston/hail/pull/13
-        url = "https://patch-diff.githubusercontent.com/raw/james-preston/hail/pull/13.patch";
-        sha256 = "039p5mqgicbhld2z44cbvsmam3pz0py3ybaifwrjsn1y69ldsmkx";
-      })
-      (fetchpatch {
-        # Relax dependency constraints,
-        # upstream PR: https://github.com/james-preston/hail/pull/16
-        url = "https://patch-diff.githubusercontent.com/raw/james-preston/hail/pull/16.patch";
-        sha256 = "0dpagpn654zjrlklihsg911lmxjj8msylbm3c68xa5aad1s9gcf7";
-      })
-    ];
-  }) super.hail;
+  hail = doJailbreak super.hail;
 
   # https://github.com/kazu-yamamoto/dns/issues/150
   dns = dontCheck super.dns;
@@ -2763,12 +2750,12 @@ self: super:
         doJailbreak
         # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275
         (overrideSrc rec {
-          version = "12.2.7";
+          version = "12.2.12";
           src = pkgs.fetchFromGitHub {
             owner = "PostgREST";
             repo = "postgrest";
             rev = "v${version}";
-            hash = "sha256-4lKA+U7J8maKiDX9CWxWGjepGKSUu4ZOAA188yMt0bU=";
+            hash = "sha256-A/3JQc9h/FKX+xZvOVMwhXsKxdkRS783I/1EiZ3e73Y=";
           };
         })
         # 2024-11-03: Fixes build on aarch64-darwin. Can be removed after updating to 13+.
@@ -2935,14 +2922,6 @@ self: super:
     }
   ) super.feedback;
 
-  # https://github.com/maralorn/haskell-taskwarrior/pull/12
-  taskwarrior = appendPatches [
-    (fetchpatch {
-      url = "https://github.com/maralorn/haskell-taskwarrior/commit/b846c6ae64e716dca2d44488f60fee3697b5322d.patch";
-      sha256 = "sha256-fwBYBmw9Jva2UEPQ6E/5/HBA8ZDiM7/QQQDBp3diveU=";
-    })
-  ] super.taskwarrior;
-
   testcontainers = lib.pipe super.testcontainers [
     dontCheck # Tests require docker
     doJailbreak # https://github.com/testcontainers/testcontainers-hs/pull/58
@@ -3020,10 +2999,6 @@ self: super:
   # jailbreak to allow deepseq >= 1.5, https://github.com/jumper149/blucontrol/issues/3
   blucontrol = doJailbreak super.blucontrol;
 
-  # Stackage LTS 23.17 has 0.1.5, which was marked deprecated as it was broken.
-  # Can probably be dropped for Stackage LTS >= 23.18
-  network-control = doDistribute self.network-control_0_1_6;
-
   # Needs to match pandoc, see:
   # https://github.com/jgm/pandoc/commit/97b36ecb7703b434ed4325cc128402a9eb32418d
   commonmark-pandoc = doDistribute self.commonmark-pandoc_0_2_2_3;
@@ -3065,19 +3040,28 @@ self: super:
     assert super.bzlib.version == "0.5.2.0";
     doJailbreak super.bzlib;
 
-  what4 = lib.pipe super.what4 [
-    (addTestToolDepends (
-      with pkgs;
-      [
-        cvc4
-        cvc5
-        z3
+  inherit
+    (lib.mapAttrs (
+      _: pkg:
+      lib.pipe pkg [
+        (addTestToolDepends (
+          with pkgs;
+          [
+            cvc4
+            cvc5
+            z3
+          ]
+        ))
+        # 2025-04-09: FIXME: template_tests still failing with:
+        #   fd:9: hPutBuf: resource vanished (Broken pipe)
+        dontCheck
+
+        doDistribute
       ]
-    ))
-    # 2025-04-09: template_tests still failing with:
-    #   fd:9: hPutBuf: resource vanished (Broken pipe)
-    dontCheck
-  ];
+    ) super)
+    what4
+    what4_1_7
+    ;
 
   copilot-theorem = lib.pipe super.copilot-theorem [
     (addTestToolDepends (with pkgs; [ z3 ]))
@@ -3153,7 +3137,23 @@ self: super:
   # 2025-04-13: jailbreak to allow th-abstraction >= 0.7
   crucible =
     assert super.crucible.version == "0.7.2";
-    doJailbreak super.crucible;
+    doJailbreak (
+      super.crucible.override {
+        what4 = self.what4_1_7;
+      }
+    );
+
+  crucible-llvm = super.crucible-llvm.override {
+    what4 = self.what4_1_7;
+  };
+
+  # Test suite invokes cabal-install in a way incompatible with our generic builder
+  # (i.e. tries to re-use the ghc package db / environment from dist-newstyle).
+  sensei = dontCheck super.sensei;
+
+  crux = super.crux.override {
+    simple-get-opt = self.simple-get-opt_0_4;
+  };
 
   # 2025-04-23: jailbreak to allow megaparsec >= 9.7
   # 2025-04-23: test data missing from tarball

pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix

@@ -147,17 +147,6 @@ with haskellLib;
     ];
   }) super.doctest_0_24_0;
 
-  # https://github.com/typeable/generic-arbitrary/issues/18
-  generic-arbitrary = overrideCabal (drv: {
-    patches = drv.patches or [ ] ++ [
-      (pkgs.fetchpatch {
-        name = "hellwolf:fix-recursive-test-hidding-unit";
-        url = "https://github.com/typeable/generic-arbitrary/commit/133b80be93e6744f21e0e5ed4180a24c589f92e4.patch";
-        sha256 = "sha256-z9EVcD1uNAYUOVTwmCCnrEFFOvFB7lD94Y6BwGVwVRQ=";
-      })
-    ];
-  }) super.generic-arbitrary;
-
   # https://gitlab.haskell.org/ghc/ghc/-/issues/25930
   generic-lens = dontCheck super.generic-lens;
 
@@ -173,6 +162,13 @@ with haskellLib;
   # https://github.com/sjakobi/newtype-generics/pull/28/files
   newtype-generics = warnAfterVersion "0.6.2" (doJailbreak super.newtype-generics);
 
+  # Test failure because of GHC bug:
+  #   https://gitlab.haskell.org/ghc/ghc/-/issues/25937
+  #   https://github.com/sol/interpolate/issues/20
+  interpolate =
+    assert super.ghc.version == "9.12.2";
+    dontCheck super.interpolate;
+
   #
   # Multiple issues
   #
@@ -204,4 +200,7 @@ with haskellLib;
       }
     )
   );
+
+  # Allow Cabal 3.14
+  hpack = doDistribute self.hpack_0_38_0;
 }

pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix

@@ -7,8 +7,7 @@ let
   inherit (pkgs) lib;
 in
 
-self: super:
-{
+self: super: {
 
   llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
 
@@ -99,8 +98,3 @@ self: super:
       '';
     } super.ghc-lib-parser;
 }
-// lib.optionalAttrs (lib.versionAtLeast super.ghc.version "9.8.3") {
-  # Breakage related to GHC 9.8.3 / deepseq 1.5.1.0
-  # https://github.com/typeable/generic-arbitrary/issues/18
-  generic-arbitrary = dontCheck super.generic-arbitrary;
-}

pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix

@@ -35,12 +35,9 @@ with haskellLib;
   patch = haskellLib.disableParallelBuilding super.patch;
   reflex-dom-core = haskellLib.disableParallelBuilding super.reflex-dom-core;
 
-  reflex-dom =
-    lib.warn "reflex-dom builds with JS backend but it is missing fixes for working at runtime"
-      super.reflex-dom.override
-      (drv: {
-        jsaddle-webkit2gtk = null;
-      });
+  reflex-dom = super.reflex-dom.override (drv: {
+    jsaddle-webkit2gtk = null;
+  });
 
   miso-examples = pkgs.lib.pipe super.miso-examples [
     (addBuildDepends (