From 294646ea80d7df80c3c3cf5207602d4b7a6236b8 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Tue, 30 May 2023 10:23:20 -0700
Subject: [PATCH] Update to GHC 9.2.7

---
 flake.lock      | 57 ++++++++++++++++++++++++++++++++++++++-----------
 flake.nix       |  3 +--
 stack.nix       |  2 +-
 stack.yaml      |  4 ++--
 stack.yaml.lock |  8 +++----
 5 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3ac2fc5..2eb33d2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,19 +2,17 @@
   "nodes": {
     "devshell": {
       "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1677439153,
-        "narHash": "sha256-MB+q1TN3KKwYBm0hrPHtWo3iy6jg6AQi7u9mMiUDtrs=",
+        "lastModified": 1683635384,
+        "narHash": "sha256-9goJTd05yOyD/McaMqZ4BUB8JW+mZMnZQJZ7VQ6C/Lw=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "ace1138005c355c84806bbc66f3b7e6a31ecde52",
+        "rev": "5143ea68647c4cf5227e4ad2100db6671fc4c369",
         "type": "github"
       },
       "original": {
@@ -40,12 +38,15 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
       "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -56,11 +57,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1677383253,
-        "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=",
+        "lastModified": 1685399834,
+        "narHash": "sha256-Lt7//5snriXSdJo5hlVcDkpERL1piiih0UXIz1RUcC4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9952d6bc395f5841262b006fbace8dd7e143b634",
+        "rev": "58c85835512b0db938600b6fe13cc3e3dc4b364e",
         "type": "github"
       },
       "original": {
@@ -95,6 +96,36 @@
         "nixpkgs": "nixpkgs",
         "plist-source": "plist-source"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 1e59c2a..6dce64c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,6 @@
     flake-utils.url = "github:numtide/flake-utils";
     plist-source = { url = "github:malob/plist/monadfail"; flake = false; };
     devshell.inputs.nixpkgs.follows = "nixpkgs";
-    devshell.inputs.flake-utils.follows = "flake-utils";
   };
 
   outputs = { self, devshell, nixpkgs, flake-utils, plist-source, ... }: {
@@ -18,7 +17,7 @@
   } // flake-utils.lib.eachSystem [ "x86_64-darwin" "aarch64-darwin" ] (system:
     let
       pkgs = nixpkgs.legacyPackages.${system};
-      compiler = pkgs.haskell.packages.ghc926;
+      compiler = pkgs.haskell.packages.ghc927;
       hlib = pkgs.haskell.lib;
       plist = hlib.markUnbroken (hlib.overrideSrc compiler.plist { src = plist-source; });
       prefmanager = compiler.callCabal2nix "prefmanager" ./. { inherit plist; };
diff --git a/stack.nix b/stack.nix
index 1bc2259..a0423f9 100644
--- a/stack.nix
+++ b/stack.nix
@@ -1,5 +1,5 @@
 with import (import ./default.nix).inputs.nixpkgs {};
 haskell.lib.buildStackProject {
-  ghc = haskell.compiler.ghc926;
+  ghc = haskell.compiler.ghc927;
   name = "prefmanager";
 }
diff --git a/stack.yaml b/stack.yaml
index e67f65e..ef0bb86 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,5 +1,5 @@
-# GHC 9.2.6
-resolver: lts-20.12
+# GHC 9.2.7
+resolver: lts-20.23
 
 extra-deps:
 - patience-0.3
diff --git a/stack.yaml.lock b/stack.yaml.lock
index 7870559..ba76643 100644
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -31,7 +31,7 @@ packages:
     url: https://github.com/malob/plist/archive/5e22be0933bf9a100868b944fa7a8b1236b99255.tar.gz
 snapshots:
 - completed:
-    sha256: af5d667f6096e535b9c725a72cffe0f6c060e0568d9f9eeda04caee70d0d9d2d
-    size: 649133
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/12.yaml
-  original: lts-20.12
+    sha256: 4c972e067bae16b95961dbfdd12e07f1ee6c8fffabbfa05c3d65100b03f548b7
+    size: 650253
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/23.yaml
+  original: lts-20.23