wtf

packages/raspberrypi/linux-rpi/default.nix

@@ -14,9 +14,26 @@ let
   tag = "stable_20250916";
   hash = "sha256-HG8Oc04V2t54l0SOn4gKmNJWQUrZfjWusgKcWvx74H0==";
   # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
-  #  modDirVersion = "6.18.1";
-  #  tag = "unstable_20251226";
-  #  hash = "sha256-VYrXqwK9P2nWkm3DhOU8qaXzWv5L0DUoJ2MBRF6PoEE=";
+
+  # all of these fail for various reasons
+  
+  # tag = "unstable_20260116";
+
+  # modDirVersion = "6.15.11";
+  # hash = "sha256-25g+LkVJMixVwUf+MRoIvLkVj31sFGAK9+i3OEFkFc0=";
+  # rev = "b07d612aae961e99fdb0b828ce6d54c183d1833d";
+
+  # modDirVersion = "6.17.12";
+  # hash = "sha256-JcjRy1FbOPWqqxKe/BjzMJBStA7rjK4+pS8kqL9GZBg=";
+  # rev = "682dc10883eefbcbc4a5ec661b231a638192b98f";
+
+  # modDirVersion = "6.18.4";
+  # hash = "sha256-T3RJRroYtzLwx4JqcaX15Ka1uVf72jQOZMf7TJVZ6co=";
+  # rev = "bb594fb36f555f9b88b7b6fcf8b71c669c1d60c7";
+
+  # modDirVersion = "6.19.0-rc5";
+  # hash = "sha256-C81aKv+pQYNx6Bj3PL0vrxvBzrLB99+95YeIBm+4kt0=";
+  # rev = "12e23f26704f66c154de58f80222960f02885570";
 in
 lib.overrideDerivation
   (buildLinux (
@@ -29,7 +46,6 @@ lib.overrideDerivation
       src = fetchFromGitHub {
         owner = "raspberrypi";
         repo = "linux";
-        #rev = "0176325914cab516b73a5f1456fcd5f98c4764ab";
         inherit tag hash;
       };
 

packages/raspberrypi/uefi-rpi5/default.nix

@@ -68,12 +68,14 @@ stdenvNoCC.mkDerivation rec {
     runHook preInstall
     mkdir -p "$out"
 
-    cp ${src} .
+    # cp ${src} .
 
-    dd if=${nvram} of=./RPI_EFI.fd \
-     bs=1 seek=$((0x1d0060)) count=$((0x11c0)) conv=notrunc
+    # dd if=${nvram} of=./RPI_EFI.fd \
+    #  bs=1 seek=$((0x1d0060)) count=$((0x11c0)) conv=notrunc
 
-    cp -v ./RPI_EFI.fd "$out/RPI_EFI.fd"
+    # cp -v ./RPI_EFI.fd "$out/RPI_EFI.fd"
+
+    cp ${src} "$out/RPI_EFI.fd"
 
     cat > "$out/config.txt" << ${defaultConfig}