From 9bcd652f4f170109fbda558d7cc883f14afbab12 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Tue, 13 Jul 2021 08:55:20 -0700
Subject: [PATCH] Update nixpkgs

---
 flake.lock      | 19 ++++++++++---------
 flake.nix       |  4 ++--
 prefmanager.nix | 23 -----------------------
 3 files changed, 12 insertions(+), 34 deletions(-)
 delete mode 100644 prefmanager.nix

diff --git a/flake.lock b/flake.lock
index fbac72a..0ab7b75 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "devshell": {
       "locked": {
-        "lastModified": 1616093728,
-        "narHash": "sha256-5A3CABXiKPIzU4uETKStQvBtAoZNL1H1B/LAOk4FguU=",
+        "lastModified": 1625086391,
+        "narHash": "sha256-IpNPv1v8s4L3CoxhwcgZIitGpcrnNgnj09X7TA0QV3k=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "3663a7dffb94b412cee4cc0c9644fe5f95911101",
+        "rev": "4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7",
         "type": "github"
       },
       "original": {
@@ -33,11 +33,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1614513358,
-        "narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=",
+        "lastModified": 1623875721,
+        "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5466c5bbece17adaab2d82fae80b46e807611bf3",
+        "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
         "type": "github"
       },
       "original": {
@@ -48,15 +48,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1616542367,
-        "narHash": "sha256-ZAcaaNOzsUZs57B+bYFmrPiOgeyfRSPc+2oWqohNQgU=",
+        "lastModified": 1626087906,
+        "narHash": "sha256-n6jPX5j5yEsM5GGnMOmD2syZnoYfVONW/LztPsKu5Uc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "73bb976ba5c474c70f0c73e2f3a26f973bf11a9a",
+        "rev": "eaff114326e814083bcb208caa97eab1fbedd79b",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 313b6c4..ac67a5a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Tool for working with macOS defaults.";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     devshell.url = "github:numtide/devshell/";
     flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
     flake-utils.url = "github:numtide/flake-utils";
@@ -15,7 +15,7 @@
       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; };
+      prefmanager = compiler.callCabal2nix "prefmanager" ./. { inherit plist; };
       mkShell = devshell.legacyPackages.${system}.mkShell;
     in rec {
       # Built by `nix build .`
diff --git a/prefmanager.nix b/prefmanager.nix
deleted file mode 100644
index c68dfa9..0000000
--- a/prefmanager.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, ansi-terminal, async, base-noprelude, containers
-, hpack, hxt, lib, optparse-applicative, patience, plist
-, prettyprinter, prettyprinter-ansi-terminal, relude, text
-, typed-process
-}:
-mkDerivation {
-  pname = "prefmanager";
-  version = "0.1.0.0";
-  src = ./.;
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    ansi-terminal async base-noprelude containers hxt patience plist
-    prettyprinter prettyprinter-ansi-terminal relude text typed-process
-  ];
-  libraryToolDepends = [ hpack ];
-  executableHaskellDepends = [ base-noprelude optparse-applicative ];
-  testHaskellDepends = [ base-noprelude ];
-  prePatch = "hpack";
-  homepage = "https://github.com/malob/prefmanager#readme";
-  description = "A CLI utility for managing macOS preferences";
-  license = lib.licenses.bsd3;
-}