b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

stack: make sure it is pointing at stack-2.11.1

Browse source
This commit is contained in:
Dennis Gosnell 2023-07-24 10:25:28 +09:00
parent 5c99452faa
commit 7dd4145f59
No known key found for this signature in database
GPG key ID: 462E0C03D11422F4
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -1164,6 +1164,35 @@ self: super: {
jailbreak = assert drv.version == "1.0.9" && drv.revision == "1"; true;
}) super.dhall-nixpkgs);
stack_2_11_1 =
lib.pipe
super.stack_2_11_1
[
(self.generateOptparseApplicativeCompletions [ "stack" ])
# Seems to be an unnecessarily strict dep on ansi-terminal
doJailbreak
# The below patch has unix line endings, but the actual file
# has CRLF line endings. The following override changes the
# file to unix line endings before applying the patch.
(overrideCabal (oldAttrs: {
prePatch = oldAttrs.prePatch or "" + ''
"${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix" src/main/BuildInfo.hs
'';
}))
# stack-2.11.1 has a bug when building without git.
# https://github.com/commercialhaskell/stack/pull/6127
(appendPatch
(fetchpatch {
name = "stack-fix-building-without-git.patch";
url = "https://github.com/commercialhaskell/stack/pull/6127/commits/086f93933d547736a7007fc4110f7816ef21f691.patch";
hash = "sha256-1nwzMoumWceVu8RNnH2mmSxYT24G1FAnFRJvUMeD3po=";
includes = [ "src/main/BuildInfo.hs" ];
})
)
];
stack =
lib.pipe
(super.stack.override {

2
pkgs/top-level/all-packages.nix
View file

@ -15956,7 +15956,7 @@ with pkgs;
cabal-install = haskell.lib.compose.justStaticExecutables haskellPackages.cabal-install;
stack = haskell.lib.compose.justStaticExecutables haskellPackages.stack;
stack = haskell.lib.compose.justStaticExecutables haskellPackages.stack_2_11_1;
hlint = haskell.lib.compose.justStaticExecutables haskellPackages.hlint;