mirror of
https://github.com/haskell/haskell-language-server.git
synced 2024-09-11 16:56:14 +03:00
Use GHC 9.2.7 in flake (#3527)
* Assign all Nix dev shells to `all-nix-dev-shells` * Use GHC 9.2.7 in flake --------- Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
This commit is contained in:
parent
385f0008a4
commit
eebf3b2a68
2
.github/workflows/nix.yml
vendored
2
.github/workflows/nix.yml
vendored
@ -103,7 +103,7 @@ jobs:
|
||||
# We only build nix dev shell for current GHC version because some are
|
||||
# failing with different GHC version on darwin.
|
||||
- name: Build development shell with nix dependencies for current GHC version
|
||||
run: nix develop --print-build-logs .#all-nix-dev-shells --profile dev
|
||||
run: nix develop --print-build-logs .#haskell-language-server-dev-nix --profile dev
|
||||
- name: Push development shell
|
||||
if: ${{ env.HAS_TOKEN == 'true' }}
|
||||
run: cachix push haskell-language-server dev
|
||||
|
@ -73,11 +73,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1676928847,
|
||||
"narHash": "sha256-FIqk+DHRICsWozlOdRxOXO/g9hCqjPYpmr8wQGrpUCA=",
|
||||
"lastModified": 1678987615,
|
||||
"narHash": "sha256-lF4agoB7ysQGNHRXvOqxtSKIZrUZwClA85aASahQlYM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5ab8b5ae26e6a4b781bdebdfd131c054f0b96e70",
|
||||
"rev": "194c2aa446b2b059886bb68be15ef6736d5a8c31",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
19
flake.nix
19
flake.nix
@ -172,7 +172,7 @@
|
||||
};
|
||||
|
||||
ghc902Config = (import ./configuration-ghc-90.nix) { inherit pkgs inputs; };
|
||||
ghc926Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; };
|
||||
ghc927Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; };
|
||||
ghc944Config = (import ./configuration-ghc-94.nix) { inherit pkgs inputs; };
|
||||
|
||||
# GHC versions
|
||||
@ -182,13 +182,13 @@
|
||||
ghcVersion = "ghc" + (pkgs.lib.replaceStrings ["."] [""] pkgs.haskellPackages.ghc.version);
|
||||
cases = {
|
||||
ghc902 = ghc902Config.tweakHpkgs (pkgs.hlsHpkgs "ghc902");
|
||||
ghc926 = ghc926Config.tweakHpkgs (pkgs.hlsHpkgs "ghc926");
|
||||
ghc927 = ghc927Config.tweakHpkgs (pkgs.hlsHpkgs "ghc927");
|
||||
ghc944 = ghc944Config.tweakHpkgs (pkgs.hlsHpkgs "ghc944");
|
||||
};
|
||||
in { default = cases."${ghcVersion}"; } // cases;
|
||||
|
||||
ghc902 = supportedGHCs.ghc902;
|
||||
ghc926 = supportedGHCs.ghc926;
|
||||
ghc927 = supportedGHCs.ghc927;
|
||||
ghc944 = supportedGHCs.ghc944;
|
||||
ghcDefault = supportedGHCs.default;
|
||||
|
||||
@ -310,7 +310,7 @@
|
||||
simpleDevShells = {
|
||||
haskell-language-server-dev = mkDevShell ghcDefault "cabal.project";
|
||||
haskell-language-server-902-dev = mkDevShell ghc902 "cabal.project";
|
||||
haskell-language-server-926-dev = mkDevShell ghc926 "cabal.project";
|
||||
haskell-language-server-927-dev = mkDevShell ghc927 "cabal.project";
|
||||
haskell-language-server-944-dev = mkDevShell ghc944 "cabal.project";
|
||||
};
|
||||
|
||||
@ -318,7 +318,7 @@
|
||||
nixDevShells = {
|
||||
haskell-language-server-dev-nix = mkDevShellWithNixDeps ghcDefault "cabal.project";
|
||||
haskell-language-server-902-dev-nix = mkDevShellWithNixDeps ghc902 "cabal.project";
|
||||
haskell-language-server-926-dev-nix = mkDevShellWithNixDeps ghc926 "cabal.project";
|
||||
haskell-language-server-927-dev-nix = mkDevShellWithNixDeps ghc927 "cabal.project";
|
||||
haskell-language-server-944-dev-nix = mkDevShellWithNixDeps ghc944 "cabal.project";
|
||||
};
|
||||
|
||||
@ -327,14 +327,14 @@
|
||||
envShells = {
|
||||
haskell-language-server-dev-env = mkEnvShell ghcDefault;
|
||||
haskell-language-server-902-dev-env = mkEnvShell ghc902;
|
||||
haskell-language-server-926-dev-env = mkEnvShell ghc926;
|
||||
haskell-language-server-927-dev-env = mkEnvShell ghc927;
|
||||
haskell-language-server-944-dev-env = mkEnvShell ghc944;
|
||||
};
|
||||
|
||||
allPackages = {
|
||||
haskell-language-server = mkExe ghcDefault;
|
||||
haskell-language-server-902 = mkExe ghc902;
|
||||
haskell-language-server-926 = mkExe ghc926;
|
||||
haskell-language-server-927 = mkExe ghc927;
|
||||
haskell-language-server-944 = mkExe ghc944;
|
||||
};
|
||||
|
||||
@ -354,9 +354,8 @@
|
||||
all-haskell-language-server = linkFarmFromDrvs "all-haskell-language-server" (lib.unique (builtins.attrValues allPackages));
|
||||
|
||||
# Same for all shells
|
||||
# We try to build as much as possible, but not much shells are
|
||||
# working (especially on darwing), so this list is limited.
|
||||
all-nix-dev-shells = linkFarmFromDrvs "all-dev-shells" (builtins.map (shell: shell.inputDerivation) (lib.unique [nixDevShells.haskell-language-server-dev-nix]));
|
||||
all-nix-dev-shells = linkFarmFromDrvs "all-dev-shells"
|
||||
(builtins.map (shell: shell.inputDerivation) (lib.unique (builtins.attrValues nixDevShells)));
|
||||
|
||||
all-simple-dev-shells = linkFarmFromDrvs "all-simple-dev-shells"
|
||||
(builtins.map (shell: shell.inputDerivation) (lib.unique (builtins.attrValues simpleDevShells)));
|
||||
|
Loading…
Reference in New Issue
Block a user