Skip to content

Commit

Permalink
Bump Nix flake GHC 9.2.3 to 9.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
cydparser committed Aug 7, 2022
1 parent f3225ad commit e4cc5f8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions flake.lock

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

12 changes: 6 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
};

ghc902Config = (import ./configuration-ghc-90.nix) { inherit pkgs inputs; };
ghc923Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; };
ghc924Config = (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
Expand All @@ -222,12 +222,12 @@
ghcVersion = "ghc" + (pkgs.lib.replaceStrings ["."] [""] pkgs.haskellPackages.ghc.version);
cases = {
ghc902 = ghc902Config.tweakHpkgs (pkgs.hlsHpkgs "ghc902");
ghc923 = ghc923Config.tweakHpkgs (pkgs.hlsHpkgs "ghc923");
ghc924 = ghc924Config.tweakHpkgs (pkgs.hlsHpkgs "ghc924");
};
in { default = cases."${ghcVersion}"; } // cases;

ghc902 = supportedGHCs.ghc902;
ghc923 = supportedGHCs.ghc923;
ghc924 = supportedGHCs.ghc924;
ghcDefault = supportedGHCs.default;

# For markdown support
Expand Down Expand Up @@ -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-923-dev = mkDevShell ghc923 "cabal.project";
haskell-language-server-924-dev = mkDevShell ghc924 "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-923-dev-nix = mkDevShellWithNixDeps ghc923 "cabal.project";
haskell-language-server-924-dev-nix = mkDevShellWithNixDeps ghc924 "cabal.project";
};

allPackages = {
haskell-language-server = mkExe ghcDefault;
haskell-language-server-902 = mkExe ghc902;
haskell-language-server-923 = mkExe ghc923;
haskell-language-server-924 = mkExe ghc924;
};

devShells = simpleDevShells // nixDevShells // {
Expand Down

0 comments on commit e4cc5f8

Please sign in to comment.