add ghc 9.8.3

freckle · Nov 18, 2024 · ea119a8 · ea119a8
1 parent aa1527c
commit ea119a8
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 1 deletion.
diff --git a/main/flake.lock b/main/flake.lock
diff --git a/main/flake.nix b/main/flake.nix
@@ -16,6 +16,7 @@
     nixpkgs-unstable-2024-04-03.url = "github:nixos/nixpkgs/62e885a4013446453b10fd7780eba4337f6f42e0";
     nixpkgs-unstable-2024-05-30.url = "github:nixos/nixpkgs/aa61b27554a5fc282758bf0324781e3464ef2cde";
     nixpkgs-unstable-2024-07-29.url = "github:nixos/nixpkgs/038fb464fcfa79b4f08131b07f2d8c9a6bcc4160";
+    nixpkgs-unstable-2024-11-18.url = "github:nixos/nixpkgs/5083ec887760adfe12af64830a66807423a859a7";
     stack-lint-extra-deps.url = "github:freckle/stack-lint-extra-deps";
     nixpkgs-haskell-updates.url = "github:nixos/nixpkgs/haskell-updates";
     flake-utils.url = "github:numtide/flake-utils";

diff --git a/main/ghc/checks.nix b/main/ghc/checks.nix
@@ -129,6 +129,12 @@ in
     weeder = "2.8.0";
     hls = "2.8.0.0";
   };
+  ghc-9-8-3 = ghcCheck {
+    packageName = "ghc-9-8-3";
+    ghc = "9.8.3";
+    weeder = "2.8.0";
+    hls = "2.8.0.0";
+  };
   ghc-9-10-1 = ghcCheck {
     packageName = "ghc-9-10-1";
     ghc = "9.10.1";

diff --git a/main/ghc/configurations.nix b/main/ghc/configurations.nix
@@ -347,6 +347,33 @@ in
       ] ++ (if enableHLS then [ hls ] else [ ]);
     };
 
+  ghc-9-8-3 =
+    { packageSelection, enableHLS }:
+    let
+      nixpkgs = import inputs.nixpkgs-unstable-2024-11-18 {
+        inherit system;
+        config = { };
+      };
+      name = "ghc983";
+      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 = [ "983" ]; };
+      cabal = nixpkgs.cabal-install;
+      stack = import ./stack.nix { inherit nixpkgs; };
+    in
+    symlinkJoin {
+      inherit name;
+      paths = [
+        ghcWithPackages
+        weeder
+        cabal
+        stack
+      ] ++ (if enableHLS then [ hls ] else [ ]);
+    };
+
   ghc-9-10-1 =
     { packageSelection, enableHLS }:
     let

diff --git a/main/ghc/default-versions-function.nix b/main/ghc/default-versions-function.nix
@@ -5,6 +5,6 @@ x
   ghc-9-2-x = ghc-9-2-8;
   ghc-9-4-x = ghc-9-4-8;
   ghc-9-6-x = ghc-9-6-6;
-  ghc-9-8-x = ghc-9-8-2;
+  ghc-9-8-x = ghc-9-8-3;
   ghc-9-10-x = ghc-9-10-1;
 })