Bump: Use the nixpkgs/nixos-unstable again

flake.nix

@@ -26,8 +26,8 @@
 
   inputs = {
     #TODO: clean this up before merging to main
-    nixpkgs.url = "github:tiiuae/nixpkgs/nixos-unstable-patched-2";
-    #nixpkgs.url = "flake:mylocalnixpkgs"; #"github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:tiiuae/nixpkgs/patched-unstable-proc-qemu"; #"flake:mylocalnixpkgs"; #
+    #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     #
     # Flake and repo structuring configurations
@@ -52,7 +52,6 @@
       inputs = {
         nixpkgs.follows = "nixpkgs";
         nixpkgs-stable.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
         flake-compat.follows = "flake-compat";
       };
     };
@@ -108,8 +107,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    #https://github.com/nix-community/disko/commit/6c37763eb80c2b788bae0c0806255954451c1d00
+    #breaks image creation
     disko = {
-      url = "github:nix-community/disko/master";
+      url = "github:nix-community/disko/601be8412d2ab72f752448766fe0fb2f00d5c40c";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

modules/jetpack/nvidia-jetson-orin/virtualization/host/bpmp-virt-host/default.nix

@@ -44,7 +44,7 @@ in {
 
     # TODO: Consider are these really needed, maybe add only in debug builds?
     environment.systemPackages = with pkgs; [
-      qemu
+      qemu_kvm
       dtc
     ];
   };

modules/jetpack/nvidia-jetson-orin/virtualization/host/bpmp-virt-host/overlays/qemu/default.nix

@@ -1,7 +1,7 @@
 # Copyright 2022-2023 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 (_final: prev: {
-  qemu = prev.qemu.overrideAttrs (_final: prev: {
+  qemu_kvm = prev.qemu_kvm.overrideAttrs (_final: prev: {
     patches =
       prev.patches
       ++ [

overlays/README.md

@@ -31,16 +31,17 @@ It makes things clear and robust.
 
 Some patches are carried as overlays and others are patches that are cherry-picked
 from staging and main into a tiiuae maintained version of nixpkgs 
-[tiiuae/nixpkgs/nixos-unstable-patched](https://github.com/tiiuae/nixpkgs/tree/nixos-unstable-patched)
+[tiiuae/nixpkgs/patched-unstable-proc-qemu](https://github.com/tiiuae/nixpkgs/tree/patched-unstable-proc-qemu)
 
 The status of the integration in nixpkgs can be tracked using the [Pull Request Tracker](https://nixpk.gs/pr-tracker.html)
 
 ## From Overlays
 
-[sysbench and libck xcompile](https://github.com/NixOS/nixpkgs/pull/309564)
-[EDK2](https://github.com/NixOS/nixpkgs/pull/311317)
 
-## tiiuae/nixpkgs/nixos-unstable-patched
+## carried in tiiuae/nixpkgs/nixos-unstable-proc-qemu
 
-[rutabaga_gfx - Qemu](https://github.com/NixOS/nixpkgs/pull/310783)
-[Element Desktop and Python3](https://github.com/NixOS/nixpkgs/pull/308196)
+[webp-pixbuf-loader](https://github.com/NixOS/nixpkgs/pull/315119)
+
+[Qemu xcompile](https://github.com/NixOS/nixpkgs/pull/314270)
+
+[XDG-utils procmail](https://github.com/NixOS/nixpkgs/pull/314270)

overlays/cross-compilation/default.nix

@@ -3,11 +3,5 @@
 #
 # This overlay is for specific fixes needed only to enable cross-compilation.
 #
-(final: prev: {
-  chromium = import ./chromium {inherit prev final;};
-  edk2 = import ./edk2 {inherit final prev;};
-  jbig2dec = import ./jbig2dec {inherit prev;};
-  pipewire = import ./pipewire {inherit prev;};
-
-  qemu = import ./qemu {inherit prev;};
+(_final: _prev: {
 })