diff --git a/constants.nix b/constants.nix index 04f7e47..7b33884 100644 --- a/constants.nix +++ b/constants.nix @@ -1,6 +1,5 @@ { name = "prefmanager"; - # GHC 9.6.2 disabled since `fgl` a dependency of `async-pool` fails to build. ghcVersions = map (v: "ghc${v}") [ "810" "90" "92" "94" "96" ]; - defaultGhcVersion = "ghc94"; + defaultGhcVersion = "ghc96"; } diff --git a/flake.lock b/flake.lock index bcccd6b..41bffda 100644 --- a/flake.lock +++ b/flake.lock @@ -2,17 +2,17 @@ "nodes": { "devshell": { "inputs": { + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" - ], - "systems": "systems" + ] }, "locked": { - "lastModified": 1701787589, - "narHash": "sha256-ce+oQR4Zq9VOsLoh9bZT8Ip9PaMLcjjBUHVPzW5d7Cw=", + "lastModified": 1711099426, + "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", "owner": "numtide", "repo": "devshell", - "rev": "44ddedcbcfc2d52a76b64fb6122f209881bd3e1e", + "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", "type": "github" }, "original": { @@ -39,7 +39,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1701680307, @@ -55,13 +55,31 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1702938738, - "narHash": "sha256-O7Vb0xC9s4Dmgxj8APEpuuMj7HsLgPbpy1UKvNVJp7o=", + "lastModified": 1711231723, + "narHash": "sha256-dARJQ8AJOv6U+sdRePkbcVyVbXJTi1tReCrkkOeusiA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd8e82f3b4017b8faa52c2b1897a38d53c3c26cb", + "rev": "e1d501922fd7351da4200e1275dfcf5faaad1220", "type": "github" }, "original": { @@ -92,7 +110,7 @@ "inputs": { "devshell": "devshell", "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs", "plist-source": "plist-source" } diff --git a/stack.yaml b/stack.yaml index 47f141b..451f2a2 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,9 +1,8 @@ -# GHC 9.4.8 +# GHC 9.6.4 # Keep in sync with `defaultGhcVersion` in `./constants.nix`. -resolver: lts-21.25 +resolver: lts-22.13 extra-deps: -- async-pool-0.9.2 - base-noprelude-4.13.0.0 - patience-0.3 # Use fork of plist package that supports MonadFail diff --git a/stack.yaml.lock b/stack.yaml.lock index d0558ad..a59ec63 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -4,13 +4,6 @@ # https://docs.haskellstack.org/en/stable/lock_files packages: -- completed: - hackage: async-pool-0.9.2@sha256:532b356a3a2d3e6ec848ca266b566f8cf60c52a107f4b2c7e690cdd2b1ae67b2,1605 - pantry-tree: - sha256: 292aaab710c67c190ef87703f7a300a3cad71ee71d2cdf2a9e89d242e866d174 - size: 443 - original: - hackage: async-pool-0.9.2 - completed: hackage: base-noprelude-4.13.0.0@sha256:3cccbfda38e1422ca5cc436d58858ba51ff9114d2ed87915a6569be11e4e5a90,6842 pantry-tree: @@ -38,7 +31,7 @@ packages: url: https://github.com/malob/plist/archive/5e22be0933bf9a100868b944fa7a8b1236b99255.tar.gz snapshots: - completed: - sha256: 2fc12a405ab6f7eac73eb11a0ca5ccca0e956bd2848db780c140b7406ff9ebb5 - size: 640035 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/9.yaml - original: lts-21.9 + sha256: 6f0bea3ba5b07360f25bc886e8cff8d847767557a492a6f7f6dcb06e3cc79ee9 + size: 712905 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/13.yaml + original: lts-22.13