Skip to content

Commit

Permalink
add GHC 9.4.5 (#28)
Browse files Browse the repository at this point in the history
  • Loading branch information
chris-martin authored May 23, 2024
1 parent 327903f commit 078ac00
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
3 changes: 3 additions & 0 deletions main/ghc/checks.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ in
{
ghc-9-2-7 = ghcVersionCheck "9.2.7" packages.ghc-9-2-7;
ghc-9-2-8 = ghcVersionCheck "9.2.8" packages.ghc-9-2-8;
ghc-9-4-5 = ghcVersionCheck "9.4.5" packages.ghc-9-4-5;
ghc-9-4-6 = ghcVersionCheck "9.4.6" packages.ghc-9-4-6;
ghc-9-4-7 = ghcVersionCheck "9.4.7" packages.ghc-9-4-7;
ghc-9-4-8 = ghcVersionCheck "9.4.8" packages.ghc-9-4-8;
Expand All @@ -43,6 +44,7 @@ in

weeder-for-ghc-9-2-7 = weederVersionCheck "2.4.1" packages.ghc-9-2-7;
weeder-for-ghc-9-2-8 = weederVersionCheck "2.4.1" packages.ghc-9-2-8;
weeder-for-ghc-9-4-5 = weederVersionCheck "2.7.0" packages.ghc-9-4-5;
weeder-for-ghc-9-4-6 = weederVersionCheck "2.5.0" packages.ghc-9-4-6;
weeder-for-ghc-9-4-7 = weederVersionCheck "2.7.0" packages.ghc-9-4-7;
weeder-for-ghc-9-6-3 = weederVersionCheck "2.7.0" packages.ghc-9-6-3;
Expand All @@ -51,6 +53,7 @@ in

hls-for-ghc-9-2-7 = hlsVersionCheck "1.10.0.0" (lib.haskellBundle { ghcVersion = "ghc-9-2-7"; enableHLS = true; });
hls-for-ghc-9-2-8 = hlsVersionCheck "2.2.0.0" (lib.haskellBundle { ghcVersion = "ghc-9-2-8"; enableHLS = true; });
hls-for-ghc-9-4-5 = hlsVersionCheck "2.4.0.0" (lib.haskellBundle { ghcVersion = "ghc-9-4-5"; enableHLS = true; });
hls-for-ghc-9-4-6 = hlsVersionCheck "1.10.0.0" (lib.haskellBundle { ghcVersion = "ghc-9-4-6"; enableHLS = true; });
hls-for-ghc-9-4-7 = hlsVersionCheck "2.4.0.0" (lib.haskellBundle { ghcVersion = "ghc-9-4-7"; enableHLS = true; });
hls-for-ghc-9-6-3 = hlsVersionCheck "2.4.0.0" (lib.haskellBundle { ghcVersion = "ghc-9-6-3"; enableHLS = true; });
Expand Down
16 changes: 16 additions & 0 deletions main/ghc/configurations.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,22 @@ in
paths = [ ghcWithPackages weeder ] ++ (if enableHLS then [ hls ] else [ ]);
};

ghc-9-4-5 = { packageSelection, enableHLS }:
let
nixpkgs = import inputs.nixpkgs-stable { inherit system; config = { }; };
name = "ghc945";
inherit (nixpkgs) haskell;
haskellPackages = haskell.packages.${name};
ghcWithPackages = haskellPackages.ghcWithPackages packageSelection;
inherit (haskell.lib) justStaticExecutables;
weeder = justStaticExecutables haskellPackages.weeder;
hls = nixpkgs.haskell-language-server.override { supportedGhcVersions = [ "945" ]; };
in
symlinkJoin {
inherit name;
paths = [ ghcWithPackages weeder ] ++ (if enableHLS then [ hls ] else [ ]);
};

ghc-9-4-6 = { packageSelection, enableHLS }:
let
nixpkgs = import inputs.nixpkgs-23-05 { inherit system; config = { }; };
Expand Down

0 comments on commit 078ac00

Please sign in to comment.