From c6b2a26f28fa61b429a6e498eba9aa92765eec02 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Jan 2025 11:32:02 +0100
Subject: [PATCH 1/3] fwts: reformat with nixfmt

---
 pkgs/os-specific/linux/fwts/default.nix | 40 ++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index c4a4d3ece8c1..c52dd1844fec 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -1,5 +1,21 @@
-{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, gnumake42, glib, pcre
-, json_c, flex, bison, dtc, pciutils, dmidecode, acpica-tools, libbsd }:
+{
+  lib,
+  stdenv,
+  fetchzip,
+  autoreconfHook,
+  pkg-config,
+  gnumake42,
+  glib,
+  pcre,
+  json_c,
+  flex,
+  bison,
+  dtc,
+  pciutils,
+  dmidecode,
+  acpica-tools,
+  libbsd,
+}:
 
 stdenv.mkDerivation rec {
   pname = "fwts";
@@ -12,8 +28,24 @@ stdenv.mkDerivation rec {
   };
 
   # fails with make 4.4
-  nativeBuildInputs = [ autoreconfHook pkg-config gnumake42 ];
-  buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode acpica-tools libbsd ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    gnumake42
+  ];
+
+  buildInputs = [
+    glib
+    pcre
+    json_c
+    flex
+    bison
+    dtc
+    pciutils
+    dmidecode
+    acpica-tools
+    libbsd
+  ];
 
   postPatch = ''
     substituteInPlace src/lib/include/fwts_binpaths.h \

From f3785b42e8ee7dc6e9a9bcced86d13188c4fbfc4 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Jan 2025 11:33:14 +0100
Subject: [PATCH 2/3] fwts: refactor

---
 pkgs/os-specific/linux/fwts/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index c52dd1844fec..515669921d70 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   version = "24.09.00";
 
   src = fetchzip {
-    url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
-    sha256 = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc=";
+    url = "https://fwts.ubuntu.com/release/fwts-V${version}.tar.gz";
+    hash = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc=";
     stripRoot = false;
   };
 
@@ -49,22 +49,22 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/lib/include/fwts_binpaths.h \
-      --replace "/usr/bin/lspci"      "${pciutils}/bin/lspci" \
-      --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \
-      --replace "/usr/bin/iasl"       "${acpica-tools}/bin/iasl"
+      --replace-fail "/usr/bin/lspci"      "${pciutils}/bin/lspci" \
+      --replace-fail "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \
+      --replace-fail "/usr/bin/iasl"       "${acpica-tools}/bin/iasl"
 
     substituteInPlace src/lib/src/fwts_devicetree.c \
                       src/devicetree/dt_base/dt_base.c \
-      --replace "dtc -I" "${dtc}/bin/dtc -I"
+      --replace-fail "dtc -I" "${dtc}/bin/dtc -I"
   '';
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://wiki.ubuntu.com/FirmwareTestSuite";
     description = "Firmware Test Suite";
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ tadfisher ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ tadfisher ];
   };
 }

From 3045853cb07f039c9ad9bfa0c7461f18426fd3c1 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Jan 2025 11:33:29 +0100
Subject: [PATCH 3/3] fwts: unpin gnumake42

---
 pkgs/os-specific/linux/fwts/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 515669921d70..6fd7dc8e99d1 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -4,7 +4,6 @@
   fetchzip,
   autoreconfHook,
   pkg-config,
-  gnumake42,
   glib,
   pcre,
   json_c,
@@ -27,11 +26,9 @@ stdenv.mkDerivation rec {
     stripRoot = false;
   };
 
-  # fails with make 4.4
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-    gnumake42
   ];
 
   buildInputs = [