Skip to content

Commit f5db150

Browse files
authored
Fix nix build CI (#3404)
* fix fourmolu with -f-fixity-th in nix env * ci failure test * bump nix file. * disable cachix action * further comment out * revive cachix action. * remove commented-out * fix hls-cabal-plugin by removing Cabal-syntax. note that this is an opposite to #3383, to prioritize CI fix first. * limit implicit-hie < 0.1.3 * added a small comment and link to the issue. * put implicit-hie to ghcide dep * bump CI
1 parent a235ec9 commit f5db150

File tree

5 files changed

+23
-3
lines changed

5 files changed

+23
-3
lines changed

.github/workflows/nix.yml

-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ jobs:
8989

9090
- uses: cachix/install-nix-action@v18
9191
with:
92-
install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
93-
install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
9492
extra_nix_config: |
9593
experimental-features = nix-command flakes
9694
nix_path: nixpkgs=channel:nixos-unstable

flake.lock

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+5
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
url = "https://hackage.haskell.org/package/hiedb-0.4.2.0/hiedb-0.4.2.0.tar.gz";
6060
flake = false;
6161
};
62+
implicit-hie = {
63+
url = "https://hackage.haskell.org/package/implicit-hie-0.1.2.7/implicit-hie-0.1.2.7.tar.gz";
64+
flake = false;
65+
};
6266
};
6367
outputs =
6468
inputs@{ self, nixpkgs, flake-compat, flake-utils, gitignore, all-cabal-hashes-unpacked, ... }:
@@ -122,6 +126,7 @@
122126
# Patches don't apply
123127
github = overrideCabal hsuper.github (drv: { patches = []; });
124128
hiedb = hsuper.callCabal2nix "hiedb" inputs.hiedb {};
129+
implicit-hie = hsuper.callCabal2nix "implicit-hie" inputs.implicit-hie {};
125130

126131
# https://github.com/NixOS/nixpkgs/issues/140774
127132
ormolu =

ghcide/ghcide.cabal

+5
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ library
104104
ghc-paths,
105105
cryptohash-sha1 >=0.11.100 && <0.12,
106106
hie-bios ^>= 0.11.0,
107+
-- implicit-hie 0.1.3.0 introduced an unexpected behavioral change.
108+
-- https://github.com/Avi-D-coder/implicit-hie/issues/50
109+
-- to make sure ghcide behaves in a desirable way, we put implicit-hie
110+
-- fake dependency here.
111+
implicit-hie < 0.1.3,
107112
implicit-hie-cradle ^>= 0.3.0.5 || ^>= 0.5,
108113
base16-bytestring >=0.1.1 && <1.1
109114
if os(windows)

plugins/hls-cabal-plugin/hls-cabal-plugin.cabal

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ library
4545
-- This is a lot of work for almost zero benefit, so we just allow more versions here
4646
-- and we eventually completely drop support for building HLS with stack.
4747
, Cabal ^>=3.2 || ^>=3.4 || ^>=3.6 || ^>= 3.8
48-
, Cabal-syntax ^>= 3.6
4948
, deepseq
5049
, directory
5150
, extra >=1.7.4

0 commit comments

Comments
 (0)