Skip to content

Update nix to GHC 8.10.5 #1991

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 3 commits into from
Jul 1, 2021
Merged

Update nix to GHC 8.10.5 #1991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3eaccf6
Update nix to GHC 8.10.5
berberman Jun 30, 2021
eaedee4
Merge branch 'master' into update-nix-8105
berberman Jul 1, 2021
d7c3f92
Update hiedb 0.4.0
berberman Jul 1, 2021
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
18 changes: 9 additions & 9 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.

41 changes: 18 additions & 23 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,25 +73,18 @@
tweaks = hself: hsuper:
with haskell.lib; {

# https://github.com/haskell/haskell-language-server/pull/1858
# Remove this override when nixpkgs has this package
apply-refact_0_9_3_0 = hself.callCabal2nix "apply-refact"
hls-tactics-plugin = hsuper.hls-tactics-plugin.override {
refinery = hself.refinery_0_3_0_0;
};

hiedb = hself.callCabal2nix "hiedb"
(builtins.fetchTarball {
url =
"https://hackage.haskell.org/package/apply-refact-0.9.3.0/apply-refact-0.9.3.0.tar.gz";
"https://hackage.haskell.org/package/hiedb-0.4.0.0/hiedb-0.4.0.0.tar.gz";
sha256 =
"1jfq1aw91finlpq5nn7a96za4c8j13jk6jmx2867fildxwrik2qj";
"13jz8c46zfpf54ya2wsv4akhn0wcfc6qjazqsjfir5gpvsi7v8xr";
}) { };

hls-hlint-plugin = hsuper.hls-hlint-plugin.override {
hlint = hself.hlint_3_2_7;
apply-refact = hself.apply-refact_0_9_3_0;
};

hls-tactics-plugin = hsuper.hls-tactics-plugin.override {
refinery = hself.refinery_0_3_0_0;
};

};

hlsSources =
Expand All @@ -112,8 +105,8 @@
hlsHpkgs = compiler: extended haskell.packages.${compiler};

# Support of GenChangelogs.hs
gen-hls-changelogs =
let myGHC = haskellPackages.ghcWithPackages (p: with p; [ github ]);
gen-hls-changelogs = hpkgs:
let myGHC = hpkgs.ghcWithPackages (p: with p; [ github ]);
in runCommand "gen-hls-changelogs" {
passAsFile = [ "text" ];
preferLocalBuild = true;
Expand All @@ -137,10 +130,12 @@
};

# Pre-commit hooks to run stylish-haskell
pre-commit-check = pre-commit-hooks.lib.${system}.run {
pre-commit-check = hpkgs: pre-commit-hooks.lib.${system}.run {
src = ./.;
hooks = {
stylish-haskell.enable = true;
# use stylish-haskell with our target ghc
stylish-haskell.entry = "${hpkgs.stylish-haskell}/bin/stylish-haskell --inplace";
stylish-haskell.excludes = [
# Ignored files
"^Setup.hs$"
Expand Down Expand Up @@ -178,9 +173,9 @@
doBenchmark = true;
packages = p:
with builtins;
map (name: p.${name}) (attrNames pkgs.hlsSources);
buildInputs = [ gmp zlib ncurses capstone tracy gen-hls-changelogs ]
++ (with haskellPackages; [
map (name: p.${name}) (attrNames hlsSources);
buildInputs = [ gmp zlib ncurses capstone tracy (gen-hls-changelogs hpkgs) ]
++ (with hpkgs; [
cabal-install
hlint
ormolu
Expand All @@ -193,7 +188,7 @@
export LD_LIBRARY_PATH=${gmp}/lib:${zlib}/lib:${ncurses}/lib:${capstone}/lib
export DYLD_LIBRARY_PATH=${gmp}/lib:${zlib}/lib:${ncurses}/lib:${capstone}/lib
export PATH=$PATH:$HOME/.local/bin
${pre-commit-check.shellHook}
${(pre-commit-check hpkgs).shellHook}
'';
};
# Create a hls executable
Expand All @@ -218,14 +213,14 @@
haskell-language-server-884-dev = mkDevShell ghc884;
haskell-language-server-8104-dev = mkDevShell ghc8104;
haskell-language-server-8105-dev = mkDevShell ghc8105;
haskell-language-server-901-dev = mkDevShell ghc901;
haskell-language-server-901-dev = builtins.throw "Nix expression for developing HLS in GHC 9.0.1 is not yet available"; # mkDevShell ghc901;

# hls package
haskell-language-server = mkExe ghcDefault;
haskell-language-server-884 = mkExe ghc884;
haskell-language-server-8104 = mkExe ghc8104;
haskell-language-server-8105 = mkExe ghc8105;
haskell-language-server-901 = mkExe ghc901;
haskell-language-server-901 = builtins.throw "Nix expression for building HLS in GHC 9.0.1 is not yet available"; # mkExe ghc901;
};

defaultPackage = packages.haskell-language-server;
Expand Down