Unverified Commit 545696ef authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #265266 from R-VdP/rvdp/fwupd_1_9_7

fwupd: 1.9.6 -> 1.9.7
parents 7ad39723 21ef15cc
Loading
Loading
Loading
Loading
+4 −7
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@
, gobject-introspection
, gettext
, libgudev
, libdrm
, polkit
, libxmlb
, glib
@@ -18,14 +19,12 @@
, curl
, libjcat
, elfutils
, libsmbios
, efivar
, valgrind
, meson
, libuuid
, colord
, ninja
, gcab
, gnutls
, protobufc
, python3
@@ -124,7 +123,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
  pname = "fwupd";
  version = "1.9.6";
  version = "1.9.7";

  # libfwupd goes to lib
  # daemon, plug-ins and libfwupdplugin go to out
@@ -135,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "fwupd";
    repo = "fwupd";
    rev = finalAttrs.version;
    hash = "sha256-9mA6gETnOmmkI+cdF0kP1moPV6DDvASq1JXarupM/tU=";
    hash = "sha256-NhVCIjkwoTZptctIrkU9HgXzjr+KCUZfEKcjoYgAEdM=";
  };

  patches = [
@@ -169,7 +168,6 @@ stdenv.mkDerivation (finalAttrs: {
    gettext
    shared-mime-info
    valgrind
    gcab
    gnutls
    protobufc # for protoc
    python
@@ -183,6 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
    gusb
    sqlite
    libarchive
    libdrm
    curl
    elfutils
    libgudev
@@ -202,8 +201,6 @@ stdenv.mkDerivation (finalAttrs: {
    libcbor
    libqmi
    xz # for liblzma
  ] ++ lib.optionals haveDell [
    libsmbios
  ] ++ lib.optionals haveFlashrom [
    flashrom
  ];