mirror of
https://github.com/haskell/haskell-language-server.git
synced 2024-09-11 08:45:35 +03:00
build(nix): ghc922 -> ghc923 (#3049)
* build(nix): ghc922 -> ghc923 bumped nixpkgs and add support for ghc923 (replacing ghc922) * fixes * fixing for ghc90? Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
This commit is contained in:
parent
41b1085df5
commit
100b53a474
@ -67,4 +67,5 @@ allow-newer:
|
||||
----------
|
||||
hiedb:base,
|
||||
|
||||
ekg-core,
|
||||
ekg-wai:time
|
||||
|
@ -19,13 +19,12 @@ let
|
||||
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
|
||||
|
||||
ghc-lib = hself.ghc-lib_9_2_2_20220307;
|
||||
ghc-lib-parser = hself.ghc-lib-parser_9_2_2_20220307;
|
||||
ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_0_3;
|
||||
ghc-lib-parser = hself.ghc-lib-parser_9_2_3_20220709;
|
||||
ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_0_4;
|
||||
|
||||
Cabal = hself.Cabal_3_6_3_0;
|
||||
ormolu = hself.ormolu_0_4_0_0;
|
||||
ormolu = hself.ormolu_0_5_0_0;
|
||||
fourmolu = hself.fourmolu_0_6_0_0;
|
||||
|
||||
# Hlint is still broken
|
||||
hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint-34 { });
|
||||
|
||||
|
@ -29,6 +29,8 @@ let
|
||||
# Hlint is still broken
|
||||
hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint { });
|
||||
|
||||
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
|
||||
|
||||
# Re-generate HLS drv excluding some plugins
|
||||
haskell-language-server =
|
||||
hself.callCabal2nixWithOptions "haskell-language-server" ./.
|
||||
|
42
flake.lock
42
flake.lock
@ -54,11 +54,11 @@
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1653893745,
|
||||
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
|
||||
"lastModified": 1656928814,
|
||||
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
|
||||
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -69,11 +69,11 @@
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1653893745,
|
||||
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
|
||||
"lastModified": 1656928814,
|
||||
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
|
||||
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -249,11 +249,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1650049622,
|
||||
"narHash": "sha256-fh/xYFctwzuowIWsVdtXUVtil4pxk54GabGY/sNKU30=",
|
||||
"owner": "nixos",
|
||||
"lastModified": 1657849727,
|
||||
"narHash": "sha256-68J4eSwzr98r7VCzgrX/WWaQzkY7gdKqH2uSyQheYj0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "92d1f76186bb974dd90971d7619f8bf0bff23a73",
|
||||
"rev": "0b683abff06fe55755ea992ba47f2e787081a30f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -265,11 +265,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1654085299,
|
||||
"narHash": "sha256-sR1pefD3cvNvYIcGTUXvUMe9UesEkSKtjGN1H/TBXsQ=",
|
||||
"lastModified": 1657888067,
|
||||
"narHash": "sha256-GnwJoFBTPfW3+mz7QEeJEEQ9OMHZOiIJ/qDhZxrlKh8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3b4bdfbe6f19ca497d999ad08aeb668839858a18",
|
||||
"rev": "65fae659e31098ca4ac825a6fef26d890aaf3f4e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -284,11 +284,11 @@
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1653561148,
|
||||
"narHash": "sha256-JzAttqACdvMOTwkzkJ0jFF8MWIo8Uau4w/XUMyqpnd8=",
|
||||
"lastModified": 1657626303,
|
||||
"narHash": "sha256-O/JJ0hSBCmlx0oP8QGAlRrWn0BvlC5cj7/EZ0CCWHTU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "poetry2nix",
|
||||
"rev": "3b01c3e3dc57d511848d8433153ab67db79640e1",
|
||||
"rev": "920ba682377d5c0d87945c5eb6141ab8447ca509",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -347,7 +347,7 @@
|
||||
"ptr-poker": "ptr-poker",
|
||||
"retrie": "retrie",
|
||||
"sphinx_rtd_theme": "sphinx_rtd_theme",
|
||||
"stylish-haskell-01220": "stylish-haskell-01220"
|
||||
"stylish-haskell": "stylish-haskell"
|
||||
}
|
||||
},
|
||||
"sphinx_rtd_theme": {
|
||||
@ -367,16 +367,16 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"stylish-haskell-01220": {
|
||||
"stylish-haskell": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-uQIvhz/xRbKLHe9et+tHUVE9To5vt1Pz3+vvDEqJaLI=",
|
||||
"narHash": "sha256-oZSR5UQ+ieMFRq7MvL0sJqOblMk74awvcepuT+JHYtA=",
|
||||
"type": "tarball",
|
||||
"url": "https://hackage.haskell.org/package/stylish-haskell-0.12.2.0/stylish-haskell-0.12.2.0.tar.gz"
|
||||
"url": "https://hackage.haskell.org/package/stylish-haskell-0.14.2.0/stylish-haskell-0.14.2.0.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://hackage.haskell.org/package/stylish-haskell-0.12.2.0/stylish-haskell-0.12.2.0.tar.gz"
|
||||
"url": "https://hackage.haskell.org/package/stylish-haskell-0.14.2.0/stylish-haskell-0.14.2.0.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
16
flake.nix
16
flake.nix
@ -76,8 +76,8 @@
|
||||
url = "https://hackage.haskell.org/package/ptr-poker-0.1.2.8/ptr-poker-0.1.2.8.tar.gz";
|
||||
flake = false;
|
||||
};
|
||||
stylish-haskell-01220 = {
|
||||
url = "https://hackage.haskell.org/package/stylish-haskell-0.12.2.0/stylish-haskell-0.12.2.0.tar.gz";
|
||||
stylish-haskell = {
|
||||
url = "https://hackage.haskell.org/package/stylish-haskell-0.14.2.0/stylish-haskell-0.14.2.0.tar.gz";
|
||||
flake = false;
|
||||
};
|
||||
implicit-hie-cradle = {
|
||||
@ -213,7 +213,7 @@
|
||||
};
|
||||
|
||||
ghc902Config = (import ./configuration-ghc-90.nix) { inherit pkgs inputs; };
|
||||
ghc922Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; };
|
||||
ghc923Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; };
|
||||
|
||||
# GHC versions
|
||||
# While HLS still works fine with 8.10 GHCs, we only support the versions that are cached
|
||||
@ -222,12 +222,12 @@
|
||||
ghcVersion = "ghc" + (pkgs.lib.replaceStrings ["."] [""] pkgs.haskellPackages.ghc.version);
|
||||
cases = {
|
||||
ghc902 = ghc902Config.tweakHpkgs (pkgs.hlsHpkgs "ghc902");
|
||||
ghc922 = ghc922Config.tweakHpkgs (pkgs.hlsHpkgs "ghc922");
|
||||
ghc923 = ghc923Config.tweakHpkgs (pkgs.hlsHpkgs "ghc923");
|
||||
};
|
||||
in { default = cases."${ghcVersion}"; } // cases;
|
||||
|
||||
ghc902 = supportedGHCs.ghc902;
|
||||
ghc922 = supportedGHCs.ghc922;
|
||||
ghc923 = supportedGHCs.ghc923;
|
||||
ghcDefault = supportedGHCs.default;
|
||||
|
||||
# For markdown support
|
||||
@ -359,20 +359,20 @@
|
||||
simpleDevShells = {
|
||||
haskell-language-server-dev = mkDevShell ghcDefault "cabal.project";
|
||||
haskell-language-server-902-dev = mkDevShell ghc902 "cabal.project";
|
||||
haskell-language-server-922-dev = mkDevShell ghc922 "cabal.project";
|
||||
haskell-language-server-923-dev = mkDevShell ghc923 "cabal.project";
|
||||
};
|
||||
|
||||
# Developement shell, haskell packages are also provided by nix
|
||||
nixDevShells = {
|
||||
haskell-language-server-dev-nix = mkDevShellWithNixDeps ghcDefault "cabal.project";
|
||||
haskell-language-server-902-dev-nix = mkDevShellWithNixDeps ghc902 "cabal.project";
|
||||
haskell-language-server-922-dev-nix = mkDevShellWithNixDeps ghc922 "cabal.project";
|
||||
haskell-language-server-923-dev-nix = mkDevShellWithNixDeps ghc923 "cabal.project";
|
||||
};
|
||||
|
||||
allPackages = {
|
||||
haskell-language-server = mkExe ghcDefault;
|
||||
haskell-language-server-902 = mkExe ghc902;
|
||||
haskell-language-server-922 = mkExe ghc922;
|
||||
haskell-language-server-923 = mkExe ghc923;
|
||||
};
|
||||
|
||||
devShells = simpleDevShells // nixDevShells // {
|
||||
|
Loading…
Reference in New Issue
Block a user