Skip to content
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.

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

Bump Nix flake GHC 9.2.3 to 9.2.4 #3081

Merged
merged 1 commit into from
Aug 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion configuration-ghc-90.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ 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_3_20220709;
ghc-lib-parser = hself.ghc-lib-parser_9_2_4_20220729;
ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_0_4;

Cabal = hself.Cabal_3_6_3_0;
Expand Down
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