Skip to content

Fix nix build CI #3404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Dec 17, 2022
Merged

Fix nix build CI #3404

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
476f168
fix fourmolu with -f-fixity-th in nix env
wavewave Dec 14, 2022
837b040
ci failure test
wavewave Dec 16, 2022
14bbec3
bump nix file.
wavewave Dec 16, 2022
ab753ba
disable cachix action
wavewave Dec 16, 2022
299c3c1
further comment out
wavewave Dec 16, 2022
5b98a6e
revive cachix action.
wavewave Dec 16, 2022
4c518f8
remove commented-out
wavewave Dec 16, 2022
b3168bb
Merge branch 'wavewave/fourmolu-fix' into wavewave/ci-nix-build
wavewave Dec 16, 2022
f6d857a
fix hls-cabal-plugin by removing Cabal-syntax.
wavewave Dec 16, 2022
30dac51
limit implicit-hie < 0.1.3
wavewave Dec 15, 2022
f0bcb95
added a small comment and link to the issue.
wavewave Dec 16, 2022
35f328f
Merge branch 'wavewave/fourmolu-fix' into wavewave/ci-nix-build
wavewave Dec 16, 2022
0eab340
Merge branch 'master' into wavewave/ci-nix-build
wavewave Dec 16, 2022
0557552
put implicit-hie to ghcide dep
wavewave Dec 16, 2022
ead898d
bump CI
wavewave Dec 17, 2022
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
2 changes: 0 additions & 2 deletions .github/workflows/nix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ jobs:

- uses: cachix/install-nix-action@v18
with:
install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
extra_nix_config: |
experimental-features = nix-command flakes
nix_path: nixpkgs=channel:nixos-unstable
Expand Down
5 changes: 4 additions & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ constraints:
-- https://github.com/ndmitchell/hlint/issues/1376
hlint +ghc-lib,
ghc-lib-parser-ex -auto,
stylish-haskell +ghc-lib
stylish-haskell +ghc-lib,
-- implicit-hie 0.1.3.0 introduced an unexpected behavioral change.
-- https://github.com/Avi-D-coder/implicit-hie/issues/50
implicit-hie < 0.1.3
Copy link
Collaborator

@fendor fendor Dec 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #3317 (comment), this applies here, too. @michaelpj what do you think? Fix in a follow-up PR? Must not be forgotten for #3409

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, good point. I was thinking it was okay to be temporary, but indeed it can mess up our ability to release. Better to put a fake dependency in ghcide if we have to.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added implicit-hie to ghcide.


-- This is benign and won't affect our ability to release to Hackage,
-- because we only depend on `ekg-json` when a non-default flag
Expand Down
13 changes: 13 additions & 0 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@
url = "https://hackage.haskell.org/package/hiedb-0.4.2.0/hiedb-0.4.2.0.tar.gz";
flake = false;
};
implicit-hie = {
url = "https://hackage.haskell.org/package/implicit-hie-0.1.2.7/implicit-hie-0.1.2.7.tar.gz";
flake = false;
};
};
outputs =
inputs@{ self, nixpkgs, flake-compat, flake-utils, gitignore, all-cabal-hashes-unpacked, ... }:
Expand Down Expand Up @@ -122,6 +126,7 @@
# Patches don't apply
github = overrideCabal hsuper.github (drv: { patches = []; });
hiedb = hsuper.callCabal2nix "hiedb" inputs.hiedb {};
implicit-hie = hsuper.callCabal2nix "implicit-hie" inputs.implicit-hie {};

# https://github.com/NixOS/nixpkgs/issues/140774
ormolu =
Expand Down
1 change: 0 additions & 1 deletion plugins/hls-cabal-plugin/hls-cabal-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ library
-- This is a lot of work for almost zero benefit, so we just allow more versions here
-- and we eventually completely drop support for building HLS with stack.
, Cabal ^>=3.2 || ^>=3.4 || ^>=3.6 || ^>= 3.8
, Cabal-syntax ^>= 3.6
, deepseq
, directory
, extra >=1.7.4
Expand Down