From edbbedb5f09551c1fba2be12dbb55f115041a950 Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Sun, 7 Jan 2024 21:24:47 +0900
Subject: [PATCH 1/2] Bump nixpkgs-unstable and default compiler in Nix to
 ghc94

---
 .nix-helpers/overlays.nix | 2 +-
 flake.lock                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.nix-helpers/overlays.nix b/.nix-helpers/overlays.nix
index fb9e574..03e965e 100644
--- a/.nix-helpers/overlays.nix
+++ b/.nix-helpers/overlays.nix
@@ -78,7 +78,7 @@ let
     #
     # Either this, or termonadKnownWorkingHaskellPkgSet can be changed in an overlay
     # if you want to use a different GHC to build Termonad.
-    termonadCompilerVersion = "ghc92";
+    termonadCompilerVersion = "ghc94";
 
     # A Haskell package set where we know the GHC version works to compile
     # Termonad.  This is basically just a shortcut so that other Nix files
diff --git a/flake.lock b/flake.lock
index d2cc422..0fd7eb1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1680213900,
-        "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
+        "lastModified": 1704194953,
+        "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
+        "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6",
         "type": "github"
       },
       "original": {

From abfc28ce874233f756f12ec4849ec6f7360dbcac Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Sun, 7 Jan 2024 21:27:21 +0900
Subject: [PATCH 2/2] Rename pkgconfig to pkg-config

---
 .nix-helpers/nixos-vm.nix           | 2 +-
 .nix-helpers/simple-cabal-shell.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.nix-helpers/nixos-vm.nix b/.nix-helpers/nixos-vm.nix
index 6700331..567ebe3 100644
--- a/.nix-helpers/nixos-vm.nix
+++ b/.nix-helpers/nixos-vm.nix
@@ -37,7 +37,7 @@
     jq
     ltrace
     nix-bash-completions
-    pkgconfig
+    pkg-config
     psmisc
     screen
     strace
diff --git a/.nix-helpers/simple-cabal-shell.nix b/.nix-helpers/simple-cabal-shell.nix
index e3c07da..7e3f040 100644
--- a/.nix-helpers/simple-cabal-shell.nix
+++ b/.nix-helpers/simple-cabal-shell.nix
@@ -102,8 +102,8 @@ pkgs.mkShell {
     ghc-real
     cabal-install-real
 
-    # pkgconfig for linking pkgconfig deps
-    pkgs.pkgconfig
+    # pkg-config for linking pkg-config deps
+    pkgs.pkg-config
 
     # Required system libraries
     pkgs.gobject-introspection