nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #164452 from hercules-ci/haskell-updates-ghc-9.0-stack

Browse Source 
haskellPackages.stack: Patch for new Cabal
This commit is contained in:
Robert Hensing 2022-03-17 10:22:36 +01:00 committed by GitHub
commit 8a27cdef32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1021,17 +1021,22 @@ self: super: {
}));
ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu;
# Currently only builds with GHC-8.10.7 and old aeson:
# https://github.com/commercialhaskell/stack/issues/5670
# https://github.com/commercialhaskell/stack/issues/5558
stack =
generateOptparseApplicativeCompletion "stack"
(super.stack.overrideScope (self: super: {
# pantry-0.5.2.1 requires aeson < 2.
aeson = self.aeson_1_5_6_0;
# stack-2.7.3 requires old version of pantry.
pantry = self.pantry_0_5_2_1;
}));
(doJailbreak # for Cabal constraint added on hackage
(appendPatch
(pkgs.fetchpatch {
# https://github.com/commercialhaskell/stack/pull/5559
# When removing, also remove doJailbreak.
name = "stack-pull-5559.patch";
url = "https://github.com/hercules-ci/stack/compare/v2.7.5...brandon-leapyear/chinn/cabal-0.patch";
sha256 = "sha256-OXmdGgQ2KSKtQKOK6eePLgvUOTlzac544HQYKJpcjnU=";
})
(super.stack.overrideScope (self: super: {
# stack 2.7.5 requires aeson <= 1.6.
aeson = self.aeson_1_5_6_0;
}))
));
# Too strict version bound on hashable-time.
# Tests require newer package version.

5
pkgs/top-level/all-packages.nix
View File

@ -12553,10 +12553,7 @@ with pkgs;
cabal-install = haskell.lib.compose.justStaticExecutables haskellPackages.cabal-install;
# stack doesn't build with ghc902 (Cabal-3.4) yet:
# https://github.com/commercialhaskell/stack/issues/5670
# https://github.com/commercialhaskell/stack/issues/5558
stack = haskell.lib.compose.justStaticExecutables haskell.packages.ghc8107.stack;
stack = haskell.lib.compose.justStaticExecutables haskellPackages.stack;
hlint = haskell.lib.compose.justStaticExecutables haskellPackages.hlint;