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
12 changes: 11 additions & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1408,7 +1408,12 @@ self: super: {
# 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests:
# https://github.com/haskell/haskell-language-server/issues/610
# https://github.com/haskell/haskell-language-server/issues/611
haskell-language-server = dontCheck super.haskell-language-server;
haskell-language-server = overrideCabal (dontCheck super.haskell-language-server) {
# 2020-02-19: Override is necessary because of wrong bound on upstream, remove after next hackage update
preConfigure = ''
substituteInPlace haskell-language-server.cabal --replace "hls-explicit-imports-plugin ==0.1.0.1" "hls-explicit-imports-plugin ==0.1.0.0"
'';
};

# 2021-02-08: Jailbreaking because of
# https://github.com/haskell/haskell-language-server/issues/1329
Expand Down Expand Up @@ -1502,6 +1507,8 @@ self: super: {
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124
heist = doJailbreak super.heist;

hinit = generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_1_1; });

# 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219
snap = doJailbreak super.snap;

Expand Down Expand Up @@ -1581,4 +1588,7 @@ self: super: {
# Test suite fails, upstream not reachable for simple fix (not responsive on github)
vivid-osc = dontCheck super.vivid-osc;
vivid-supercollider = dontCheck super.vivid-supercollider;

# Overly strict version bounds: https://github.com/Profpatsch/yarn-lock/issues/8
yarn-lock = doJailbreak super.yarn-lock;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
7 changes: 0 additions & 7 deletions pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,4 @@ self: super: {

# Break out of "Cabal < 3.2" constraint.
stylish-haskell = doJailbreak super.stylish-haskell;

# Agda 2.6.1.2 only declares a transformers dependency for ghc < 8.10.3.
# https://github.com/agda/agda/issues/5109
Agda = appendPatch super.Agda (pkgs.fetchpatch {
url = "https://github.com/agda/agda/commit/76278c23d447b49f59fac581ca4ac605792aabbc.patch";
sha256 = "1g34g8a09j73h89pk4cdmri0nb0qg664hkff45amcr9kyz14a9f3";
});
}
Loading