From bda3ea9b1963daa56bba698f61b957c131e7a260 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Tue, 23 Mar 2021 17:37:59 -0700
Subject: [PATCH] Update to GHC 8.10.4

---
 flake.lock      | 18 +++++++++---------
 flake.nix       |  2 +-
 hie.yaml        |  3 +++
 prefmanager.nix |  7 ++++---
 stack.nix       |  2 +-
 stack.yaml      |  5 +++--
 stack.yaml.lock |  8 ++++----
 7 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3063a83..fbac72a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "devshell": {
       "locked": {
-        "lastModified": 1611223133,
-        "narHash": "sha256-oRipYhMDsu2bUMHXBN5Q06nZhKSYqux0SsBcq+iKyYc=",
+        "lastModified": 1616093728,
+        "narHash": "sha256-5A3CABXiKPIzU4uETKStQvBtAoZNL1H1B/LAOk4FguU=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "4d217ab9f63da23bc43351c68c2d7dc4fb5d1077",
+        "rev": "3663a7dffb94b412cee4cc0c9644fe5f95911101",
         "type": "github"
       },
       "original": {
@@ -33,11 +33,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1610051610,
-        "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
+        "lastModified": 1614513358,
+        "narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc",
+        "rev": "5466c5bbece17adaab2d82fae80b46e807611bf3",
         "type": "github"
       },
       "original": {
@@ -48,11 +48,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1610575970,
-        "narHash": "sha256-cchAnKyFNOXt685FhephDAz1cjule36OOEizB2hAKHw=",
+        "lastModified": 1616542367,
+        "narHash": "sha256-ZAcaaNOzsUZs57B+bYFmrPiOgeyfRSPc+2oWqohNQgU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6e83386e825857ec11b786cb58425a5d57ad2716",
+        "rev": "73bb976ba5c474c70f0c73e2f3a26f973bf11a9a",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 2d6662c..313b6c4 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.ghc8103;
+      compiler =  pkgs.haskell.packages.ghc8104;
       hlib = pkgs.haskell.lib;
       plist = hlib.markUnbroken (hlib.overrideSrc compiler.plist { src = plist-source; });
       prefmanager = compiler.callPackage ./prefmanager.nix { inherit plist; };
diff --git a/hie.yaml b/hie.yaml
index f01f210..0fa8f4d 100644
--- a/hie.yaml
+++ b/hie.yaml
@@ -11,3 +11,6 @@ cradle:
 
     - path: "./test"
       component: "prefmanager:test:prefmanager-test"
+
+    - path: "./property-list-0.1.0.5/src"
+      component: "property-list:lib"
diff --git a/prefmanager.nix b/prefmanager.nix
index ada4732..c68dfa9 100644
--- a/prefmanager.nix
+++ b/prefmanager.nix
@@ -1,6 +1,7 @@
 { mkDerivation, ansi-terminal, async, base-noprelude, containers
-, hpack, hxt, optparse-applicative, patience, plist, prettyprinter
-, prettyprinter-ansi-terminal, relude, stdenv, text, typed-process
+, hpack, hxt, lib, optparse-applicative, patience, plist
+, prettyprinter, prettyprinter-ansi-terminal, relude, text
+, typed-process
 }:
 mkDerivation {
   pname = "prefmanager";
@@ -18,5 +19,5 @@ mkDerivation {
   prePatch = "hpack";
   homepage = "https://github.com/malob/prefmanager#readme";
   description = "A CLI utility for managing macOS preferences";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/stack.nix b/stack.nix
index 79e0b67..b435c35 100644
--- a/stack.nix
+++ b/stack.nix
@@ -1,5 +1,5 @@
 with import (import ./default.nix).inputs.nixpkgs {};
 haskell.lib.buildStackProject {
-  ghc = haskell.compiler.ghc8103;
+  ghc = haskell.compiler.ghc8104;
   name = "prefmanager";
 }
diff --git a/stack.yaml b/stack.yaml
index 85b003d..8852b62 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,5 +1,5 @@
-# GHC 8.10.3
-resolver: nightly-2021-01-20
+# GHC 8.10.4
+resolver: lts-17.7
 
 packages:
 - .
@@ -14,4 +14,5 @@ extra-deps:
 allow-newer: true
 
 nix:
+  pure: true
   shell-file: ./stack.nix
diff --git a/stack.yaml.lock b/stack.yaml.lock
index d3176ce..08abb83 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: 563098
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2021/1/20.yaml
-    sha256: 97841a28b47a29e798aefda350785c31823f64f31c43ba057fc6c707dfb7ead3
-  original: nightly-2021-01-20
+    size: 565715
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/7.yaml
+    sha256: 1b5e4124989399e60e7a7901f0cefd910beea546131fb07a13a7208c4cc8b7ee
+  original: lts-17.7