Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2228,12 +2228,15 @@ with haskellLib;

# stack-3.7.1 requires Cabal < 3.12
stack =
let
stack' = super.stack.overrideScope (self: super: { hpack = self.hpack_0_38_1; });
in
if lib.versionOlder self.ghc.version "9.10" then
super.stack
stack'
else
lib.pipe
# to reduce rebuilds, don't override Cabal in the entire scope
((super.stack.override { Cabal = self.Cabal_3_10_3_0; }).overrideScope (
((stack'.override { Cabal = self.Cabal_3_10_3_0; }).overrideScope (
self: super:
let
downgradeCabal =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ extra-packages:
- hasql-pool < 1.1 # 2025-01-19: Needed for building postgrest
- hasql-transaction < 1.1.1 # 2025-01-19: Needed for building postgrest
- hlint == 3.6.* # 2025-04-14: needed for hls with ghc-lib-parser 9.6
- hpack == 0.38.1 # 2025-09-18: to match exact version upstream stack-3.7.1 uses
- hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0
- language-javascript == 0.7.0.0 # required by purescript
- lsp < 2.5 # 2024-07-08: need for koka
Expand Down
27 changes: 17 additions & 10 deletions pkgs/development/haskell-modules/configuration-nix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1881,16 +1881,23 @@ builtins.intersectAttrs super {
extensions = enableSeparateBinOutput super.extensions;

# These test cases access the network
hpack = overrideCabal (drv: {
testFlags = drv.testFlags or [ ] ++ [
"--skip"
"/Hpack.Defaults/ensureFile/with 404/does not create any files/"
"--skip"
"/Hpack.Defaults/ensureFile/downloads file if missing/"
"--skip"
"/EndToEnd/hpack/defaults/fails if defaults don't exist/"
];
}) super.hpack;
inherit
(lib.mapAttrs (
_:
overrideCabal (drv: {
testFlags = drv.testFlags or [ ] ++ [
"--skip"
"/Hpack.Defaults/ensureFile/with 404/does not create any files/"
"--skip"
"/Hpack.Defaults/ensureFile/downloads file if missing/"
"--skip"
"/EndToEnd/hpack/defaults/fails if defaults don't exist/"
];
})
) super)
hpack
hpack_0_38_1
;

doctest = overrideCabal (drv: {
testFlags = drv.testFlags or [ ] ++ [
Expand Down
135 changes: 135 additions & 0 deletions pkgs/development/haskell-modules/hackage-packages.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading