From ebd055ab11539a26bc703616bb72d519f46db9fa Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Mon, 4 Oct 2021 12:56:24 -0700
Subject: [PATCH] Update inputs, and move to GHC 8.10.7

---
 flake.lock      | 24 ++++++++++++------------
 flake.nix       |  2 +-
 hie.yaml        |  3 ---
 stack.nix       |  2 +-
 stack.yaml      |  4 ++--
 stack.yaml.lock |  8 ++++----
 6 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0ab7b75..088ad30 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "devshell": {
       "locked": {
-        "lastModified": 1625086391,
-        "narHash": "sha256-IpNPv1v8s4L3CoxhwcgZIitGpcrnNgnj09X7TA0QV3k=",
+        "lastModified": 1632436039,
+        "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7",
+        "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6",
         "type": "github"
       },
       "original": {
@@ -18,11 +18,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1606424373,
-        "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=",
+        "lastModified": 1627913399,
+        "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf",
+        "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
         "type": "github"
       },
       "original": {
@@ -33,11 +33,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1623875721,
-        "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
+        "lastModified": 1631561581,
+        "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
+        "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
         "type": "github"
       },
       "original": {
@@ -48,11 +48,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1626087906,
-        "narHash": "sha256-n6jPX5j5yEsM5GGnMOmD2syZnoYfVONW/LztPsKu5Uc=",
+        "lastModified": 1633329294,
+        "narHash": "sha256-0LpQLS4KMgxslMgmDHmxG/5twFlXDBW9z4Or1iOrCvU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "eaff114326e814083bcb208caa97eab1fbedd79b",
+        "rev": "ee084c02040e864eeeb4cf4f8538d92f7c675671",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index ac67a5a..59c454a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,7 +12,7 @@
   outputs = { self, devshell, nixpkgs, flake-utils, plist-source, ... }:
     flake-utils.lib.eachSystem [ "x86_64-darwin" ] (system: let
       pkgs = nixpkgs.legacyPackages.${system};
-      compiler =  pkgs.haskell.packages.ghc8104;
+      compiler =  pkgs.haskell.packages.ghc8107;
       hlib = pkgs.haskell.lib;
       plist = hlib.markUnbroken (hlib.overrideSrc compiler.plist { src = plist-source; });
       prefmanager = compiler.callCabal2nix "prefmanager" ./. { inherit plist; };
diff --git a/hie.yaml b/hie.yaml
index 0fa8f4d..f01f210 100644
--- a/hie.yaml
+++ b/hie.yaml
@@ -11,6 +11,3 @@ cradle:
 
     - path: "./test"
       component: "prefmanager:test:prefmanager-test"
-
-    - path: "./property-list-0.1.0.5/src"
-      component: "property-list:lib"
diff --git a/stack.nix b/stack.nix
index b435c35..c976e75 100644
--- a/stack.nix
+++ b/stack.nix
@@ -1,5 +1,5 @@
 with import (import ./default.nix).inputs.nixpkgs {};
 haskell.lib.buildStackProject {
-  ghc = haskell.compiler.ghc8104;
+  ghc = haskell.compiler.ghc8107;
   name = "prefmanager";
 }
diff --git a/stack.yaml b/stack.yaml
index 8852b62..8c03abd 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,5 +1,5 @@
-# GHC 8.10.4
-resolver: lts-17.7
+# GHC 8.10.7
+resolver: lts-18.12
 
 packages:
 - .
diff --git a/stack.yaml.lock b/stack.yaml.lock
index 08abb83..70ba7a4 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:
-    size: 565715
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/7.yaml
-    sha256: 1b5e4124989399e60e7a7901f0cefd910beea546131fb07a13a7208c4cc8b7ee
-  original: lts-17.7
+    size: 586041
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/12.yaml
+    sha256: 80fc6391195ff00c36f2a605ecbb07de909bfaa2eaa9722a27e486a6ecf8ecb0
+  original: lts-18.12