From c0a85ae07069f82006f33c2f12ae718f39c3d698 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 6 May 2023 18:04:31 -0400
Subject: [PATCH 1/2] overlay: Drop ubootTools patch

Upstream removed that option entirely.
---
 overlay/overlay.nix                           |  3 --
 ...k-around-ubootTools-cross-compilatio.patch | 30 -------------------
 2 files changed, 33 deletions(-)
 delete mode 100644 overlay/u-boot/0001-mobile-nixos-work-around-ubootTools-cross-compilatio.patch

diff --git a/overlay/overlay.nix b/overlay/overlay.nix
index fc076c03..aa8f0e08 100644
--- a/overlay/overlay.nix
+++ b/overlay/overlay.nix
@@ -109,9 +109,6 @@ in
       buildInputs = buildInputs ++ [
         self.openssl
       ];
-      patches = patches ++ [
-        ./u-boot/0001-mobile-nixos-work-around-ubootTools-cross-compilatio.patch
-      ];
     });
 
 
diff --git a/overlay/u-boot/0001-mobile-nixos-work-around-ubootTools-cross-compilatio.patch b/overlay/u-boot/0001-mobile-nixos-work-around-ubootTools-cross-compilatio.patch
deleted file mode 100644
index 3bc70240..00000000
--- a/overlay/u-boot/0001-mobile-nixos-work-around-ubootTools-cross-compilatio.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ab87ea4ce5d34b82a7fd539a57f99459ca2ea99e Mon Sep 17 00:00:00 2001
-From: Samuel Dionne-Riel <samuel@dionne-riel.com>
-Date: Thu, 11 Feb 2021 17:18:05 -0500
-Subject: [PATCH] [mobile-nixos]: work around ubootTools cross-compilation
- issue
-
-The BMP tool gets compiled for the target system, as others tools do. In
-turn, this tool cannot be ran on the system doing the build.
-
-Forcing CONFIG_*_LOGO to values fails because it has been hardcoded to
-=y here.
----
- tools/Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tools/Makefile b/tools/Makefile
-index 2d550432ba..135fbd3863 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -6,7 +6,6 @@
- # Enable all the config-independent tools
- ifneq ($(HOST_TOOLS_ALL),)
- CONFIG_ARCH_KIRKWOOD = y
--CONFIG_LCD_LOGO = y
- CONFIG_CMD_LOADS = y
- CONFIG_CMD_NET = y
- CONFIG_XWAY_SWAP_BYTES = y
--- 
-2.29.2
-

From b5d3bbfd4b5a1cb4fe0cc8e158d8c0390102bc4a Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 6 May 2023 18:04:52 -0400
Subject: [PATCH 2/2] pkgs.nix: Bump to current nixos-unstable

---
 pkgs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs.nix b/pkgs.nix
index aed06eac..a6477306 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,6 +1,6 @@
 let
-  sha256 = "sha256:1fhv0lfj7khfr0fvwbpay3vq3v7br86qq01yyl0qxls8nsq08y0c";
-  rev = "872fceeed60ae6b7766cc0a4cd5bf5901b9098ec";
+  sha256 = "sha256:1qm1ffipjsqrd2f3y1x8n8d9afc659plaxp131wh3ixvnmvqxiy6";
+  rev = "3e313808bd2e0a0669430787fb22e43b2f4bf8bf";
 in
 builtins.trace "(Using pinned Nixpkgs at ${rev})"
 import (fetchTarball {