From a4ae768dcae322915291cf872f6ea7a45b74be52 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Fri, 25 Oct 2024 16:26:57 +1100
Subject: [PATCH] Nix updates

---
 flake.lock | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index dd497f9117e..439ccc1a7d9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "CHaP": {
       "flake": false,
       "locked": {
-        "lastModified": 1728953092,
-        "narHash": "sha256-DBqT9uexf/yoZjtEP3263ltnhP/o7iBl8IZdJRfPjJs=",
+        "lastModified": 1729560667,
+        "narHash": "sha256-tHDAxN8erb23MIy7zH6VV6mCspKBstj2R1LkeBgZt28=",
         "owner": "IntersectMBO",
         "repo": "cardano-haskell-packages",
-        "rev": "fd5e5cf056090977ecbd661ad07f602eb7e2614d",
+        "rev": "7f24768c3a2f42a15fef889d5b415100d8082c16",
         "type": "github"
       },
       "original": {
@@ -279,11 +279,19 @@
     "hackage": {
       "flake": false,
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1729124899,
         "narHash": "sha256-cmb4iMcgk5+jUGMiZGNMzPCAnG17Kz9J6WIitYM17Fc=",
         "owner": "input-output-hk",
         "repo": "hackage.nix",
         "rev": "138edf81c8bcc4209e9706966f7feece70c37a96",
+=======
+        "lastModified": 1729556864,
+        "narHash": "sha256-HUuom+pjfNL2o8WOTPjwQDV4UHjDFHTLbax7fNkTHTc=",
+        "owner": "input-output-hk",
+        "repo": "hackage.nix",
+        "rev": "03e4b088b36dc78ae1fba649b5b55e52916531e7",
+>>>>>>> 899e6312b0 (Nix updates)
         "type": "github"
       },
       "original": {