From 839f51a6a2f298af474e7d0ddf2d553344718454 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Wed, 24 May 2023 05:52:17 +0000
Subject: [PATCH] hare: pull patches from upstream PR

---
 nixpatches/list.nix | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index e64b528a..29f3b819 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -130,16 +130,23 @@ in [
   #   hash = "sha256-3QmV7ihPBEdLDGfJQBN+J/A3DpzpGFjzggsXLbr3hOE=";
   # })
 
-  (fetchpatch' {
-    # hare: unstable-2023-03-15 -> unstable-2023-04-23
-    saneCommit = "cdea9097fd6afb43751e42f1cd1b50e2bffb4d58";
-    hash = "sha256-33LoktURM81bLsfY3v+SHL30Qju9GyOMCXVbsGrgOjU=";
-  })
+  # (fetchpatch' {
+  #   # hare: unstable-2023-03-15 -> unstable-2023-04-23
+  #   saneCommit = "cdea9097fd6afb43751e42f1cd1b50e2bffb4d58";
+  #   hash = "sha256-33LoktURM81bLsfY3v+SHL30Qju9GyOMCXVbsGrgOjU=";
+  # })
+
+  # (fetchpatch' {
+  #   # harec: unstable-2023-02-18 -> unstable-2023-04-25
+  #   saneCommit = "5595e88de982474ba6cc9c4d7f4a7a246edb4980";
+  #   hash = "sha256-kKhygKpf3QqQR0kSxutKwZXbNcsSTp/z165h88J8/+g=";
+  # })
 
   (fetchpatch' {
-    # harec: unstable-2023-02-18 -> unstable-2023-04-25
-    saneCommit = "5595e88de982474ba6cc9c4d7f4a7a246edb4980";
-    hash = "sha256-kKhygKpf3QqQR0kSxutKwZXbNcsSTp/z165h88J8/+g=";
+    # hare: unstable-2023-03-15 -> unstable-2023-04-23
+    # + harec: unstable-2023-02-18 -> unstable-2023-04-25
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/233732";
+    hash = "sha256-SGDKvsMiK3Pq57JEj/MamDBX5jBXwV/E5jclKO2NAUs=";
   })
 
   # for raspberry pi: allow building u-boot for rpi 4{,00}