From 678ce46f3d3da6e76dd2bb71dfe897da9af70a34 Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige@mcwhirter.io>
Date: Wed, 22 Dec 2021 17:10:39 +1000
Subject: [PATCH 1/4] hakyll: upgraded to v4.15

---
 mcwhirter-io.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mcwhirter-io.cabal b/mcwhirter-io.cabal
index ae31663..0d861a5 100644
--- a/mcwhirter-io.cabal
+++ b/mcwhirter-io.cabal
@@ -6,7 +6,7 @@ cabal-version:      >= 1.10
 executable site
   main-is:          site.hs
   build-depends:    base == 4.*
-                  , hakyll == 4.14.*
+                  , hakyll == 4.15.*
                   , pandoc
   ghc-options:      -threaded
   default-language: Haskell2010

From 59c40ccada73dcd9ec7c46ac1a8b61a6361139aa Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige@mcwhirter.io>
Date: Wed, 22 Dec 2021 18:04:56 +1000
Subject: [PATCH 2/4] nix: bump to HEAD of 21.11

---
 nix/sources.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nix/sources.json b/nix/sources.json
index b0b9f35..da87e8a 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -12,15 +12,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixpkgs-unstable",
+        "branch": "nixos-21.11",
         "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
-        "repo": "nixpkgs-channels",
-        "rev": "10100a97c8964e82b30f180fda41ade8e6f69e41",
-        "sha256": "011f36kr3c1ria7rag7px26bh73d1b0xpqadd149bysf4hg17rln",
+        "repo": "nixpkgs",
+        "rev": "9ab7d12287ced0e1b4c03b61c781901f178d9d77",
+        "sha256": "0bbd2pgcyavqn5wgq0xp8p67lha0kv9iqnh49i9w5fb5g29q7i30",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs-channels/archive/10100a97c8964e82b30f180fda41ade8e6f69e41.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/9ab7d12287ced0e1b4c03b61c781901f178d9d77.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

From 882780e00be6a4a28407bd85cf7e08d39caf7a3d Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige@mcwhirter.io>
Date: Wed, 22 Dec 2021 18:12:50 +1000
Subject: [PATCH 3/4] Added direnv support

---
 .envrc | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .envrc

diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..18f695a
--- /dev/null
+++ b/.envrc
@@ -0,0 +1,2 @@
+use nix
+watch_file nix/*

From 498ec28b26e3bbcef92ea4780620a0d8a2526d06 Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige@mcwhirter.io>
Date: Wed, 22 Dec 2021 18:13:48 +1000
Subject: [PATCH 4/4] ghc: Upgraded to 8.10.7

---
 release.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/release.nix b/release.nix
index 78c4ce9..e3c6ac0 100644
--- a/release.nix
+++ b/release.nix
@@ -1,5 +1,5 @@
 let sources = import ./nix/sources.nix;
-in { compiler ? "ghc883", pkgs ? import sources.nixpkgs { } }:
+in { compiler ? "ghc8107", pkgs ? import sources.nixpkgs { } }:
 
 let
   inherit (pkgs.lib.trivial) flip pipe;
@@ -24,14 +24,12 @@ in {
 
   shell = haskellPackages.shellFor {
     packages = p: with p; [ project ];
-    #buildInputs = with haskellPackages; [
-    #  ghcid
-    #  hlint       # or ormolu
-    #  niv
-    #  pkgs.cacert # needed for niv
-    #  pkgs.nix    # needed for niv
-    #  zlib
-    #];
+    buildInputs = with haskellPackages; [
+      ghcid
+      hlint # or ormolu
+      pkgs.niv
+      zlib
+    ];
     withHoogle = true;
   };
 }