Update to GHC 9.6 and Cabal 3.10

gren-lang · Oct 17, 2024 · b26f93f · b26f93f
1 parent 22bec11
commit b26f93f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 34 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -70,7 +70,7 @@ jobs:
       - name: Cache cabal store
         uses: actions/cache@v4
         with:
-          path: ~/.cabal/store
+          path: ~/.local/state/cabal
           key: deps-linux-${{ env.ghc }}-${{ hashFiles('cabal.project.freeze') }}
 
       - name: Cache build artifacts
@@ -128,7 +128,7 @@ jobs:
       - name: Cache cabal store
         uses: actions/cache@v4
         with:
-          path: ~/.cabal/store
+          path: ~/.local/state/cabal
           key: deps-${{ matrix.os }}-${{ hashFiles('devbox.lock', 'cabal.project.freeze') }}
 
       - name: Cache build artifacts

diff --git a/devbox.json b/devbox.json
@@ -2,9 +2,9 @@
   "$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.13.4/.schema/devbox.schema.json",
   "packages": [
     "nodejs@20",
-    "[email protected]",
-    "[email protected]",
-    "[email protected]"
+    "[email protected]",
+    "[email protected]",
+    "[email protected]"
   ],
   "shell": {
     "init_hook": [

diff --git a/devbox.lock b/devbox.lock
@@ -1,116 +1,116 @@
 {
   "lockfile_version": "1",
   "packages": {
-    "cabal-install@3.8.1.0": {
-      "last_modified": "2023-03-28T10:29:13Z",
-      "resolved": "github:NixOS/nixpkgs/98f3b08f58ff125ef02d55cd52a83f44f245f2ea#cabal-install",
+    "cabal-install@3.10": {
+      "last_modified": "2024-07-31T08:48:38Z",
+      "resolved": "github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce#cabal-install",
       "source": "devbox-search",
-      "version": "3.8.1.0",
+      "version": "3.10.3.0",
       "systems": {
         "aarch64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/060dvanq07yffbjqqard255g3rf80npk-cabal-install-3.8.1.0",
+              "path": "/nix/store/dd543dbn0mhj7674q1xja84xcw00791w-cabal-install-3.10.3.0",
               "default": true
             }
           ],
-          "store_path": "/nix/store/060dvanq07yffbjqqard255g3rf80npk-cabal-install-3.8.1.0"
+          "store_path": "/nix/store/dd543dbn0mhj7674q1xja84xcw00791w-cabal-install-3.10.3.0"
         },
         "aarch64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/8wkk6h4bd8sdwnllp2dfhrra2sjss6a5-cabal-install-3.8.1.0",
+              "path": "/nix/store/i4j48x90xwygm4vvjgy6gal50lnpm1yl-cabal-install-3.10.3.0",
               "default": true
             }
           ],
-          "store_path": "/nix/store/8wkk6h4bd8sdwnllp2dfhrra2sjss6a5-cabal-install-3.8.1.0"
+          "store_path": "/nix/store/i4j48x90xwygm4vvjgy6gal50lnpm1yl-cabal-install-3.10.3.0"
         },
         "x86_64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/2r5gydfgs3lg3f928q0ch11x2kwz2nj5-cabal-install-3.8.1.0",
+              "path": "/nix/store/3jgzbgacsjlvs7y4xgqxwdk8p62f22vq-cabal-install-3.10.3.0",
               "default": true
             }
           ],
-          "store_path": "/nix/store/2r5gydfgs3lg3f928q0ch11x2kwz2nj5-cabal-install-3.8.1.0"
+          "store_path": "/nix/store/3jgzbgacsjlvs7y4xgqxwdk8p62f22vq-cabal-install-3.10.3.0"
         },
         "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/wx9yy9mq1psqzqnmqnvrchgqgfhvaz7q-cabal-install-3.8.1.0",
+              "path": "/nix/store/7275af4qndabxgw7nnzsz8g2xgigrs1b-cabal-install-3.10.3.0",
               "default": true
             }
           ],
-          "store_path": "/nix/store/wx9yy9mq1psqzqnmqnvrchgqgfhvaz7q-cabal-install-3.8.1.0"
+          "store_path": "/nix/store/7275af4qndabxgw7nnzsz8g2xgigrs1b-cabal-install-3.10.3.0"
         }
       }
     },
-    "ghc@9.4.8": {
-      "last_modified": "2024-03-08T13:51:52Z",
+    "ghc@9.6": {
+      "last_modified": "2024-10-06T02:39:15Z",
       "plugin_version": "0.0.2",
-      "resolved": "github:NixOS/nixpkgs/a343533bccc62400e8a9560423486a3b6c11a23b#ghc",
+      "resolved": "github:NixOS/nixpkgs/7d49afd36b5590f023ec56809c02e05d8164fbc4#ghc",
       "source": "devbox-search",
-      "version": "9.4.8",
+      "version": "9.6.6",
       "systems": {
         "aarch64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/ldgr8rqmkq941pwgi7zl80d3akil3va4-ghc-9.4.8",
+              "path": "/nix/store/sfc83v75nfiz975cznwaswxvaz3dfdv2-ghc-9.6.6",
               "default": true
             },
             {
               "name": "doc",
-              "path": "/nix/store/52c8i1i3xmnzygakwigam3npa8qkfdzw-ghc-9.4.8-doc"
+              "path": "/nix/store/zjfzknvgab8jqvgji78a3s5s8c4a503f-ghc-9.6.6-doc"
             }
           ],
-          "store_path": "/nix/store/ldgr8rqmkq941pwgi7zl80d3akil3va4-ghc-9.4.8"
+          "store_path": "/nix/store/sfc83v75nfiz975cznwaswxvaz3dfdv2-ghc-9.6.6"
         },
         "aarch64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/32y2ypndq67irn7ryhnsvabmcpypvnlx-ghc-9.4.8",
+              "path": "/nix/store/b7j53r7dgl0iq47f5n7hv17iyz42yl96-ghc-9.6.6",
               "default": true
             },
             {
               "name": "doc",
-              "path": "/nix/store/16d4chgy1ax686agmz7i46kxvml755z5-ghc-9.4.8-doc"
+              "path": "/nix/store/lk6ybinvh9xqvnp5ml5812ncadnzpwpn-ghc-9.6.6-doc"
             }
           ],
-          "store_path": "/nix/store/32y2ypndq67irn7ryhnsvabmcpypvnlx-ghc-9.4.8"
+          "store_path": "/nix/store/b7j53r7dgl0iq47f5n7hv17iyz42yl96-ghc-9.6.6"
         },
         "x86_64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/j7lqyfkfbzkn1qna9mmfdz7m72n0s9r1-ghc-9.4.8",
+              "path": "/nix/store/i3hw8rmihhjknhbmlcs3lyb2a1l73b3w-ghc-9.6.6",
               "default": true
             },
             {
               "name": "doc",
-              "path": "/nix/store/mvb1r4mjw95z06pii94a10ly09fm1zpd-ghc-9.4.8-doc"
+              "path": "/nix/store/pbxiq8jnkllp84alr6m063ffvy8xgw74-ghc-9.6.6-doc"
             }
           ],
-          "store_path": "/nix/store/j7lqyfkfbzkn1qna9mmfdz7m72n0s9r1-ghc-9.4.8"
+          "store_path": "/nix/store/i3hw8rmihhjknhbmlcs3lyb2a1l73b3w-ghc-9.6.6"
         },
         "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/b29abywbk2yxl199nvf9b4b04fzqgzs0-ghc-9.4.8",
+              "path": "/nix/store/f2hib3gih6fdvvnsyy5qs51adfz8j9d3-ghc-9.6.6",
               "default": true
             },
             {
               "name": "doc",
-              "path": "/nix/store/011fj4igd8jd4wmhbn6rjfww91h908rz-ghc-9.4.8-doc"
+              "path": "/nix/store/y18nmisn4xy9jymrwm9cg0pa1kijl9ii-ghc-9.6.6-doc"
             }
           ],
-          "store_path": "/nix/store/b29abywbk2yxl199nvf9b4b04fzqgzs0-ghc-9.4.8"
+          "store_path": "/nix/store/f2hib3gih6fdvvnsyy5qs51adfz8j9d3-ghc-9.6.6"
         }
       }
     },

diff --git a/gren.cabal b/gren.cabal
@@ -196,7 +196,7 @@ Common gren-common
     Build-depends:
         ansi-terminal >= 0.11 && < 0.12,
         ansi-wl-pprint >= 0.6.8 && < 0.7,
-        base >= 4.17 && <5,
+        base >= 4.18 && <5,
         binary >= 0.8 && < 0.9,
         bytestring >= 0.11 && < 0.12,
         containers >= 0.6 && < 0.7,