summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorPoscat <poscat@mail.poscat.moe>2020-12-16 00:39:17 +0800
committerPeter Simons <simons@cryp.to>2020-12-18 20:27:07 +0100
commit056f4390aaa8e1e380c23e95866510c2957bdf60 (patch)
tree0b79c43d0f5352f4b9d651123b8dcf8b2ad4a59c /pkgs/development/haskell-modules/configuration-common.nix
parentaff8bc92aeeaec986c4449c76b5d2b6974d14713 (diff)
downloadnixpkgs-056f4390aaa8e1e380c23e95866510c2957bdf60.tar
nixpkgs-056f4390aaa8e1e380c23e95866510c2957bdf60.tar.gz
nixpkgs-056f4390aaa8e1e380c23e95866510c2957bdf60.tar.bz2
nixpkgs-056f4390aaa8e1e380c23e95866510c2957bdf60.tar.lz
nixpkgs-056f4390aaa8e1e380c23e95866510c2957bdf60.tar.xz
nixpkgs-056f4390aaa8e1e380c23e95866510c2957bdf60.tar.zst
nixpkgs-056f4390aaa8e1e380c23e95866510c2957bdf60.zip
haskellPackages.ghcide: unbreak
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix12
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index aa8212f167b..99cb6223269 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1400,13 +1400,11 @@ self: super: {
   });
 
   fourmolu = dontCheck super.fourmolu;
-  ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch {
-    # 2020-11-13: Bumping bounds via an already upstream merged change
-    # https://github.com/haskell/ghcide/pull/905
-    url = https://github.com/haskell/ghcide/commit/9b8aaf9b06846571cc0b5d46680e686e4f9153a3.patch;
-    sha256 = "0j8980dmvwjcs72ahq2zc14hwkyd5ybgzyy1az3zq5flp383fai6";
-    includes = [ "ghcide.cabal" ];
-  }));
+  # 1. test requires internet
+  # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
+  ghcide = doDistribute (unmarkBroken (dontCheck
+    (super.ghcide.override { lsp-test = dontCheck self.lsp-test_0_11_0_7; })
+  ));
   refinery = doDistribute super.refinery_0_3_0_0;
   data-tree-print = doJailbreak super.data-tree-print;
   # the hls brittany is objectively better, because there hasn‘t been a