From c61597ea4f3b0063143dd55d382cf8c4d578d197 Mon Sep 17 00:00:00 2001
From: Florian Agbuya <fa@m-labs.ph>
Date: Fri, 1 Mar 2024 18:09:53 +0800
Subject: [PATCH] fix qemu build errors

---
 flake.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index d4a7c45..4536f73 100644
--- a/flake.nix
+++ b/flake.nix
@@ -251,13 +251,16 @@
         hardeningDisable = [ "fortify" ];
       };
 
-      # Pinned qemu version due to networking errors in recent version 8.2.0
+      # Overriding qemu since the current linux kernel package upstream is breaking
       qemu = pkgs.qemu.overrideAttrs (oldAttrs: rec {
-        version = "8.1.3";
+        version = "8.2.1";
         src = pkgs.fetchurl {
           url = "https://download.qemu.org/qemu-${version}.tar.xz";
-          hash = "sha256-Q8wXaAQQVYb3T5A5jzTp+FeH3/QA07ZA2B93efviZbs=";
+          hash = "sha256-hWJ1EVgXX50YfF8itXVVq+PIcPAyXIztEsNMbZh3Kb4=";
         };
+        # This patch was already removed upstream. Need to manually remove here to avoid errors.
+        # https://github.com/NixOS/nixpkgs/commit/d422836d725cf3aa70204036b4634dbc6fc3f678?diff=unified&w=0
+        patches = builtins.filter (x: (x.name or "") != "9d5b42beb6978dc6219d5dc029c9d453c6b8d503.diff") oldAttrs.patches;
       });
 
       board-package-set = { board }: let