Merge pull request #327219 from NixOS/haskell-updates

    -e '/ language-nix /d' \

    -e '/ hackage-db /d' \

    -e '/ cabal-install /d' \

    -e '/ cabal-install-solver /d' \

    -e '/ lsp /d' \

    -e '/ lsp-types /d' \

    -e '/ lsp-test /d' \

{

  "commit": "f9ce92cad6df36ec3b9dfc6807c4a1c0426c608e",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f9ce92cad6df36ec3b9dfc6807c4a1c0426c608e.tar.gz",

  "sha256": "01fnkg977fi44v0scijgrp3hq3yrqzw5k8i326a9pz8j6r676iim",

  "msg": "Update from Hackage at 2024-06-23T10:38:31Z"

  "commit": "f3a61ad1c6b9c94ca546997f1170d6a6d58ef8ae",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f3a61ad1c6b9c94ca546997f1170d6a6d58ef8ae.tar.gz",

  "sha256": "10nkz8i426w1wji7c91irnl188m4alpjdn1d545w2ifmgpvsgp2f",

  "msg": "Update from Hackage at 2024-07-14T21:17:20Z"

}

    process = self.process_1_6_20_0;

  }));

  Cabal_3_12_0_0 = doDistribute (super.Cabal_3_12_0_0.override ({

    Cabal-syntax = self.Cabal-syntax_3_12_0_0;

  Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override ({

    Cabal-syntax = self.Cabal-syntax_3_12_1_0;

  } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") {

    # Use process core package when possible

    process = self.process_1_6_20_0;

  }));

  # hackage-security == 0.6.2.6 has a wider support range in theory, but it only

  # makes sense to use the non Stackage version if we want to use Cabal* >= 3.12

  hackage-security_0_6_2_6 = super.hackage-security_0_6_2_6.override {

    Cabal = self.Cabal_3_12_1_0;

    Cabal-syntax = self.Cabal-syntax_3_12_1_0;

  };

  # cabal-install needs most recent versions of Cabal and Cabal-syntax,

  # so we need to put some extra work for non-latest GHCs

  inherit (

      # !!! Use cself/csuper inside for the actual overrides

      cabalInstallOverlay = cself: csuper:

        {

          # Needs to be downgraded compared to Stackage LTS 21

          resolv = cself.resolv_0_1_2_0;

          hackage-security = self.hackage-security_0_6_2_6;

        } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.10") {

          Cabal = cself.Cabal_3_10_3_0;

          Cabal-syntax = cself.Cabal-syntax_3_10_3_0;

        } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") {

          # We need at least directory >= 1.3.7.0. Using the latest version

          # 1.3.8.* is not an option since it causes very annoying dependencies

          # on newer versions of unix and filepath than GHC 9.2 ships

          directory = cself.directory_1_3_7_1;

          # GHC 9.2.5 starts shipping 1.6.16.0 which is required by

          # cabal-install, but we need to recompile process even if the correct

          # version is available to prevent inconsistent dependencies:

          # process depends on directory.

          process = cself.process_1_6_20_0;

          # Prevent dependency on doctest which causes an inconsistent dependency

          # due to depending on ghc which depends on directory etc.

          vector = dontCheck csuper.vector;

          Cabal = cself.Cabal_3_12_1_0;

          Cabal-syntax = cself.Cabal-syntax_3_12_1_0;

        };

    in

    {

      name = "git-annex-${super.git-annex.version}-src";

      url = "git://git-annex.branchable.com/";

      rev = "refs/tags/" + super.git-annex.version;

      hash = "sha256-D/lvNe2pa1vZvMEsVV4SuwPAJd2Aer0yA3bRae6j3jQ=";

      hash = "sha256-/NbwuVTx517DGyr2k1AdQqJaVEc8lrtuO9EliiCZdps=";

      # 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

  # Tests require older versions of tasty.

  hzk = dontCheck super.hzk;

  resolv_0_1_2_0 = doJailbreak super.resolv_0_1_2_0;

  # Test suite doesn't compile with 9.6, 9.8

  # https://github.com/sebastiaanvisser/fclabels/issues/45

  HerbiePlugin = dontCheck super.HerbiePlugin;

  wai-cors = dontCheck super.wai-cors;

  # 2022-01-29: Tests fail: https://github.com/psibi/streamly-bytestring/issues/27

  # 2022-02-14: Strict upper bound: https://github.com/psibi/streamly-bytestring/issues/30

  streamly-bytestring = dontCheck (doJailbreak super.streamly-bytestring);

  streamly-bytestring = doJailbreak super.streamly-bytestring;

  # 2024-05-18: Upstream tests against a different pandoc version

  pandoc-crossref = dontCheck super.pandoc-crossref;

  # 2023-06-26: Test failure: https://hydra.nixos.org/build/224869905

  comfort-blas = dontCheck super.comfort-blas;

  # 2022-06-26: Too strict lower bound on semialign.

  trie-simple = doJailbreak super.trie-simple;

  # These test suites run for ages, even on a fast machine. This is nuts.

  Random123 = dontCheck super.Random123;

  systemd = dontCheck super.systemd;

    '';

  }) super.hpack;

  # Upstream stack-0.15.7 is compiled with hpack-0.36.0, and we make sure to

  # keep the same hpack version in Nixpkgs.

  stack = super.stack.override { hpack = self.hpack_0_36_0; };

  # hslua has tests that break when using musl.

  # https://github.com/hslua/hslua/issues/106

  hslua-core = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.hslua-core else super.hslua-core;

  # https://github.com/commercialhaskell/stackage/issues/6884

  persistent-sqlite = dontCheck super.persistent-sqlite;

  # 2021-12-26: Too strict bounds on doctest

  polysemy-plugin = doJailbreak super.polysemy-plugin;

  # Needs matching lsp-types

  lsp_2_4_0_0 = super.lsp_2_4_0_0.override {

    lsp-types = self.lsp-types_2_1_1_0;

    })

  ] super.binary-strict;

  # 2020-11-15: nettle tests are pre MonadFail change

  # https://github.com/stbuehler/haskell-nettle/issues/10

  nettle = dontCheck super.nettle;

  # The tests for semver-range need to be updated for the MonadFail change in

  # ghc-8.8:

  # https://github.com/adnelson/semver-range/issues/15

    (self.generateOptparseApplicativeCompletions [ "hci" ])

  ];

  pipes-aeson = appendPatches [

    # Dependency of the aeson-2 patch

    (fetchpatch {

      name = "pipes-aeson-add-loop.patch";

      url = "https://github.com/k0001/pipes-aeson/commit/d22133b4a678edbb52bcaec5079dc88ccc0de1d3.patch";

      sha256 = "sha256-5o5ys1P1+QB4rjLCYok5AcPRWCtRiecP/TqCFm8ulVY=";

      includes = ["src/Pipes/Aeson.hs" "src/Pipes/Aeson/Internal.hs" "src/Pipes/Aeson/Unchecked.hs"];

    })

    # https://github.com/k0001/pipes-aeson/pull/20

    (fetchpatch {

      name = "pipes-aeson-aeson-2.patch";

      url = "https://github.com/hercules-ci/pipes-aeson/commit/ac735c9cd459c6ef51ba82325d1c55eb67cb7b2c.patch";

      sha256 = "sha256-viWZ6D5t79x50RXiOjP6UeQ809opgNFYZOP+h+1KJh0=";

      includes = ["src/Pipes/Aeson.hs" "src/Pipes/Aeson/Internal.hs" "src/Pipes/Aeson/Unchecked.hs"];

    })

  ] super.pipes-aeson;

  # https://github.com/k0001/pipes-aeson/pull/21

  pipes-aeson = appendPatch (fetchpatch {

    url = "https://github.com/k0001/pipes-aeson/commit/08c25865ef557b41d7e4a783f52e655d2a193e18.patch";

    relative = "pipes-aeson";

    sha256 = "sha256-kFV6CcwKdMq+qSgyc+eIApnaycq5A++pEEVr2A9xvts=";

  }) super.pipes-aeson;

  # Needs bytestring 0.11

  # https://github.com/Gabriella439/Haskell-Pipes-HTTP-Library/pull/17

      relative = "moto-postgresql";

      sha256 = "sha256-f2JVX9VveShCeV+T41RQgacpUoh1izfyHlE6VlErkZM=";

    })

  ] (unmarkBroken super.moto-postgresql);

  ] super.moto-postgresql;

  moto = appendPatches [

    # https://gitlab.com/k0001/moto/-/merge_requests/3

  # Requests latest versions of crypton-connection and tls

  darcs = super.darcs.overrideScope (self: super: {

    crypton-connection = self.crypton-connection_0_4_0;

    crypton-connection = self.crypton-connection_0_4_1;

    tls = self.tls_2_0_6;

  });

  # list `modbus` in librarySystemDepends, correct to `libmodbus`

  libmodbus = doJailbreak (addExtraLibrary pkgs.libmodbus super.libmodbus);

  # 2021-04-02: Outdated optparse-applicative bound is fixed but not realeased on upstream.

  trial-optparse-applicative = assert super.trial-optparse-applicative.version == "0.0.0.0"; doJailbreak super.trial-optparse-applicative;

  # 2022-12-28: Too strict version bounds on bytestring

  iconv = doJailbreak super.iconv;

  ginger = doJailbreak super.ginger;

  # 2024-05-05 syntax changes: https://github.com/obsidiansystems/haveibeenpwned/pull/9

    ];

  };

  # 2021-04-09: outdated base and alex-tools

  # PR pending https://github.com/glguy/language-lua/pull/6

  language-lua = doJailbreak super.language-lua;

  # 2021-04-09: too strict time bound

  # PR pending https://github.com/zohl/cereal-time/pull/2

  cereal-time = doJailbreak super.cereal-time;

  # https://github.com/muesli4/table-layout/issues/16

  table-layout = doJailbreak super.table-layout;

  # 2021-06-20: Outdated upper bounds

  # https://github.com/Porges/email-validate-hs/issues/58

  email-validate = doJailbreak super.email-validate;

  # https://github.com/plow-technologies/hspec-golden-aeson/issues/17

  hspec-golden-aeson = dontCheck super.hspec-golden-aeson;

  # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.

  streamly-posix = doJailbreak super.streamly-posix;

  # 2022-12-30: Restrictive upper bound on optparse-applicative

  retrie = doJailbreak super.retrie;

  # 2022-08-30 Too strict bounds on finite-typelits

  # https://github.com/jumper149/blucontrol/issues/1

  blucontrol = doJailbreak super.blucontrol;

  validation = doJailbreak super.validation;

  # 2022-03-16: strict upper bounds https://github.com/monadfix/shower/issues/18

  shower = doJailbreak (dontCheck super.shower);

  shower = doJailbreak super.shower;

  # Test suite isn't supposed to succeed yet, apparently…

  # https://github.com/andrewufrank/uniform-error/blob/f40629ad119e90f8dae85e65e93d7eb149bddd53/test/Uniform/Error_test.hs#L124

  # 2022-02-25: Unmaintained and to strict upper bounds

  paths = doJailbreak super.paths;

  # 2022-02-26: https://github.com/emilypi/base64/issues/39

  base64 = dontCheck super.base64;

  # 2022-03-16: Upstream stopped updating bounds https://github.com/haskell-hvr/base-noprelude/pull/15

  base-noprelude = doJailbreak super.base-noprelude;

    sha256 = "sha256-iHiF4EWL/GjJFnr/6aR+yMZKLMLAZK+gsgSxG8YaeDI=";

  }) super.records-sop;

  # Need https://github.com/well-typed/large-records/pull/151

  large-generics = doJailbreak super.large-generics;

  # Fix build failures for ghc 9 (https://github.com/mokus0/polynomial/pull/20)

  polynomial = appendPatch (fetchpatch {

    name = "haskell-polynomial.20.patch";

        lib.pipe

          (super.purescript.overrideScope purescriptOverlay)

          ([

            # https://github.com/purescript/purescript/pull/4547

            (appendPatches [

              (pkgs.fetchpatch {

                name = "purescript-import-fix";

                url = "https://github.com/purescript/purescript/commit/c610ec18391139a67dc9dcf19233f57d2c5413f7.patch";

                hash = "sha256-7s/ygzAFJ1ocZIj3OSd3TbsmGki46WViPIZOU1dfQFg=";

              })

            ])

            # PureScript uses nodejs to run tests, so the tests have been disabled

            # for now.  If someone is interested in figuring out how to get this

            # working, it seems like it might be possible.

            (self.generateOptparseApplicativeCompletions [ "purs" ])

          ]);

      purenix = super.purenix.overrideScope purescriptOverlay;

      purenix =

        lib.pipe

          (super.purenix.overrideScope purescriptOverlay)

          [

            (appendPatches [

              # https://github.com/purenix-org/purenix/pull/63

              (pkgs.fetchpatch {

                name = "purenix-purescript-0_15_12";

                url = "https://github.com/purenix-org/purenix/commit/2dae563f887c7c8daf3dd3e292ee3580cb70d528.patch";

                hash = "sha256-EZXf95BJINyqnRb2t/Ao/9C8ttNp3A27rpKiEKJjO6Y=";

              })

              (pkgs.fetchpatch {

                name = "purenix-import-fix";

                url = "https://github.com/purenix-org/purenix/commit/f1890690264e7e5ce7f5b0a32d73d910ce2cbd73.patch";

                hash = "sha256-MRITcNOiaWmzlTd9l7sIz/LhlnpW8T02CXdcc1qQt3c=";

              })

            ])

          ];

    })

    purescript

    purenix

    ;

  # 2022-11-05: https://github.com/ysangkok/haskell-tzdata/issues/3

  tzdata = dontCheck super.tzdata;

  # We provide newer dependencies than upstream expects.

  swarm = doJailbreak super.swarm;

  # https://github.com/brandonchinn178/tasty-autocollect/issues/54

  tasty-autocollect = dontCheck super.tasty-autocollect;

  # https://github.com/UnkindPartition/tasty/pull/420#issuecomment-2187406691

  # Note also 1.5.1 was faux-revoked because of this. See

  # https://github.com/UnkindPartition/tasty/issues/426

  tasty_1_5_1 = lib.pipe super.tasty_1_5_1 [

    (appendPatch

      (fetchpatch2 {

        name = "tasty-1.5.1-revert-cr-sufficient-to-clear-line";

        url = "https://github.com/UnkindPartition/tasty/commit/b152a0bc63166a4592e1f3639ef09e78a43f2b57.diff";

        hash = "sha256-tlFCyEnIp8geNlJSkye32tUOaPMwkdqLHBMzpAwSDVQ=";

        revert = true;

        stripLen = 1;

      })

    )

    (overrideCabal

      (drv: assert drv.revision == "1"; {

          revision = null;

          editedCabalFile = null;

      })

    )

  ];

  postgrest = lib.pipe super.postgrest [

    # 2023-12-20: New version needs extra dependencies

    (addBuildDepends [ self.extra self.fuzzyset_0_2_4 self.cache self.timeit ])

    hash = "sha256-JxraFWzErJT4EhELa3PWBGHaLT9OLgEPNSnxwpdpHd0=";

  }) (doJailbreak super.argon2); # Unmaintained

  safe-exceptions = overrideCabal (drv: {

    # Fix strictDeps build error "could not execute: hspec-discover"

    testToolDepends = drv.testToolDepends or [] ++ [ self.hspec-discover ];

  }) super.safe-exceptions;

  # Apply patch to use v.4.0.2

  push-notify-apn = appendPatch (

    fetchpatch {

      url = "https://github.com/digitallyinduced/push-notify-apn/commit/e54d40516f1b8f912a74df75256bb6bacc931943.patch";

      hash = "sha256-gH03Z/eDXUeIiAO+hIFxclekBHFAnukd+fgUl39g5cw";

    }

  ) super.push-notify-apn;

  # 2024-07-09: zinza has bumped their QuickCheck and tasty dependencies beyond stackage lts.

  # Can possibly be removed once QuickCheck >= 2.15 and tasty >= 1.5

  zinza = dontCheck super.zinza;

  # Python 3.12 breaks unicode C-API. Requires an upstream fix in the CPython

  # package to support Python > 3.12 API. Thus, should be removed at next CPython

  # Hackage release.

  cpython = super.cpython.override {

    python3 = pkgs.python311;

  };

  # Doesn't officially support hedgehog > 1.3 yet: https://github.com/coot/free-algebras/pull/33

  free-algebras = doJailbreak super.free-algebras;

  # https://github.com/haskell-works/avro/pull/195

  avro = appendPatch (pkgs.fetchpatch {

    url = "https://github.com/haskell-works/avro/commit/5f6eb1ec8c8bac325d84b44757d4e2f8608d6939.patch";

    sha256 = "sha256-1QEaoO8BTdvfFzMrybrf0v7cK0NbYrWOj4Mqexr+ylc=";

  }) super.avro;

  pdftotext = overrideCabal (drv: {

      postPatch = ''

        # Fixes https://todo.sr.ht/~geyaeb/haskell-pdftotext/6

        substituteInPlace pdftotext.cabal --replace-quiet c-sources cxx-sources

        # Fix cabal ignoring cxx because the cabal format version is too old

        substituteInPlace pdftotext.cabal --replace-quiet ">=1.10" 2.2

        # Fix wrong license name that breaks recent cabal version

        substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause

      '' + (drv.postPatch or "");

    }) (doJailbreak (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext)));

  # 2024-07-27: building test component requires non-trivial custom build steps

  # https://github.com/awakesecurity/proto3-suite/blob/bec9d40e2767143deed5b2d451197191f1d8c7d5/nix/overlays/haskell-packages.nix#L311

  proto3-suite = lib.pipe super.proto3-suite [

    dontCheck # Hackage release trails a good deal behind master

    doJailbreak

  ];

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

  proteaaudio = addExtraLibrary darwin.apple_sdk.frameworks.AudioToolbox super.proteaaudio;

  # issues finding libcharset.h without libiconv in buildInputs on darwin.

  with-utf8 = addExtraLibrary pkgs.libiconv super.with-utf8;

  with-utf8_1_1_0_0 = addExtraLibrary pkgs.libiconv super.with-utf8_1_1_0_0;

  # the system-fileio tests use canonicalizePath, which fails in the sandbox

  system-fileio = dontCheck super.system-fileio;

    libraryFrameworkDepends = with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ Cocoa WebKit ];

    libraryHaskellDepends = with self; [ aeson data-default jsaddle ]; # cabal2nix doesn't add darwin-only deps

  }) super.jsaddle-wkwebview;

  reflex-dom = overrideCabal (drv: {

    libraryHaskellDepends = with self; [ base bytestring jsaddle-wkwebview reflex reflex-dom-core text ]; # cabal2nix doesn't add darwin-only deps

  }) super.reflex-dom;

  # cabal2nix doesn't add darwin-only deps

  reflex-dom = addBuildDepend self.jsaddle-wkwebview (super.reflex-dom.override (drv: {

    jsaddle-webkit2gtk = null;

  }));

  # Remove a problematic assert, the length is sometimes 1 instead of 2 on darwin

  di-core = overrideCabal (drv: {

with haskellLib;

# cabal2nix doesn't properly add dependencies conditional on arch(javascript)

(self: super: {

  ghcjs-base = addBuildDepends (with self; [

    aeson

  ghcjs-dom-javascript = addBuildDepend self.ghcjs-base super.ghcjs-dom-javascript;

  jsaddle = addBuildDepend self.ghcjs-base super.jsaddle;

  jsaddle-dom = addBuildDepend self.ghcjs-base super.jsaddle-dom;

  reflex-dom = super.reflex-dom.override (drv: {

    jsaddle-webkit2gtk = null;

  });

})