Update to GHC 9.4.8 and 9.6.4 + bump Nixpkgs release

codedownio · Mar 19, 2024 · 9edbf7a · 9edbf7a
1 parent c554ff1
commit 9edbf7a
Show file tree

Hide file tree

Showing 6 changed files with 132 additions and 61 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -5,7 +5,7 @@
     url = "github:hercules-ci/gitignore.nix";
     inputs.nixpkgs.follows = "nixpkgs";
   };
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
 
   outputs = { self, flake-utils, gitignore, haskellNix, nixpkgs }@inputs:
     # flake-utils.lib.eachDefaultSystem (system:
@@ -58,8 +58,8 @@
             { name = "ghc8107"; stackYaml = "stack/stack-8.10.7.yaml"; }
             { name = "ghc902"; stackYaml = "stack/stack-9.0.2.yaml"; }
             { name = "ghc928"; stackYaml = "stack/stack-9.2.8.yaml"; }
-            { name = "ghc947"; stackYaml = "stack/stack-9.4.7.yaml"; }
-            { name = "ghc963"; stackYaml = "stack/stack-9.6.3.yaml"; }
+            { name = "ghc948"; stackYaml = "stack/stack-9.4.8.yaml"; }
+            { name = "ghc964"; stackYaml = "stack/stack-9.6.4.yaml"; }
           ]
         );
 

diff --git a/stack/stack-9.4.7.yaml → stack/stack-9.4.8.yaml b/stack/stack-9.4.7.yaml → stack/stack-9.4.8.yaml
@@ -1,5 +1,5 @@
 
-resolver: lts-21.17
+resolver: lts-21.25
 
 packages:
 - ../

diff --git a/stack/stack-9.4.7.yaml.lock → stack/stack-9.4.8.yaml.lock b/stack/stack-9.4.7.yaml.lock → stack/stack-9.4.8.yaml.lock
@@ -43,7 +43,7 @@ packages:
     subdir: ./ghc-parser
 snapshots:
 - completed:
-    sha256: 85d2382958c178491d3fe50d770a624621f5ab456beef7d31ac7521f780c9bc7
-    size: 640042
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/17.yaml
-  original: lts-21.17
+    sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd
+    size: 640086
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml
+  original: lts-21.25
diff --git a/stack/stack-9.6.3.yaml → stack/stack-9.6.4.yaml b/stack/stack-9.6.3.yaml → stack/stack-9.6.4.yaml
@@ -1,5 +1,5 @@
 
-resolver: nightly-2023-11-10
+resolver: lts-22.13
 
 packages:
 - ../

diff --git a/stack/stack-9.6.3.yaml.lock → stack/stack-9.6.4.yaml.lock b/stack/stack-9.6.3.yaml.lock → stack/stack-9.6.4.yaml.lock
@@ -43,7 +43,7 @@ packages:
     subdir: ./ghc-parser
 snapshots:
 - completed:
-    sha256: 0580a03f247573451c0a676673e0c2b474e0d42f78d4a93c4cd10eb32f2cb911
-    size: 698107
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/11/10.yaml
-  original: nightly-2023-11-10
+    sha256: 6f0bea3ba5b07360f25bc886e8cff8d847767557a492a6f7f6dcb06e3cc79ee9
+    size: 712905
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/13.yaml
+  original: lts-22.13