ghc 9.8.(3,4)

freckle · Dec 12, 2024 · 5df1caa · 5df1caa
1 parent 8fcd90d
commit 5df1caa
Show file tree

Hide file tree

Showing 5 changed files with 111 additions and 4 deletions.
diff --git a/main/flake.lock b/main/flake.lock
diff --git a/main/flake.nix b/main/flake.nix
@@ -1,6 +1,7 @@
 {
   inputs = {
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs-24-11.url = "github:nixos/nixpkgs/nixos-24.11";
     nixpkgs-24-05.url = "github:nixos/nixpkgs/nixos-24.05";
     nixpkgs-22-11.url = "github:nixos/nixpkgs/nixos-22.11";
     nixpkgs-23-05.url = "github:nixos/nixpkgs/nixos-23.05";
@@ -11,6 +12,7 @@
     nixpkgs-master-2023-09-15.url = "github:nixos/nixpkgs/46688f8eb5cd6f1298d873d4d2b9cf245e09e88e";
     nixpkgs-master-2024-01-27.url = "github:nixos/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb";
     nixpkgs-master-2024-10-19.url = "github:nixos/nixpkgs/67f803dcf82ebe958a53fcfa7c1edb276558c3f6";
+    nixpkgs-master-2024-12-11.url = "github:nixos/nixpkgs/f11a40c4201996d9aae5a99790fb6a172df114bb";
     nixpkgs-unstable-2023-10-21.url = "github:nixos/nixpkgs/038b2922be3fc096e1d456f93f7d0f4090628729";
     nixpkgs-unstable-2024-02-20.url = "github:nixos/nixpkgs/b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa";
     nixpkgs-unstable-2024-04-03.url = "github:nixos/nixpkgs/62e885a4013446453b10fd7780eba4337f6f42e0";

diff --git a/main/ghc/checks.nix b/main/ghc/checks.nix
@@ -129,6 +129,18 @@ 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.9.0";
+    hls = "2.9.0.0";
+  };
+  ghc-9-8-4 = ghcCheck {
+    packageName = "ghc-9-8-4";
+    ghc = "9.8.4";
+    weeder = "2.9.0";
+    hls = "2.9.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,65 @@ in
       ] ++ (if enableHLS then [ hls ] else [ ]);
     };
 
+  ghc-9-8-3 =
+    { packageSelection, enableHLS }:
+    let
+      nixpkgs = import inputs.nixpkgs-24-11 {
+        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-8-4 =
+    { packageSelection, enableHLS }:
+    let
+      nixpkgs = import inputs.nixpkgs-haskell-updates {
+        inherit system;
+        config = { };
+      };
+      name = "ghc984";
+      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 = [ "984" ]; };
+      cabal = nixpkgs.cabal-install;
+      stack = import ./stack.nix {
+        nixpkgs = import inputs.nixpkgs-stable {
+          inherit system;
+          config = { };
+        };
+      };
+    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-4;
   ghc-9-10-x = ghc-9-10-1;
 })