Merge pull request #111006 from fabaff/bump-fwup

fwup: 1.5.2 -> 1.8.3

pkgs/tools/misc/fwup/default.nix

@@ -1,27 +1,68 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper, pkg-config
+{ stdenv
-, zlib, lzma, bzip2, mtools, dosfstools, zip, unzip, libconfuse, libsodium
+, lib
-, libarchive, darwin, coreutils }:
+, fetchFromGitHub
+, autoreconfHook
+, DiskArbitration
+, pkg-config
+, bzip2
+, libarchive
+, libconfuse
+, libsodium
+, lzma
+, zlib
+, coreutils
+, dosfstools
+, mtools
+, unzip
+, zip
+, which
+, xdelta
+}:
 
 stdenv.mkDerivation rec {
   pname = "fwup";
-  version = "1.5.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
     rev = "v${version}";
-    sha256 = "05sjdlh450hk474a44yr6kz9dzx72jfxpi1krxbd0pdizlmfypsg";
+    sha256 = "sha256-ayfcnIZ7MuBsCy1giwmY2D2C6AukwS+fevmXqGa4c1w=";
   };
 
-  doCheck = true;
+  patches = [ ./fix-testrunner-darwin.patch ];
-  patches = lib.optional stdenv.isDarwin [ ./fix-testrunner-darwin.patch ];
 
-  nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ];
+  nativeBuildInputs = [
-  buildInputs = [ zlib lzma bzip2 libconfuse libsodium libarchive ]
+    autoreconfHook
-    ++ lib.optionals stdenv.isDarwin [
+    pkg-config
-      darwin.apple_sdk.frameworks.DiskArbitration
   ];
-  propagatedBuildInputs = [ zip unzip mtools dosfstools coreutils ];
+
+  buildInputs = [
+    bzip2
+    libarchive
+    libconfuse
+    libsodium
+    lzma
+    zlib
+  ]
+    ++ lib.optionals stdenv.isDarwin [
+    DiskArbitration
+  ];
+
+  propagatedBuildInputs = [
+    coreutils
+    dosfstools
+    mtools
+    unzip
+    zip
+  ];
+
+  checkInputs = [
+    which
+    xdelta
+  ];
+
+  doCheck = true;
 
   meta = with lib; {
     description = "Configurable embedded Linux firmware update creator and runner";

pkgs/top-level/all-packages.nix

@@ -2352,7 +2352,9 @@ in
 
   qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { };
 
-  fwup = callPackage ../tools/misc/fwup { };
+  fwup = callPackage ../tools/misc/fwup {
+    inherit (darwin.apple_sdk.frameworks) DiskArbitration;
+  };
 
   fx_cast_bridge = callPackage ../tools/misc/fx_cast { };