public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-stack: add plenty of overrides to fix the build in LTS-13.x

Browse Source
This commit is contained in:
Peter Simons 2019-06-14 11:29:52 +02:00
parent c2e65c0186
commit 9b68353c72
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1099,7 +1099,14 @@ self: super: {
# Generate shell completion. # Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
stack = generateOptparseApplicativeCompletion "stack" super.stack; stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: {
ansi-terminal = self.ansi-terminal_0_9_1;
concurrent-output = self.concurrent-output_1_10_10; # needed for new ansi-terminal version
rio = self.rio_0_1_9_2;
hi-file-parser = dontCheck super.hi-file-parser; # Avoid depending on newer hspec versions.
http-download = dontCheck super.http-download;
pantry-tmp = dontCheck super.pantry-tmp;
}));
# musl fixes # musl fixes
# dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
@ -1174,7 +1181,7 @@ self: super: {
# https://github.com/mgajda/json-autotype/issues/25 # https://github.com/mgajda/json-autotype/issues/25
json-autotype = dontCheck super.json-autotype; json-autotype = dontCheck super.json-autotype;
# The LTS-13.x version doesn't suffice to build hlint, hoogle, etc. # The LTS-13.x versions doesn't suffice to build these packages.
hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });

1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -8287,7 +8287,6 @@ broken-packages:
- riff - riff
- ring-buffer - ring-buffer
- ring-buffers - ring-buffers
- rio-prettyprint
- riot - riot
- risc386 - risc386
- riscv-isa - riscv-isa