From 286e778ab53c3196f7a7fee7a390537d739392da Mon Sep 17 00:00:00 2001 From: mexisme Date: Wed, 25 Aug 2021 12:06:29 +1200 Subject: [PATCH 1/2] Fix source repo for MS Surface ATH10k Firmware image --- .../surface/firmware/surface-go/ath10k/ath10k-replace.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix b/microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix index 909131d..8a67bb6 100644 --- a/microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix +++ b/microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix @@ -1,8 +1,7 @@ {stdenv, lib, pkgs, firmwareLinuxNonfree, ...}: let repos = (pkgs.callPackage ../../../repos.nix {}); - # killernetworking_firmware = ./K1535_Debian; - killernetworking_firmware = repos.ath10k-firmware + "/K1535_Debian"; + killernetworking_firmware = repos.surface-go-ath10k-firmware_backup + "/K1535_Debian"; in firmwareLinuxNonfree.overrideAttrs (old: rec { pname = "microsoft-surface-go-firmware-linux-nonfree"; @@ -23,7 +22,7 @@ firmwareLinuxNonfree.overrideAttrs (old: rec { cp ${killernetworking_firmware}/board.bin $out/lib/firmware/ath10k/QCA6174/hw3.0/ ''; - outputHash = "1nc56qii96dfvxnv3ad3lxz2rzyqcbldk0h9rbm3l2pgamkvj8dw"; + outputHash = "1zvahsp06vikp83r89wkccwq7mixjiwcv10chw1xyikfjkqr48hr"; meta = with lib; { description = "Standard binary firmware collection, adjusted with the Surface Go WiFi firmware"; From 12cced4eebf2b06193ce043cee9017e5efdbd319 Mon Sep 17 00:00:00 2001 From: mexisme Date: Wed, 25 Aug 2021 16:57:46 +1200 Subject: [PATCH 2/2] Fix outputHash --- microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix b/microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix index 8a67bb6..f950d9b 100644 --- a/microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix +++ b/microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix @@ -22,7 +22,7 @@ firmwareLinuxNonfree.overrideAttrs (old: rec { cp ${killernetworking_firmware}/board.bin $out/lib/firmware/ath10k/QCA6174/hw3.0/ ''; - outputHash = "1zvahsp06vikp83r89wkccwq7mixjiwcv10chw1xyikfjkqr48hr"; + outputHash = "176cf5b9f370x2a532h2afjfkrxy13gqdygc11bam0sg8dlnrv21"; meta = with lib; { description = "Standard binary firmware collection, adjusted with the Surface Go WiFi firmware";