fwupd: 1.5.1 → 1.5.2

https://blogs.gnome.org/hughsie/2020/11/23/fwupd-1-5-2/

2 files changed, 9 insertions, 39 deletions

diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
index 6faa6079355..dce4af69aa2 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
+++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
@@ -122,32 +122,6 @@ index ed4eee70..76dbdb1d 100644
 -  install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
 +  install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
  )
-diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build
-index d829e153..e2917bbe 100644
---- a/plugins/msr/meson.build
-+++ b/plugins/msr/meson.build
-@@ -5,7 +5,7 @@ install_data(['msr.quirk'],
- )
- 
- install_data(['fwupd-msr.conf'],
--  install_dir: join_paths(sysconfdir, 'modules-load.d')
-+  install_dir: join_paths(sysconfdir_install, 'modules-load.d')
- )
- 
- shared_module('fu_plugin_msr',
-diff --git a/plugins/platform-integrity/meson.build b/plugins/platform-integrity/meson.build
-index 6f1c4bc5..c5d043fc 100644
---- a/plugins/platform-integrity/meson.build
-+++ b/plugins/platform-integrity/meson.build
-@@ -7,7 +7,7 @@ install_data([
- )
- 
- install_data(['fwupd-platform-integrity.conf'],
--  install_dir: join_paths(sysconfdir, 'modules-load.d')
-+  install_dir: join_paths(sysconfdir_install, 'modules-load.d')
- )
- 
- shared_module('fu_plugin_platform_integrity',
 diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
 index 92762791..08bb37ea 100644
 --- a/plugins/redfish/meson.build
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 85f5bbbf5b1..7d38c767a08 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -2,7 +2,6 @@
 
 { stdenv
 , fetchurl
-, fetchpatch
 , fetchFromGitHub
 , substituteAll
 , gtk-doc
@@ -15,8 +14,7 @@
 , gusb
 , sqlite
 , libarchive
-, glib-networking
-, libsoup
+, curl
 , help2man
 , libjcat
 , libxslt
@@ -89,7 +87,7 @@ let
 
   self = stdenv.mkDerivation rec {
     pname = "fwupd";
-    version = "1.5.1";
+    version = "1.5.2";
 
     # libfwupd goes to lib
     # daemon, plug-ins and libfwupdplugin go to out
@@ -98,7 +96,7 @@ let
 
     src = fetchurl {
       url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
-      sha256 = "0fpxcl6bighiipyl4qspjhi0lwisrgq8jdahm68mk34rmrx50sgf";
+      sha256 = "19vppg8s8yfg2wavg0czd0vlalxv22hzw0gd11nw2wa92jz91d9x";
     };
 
     patches = [
@@ -119,12 +117,6 @@ let
         # Needs a different set of modules than po/make-images.
         inherit installedTestsPython;
       })
-
-      # Skip tests requiring network.
-      (fetchpatch {
-        url = "https://github.com/fwupd/fwupd/commit/db15442c7c217610954786bd40779c14ed0e034b.patch";
-        sha256 = "/jzpGMJcqLisjecKpSUfA8ZCU53n7BOPR6tMgEX/qL8=";
-      })
     ];
 
     nativeBuildInputs = [
@@ -152,14 +144,13 @@ let
       gusb
       sqlite
       libarchive
-      libsoup
+      curl
       elfutils
       gnu-efi
       libgudev
       colord
       libjcat
       libuuid
-      glib-networking
       json-glib
       umockdev
       bash-completion
@@ -176,6 +167,11 @@ let
     mesonFlags = [
       "-Dgtkdoc=true"
       "-Dplugin_dummy=true"
+      # We are building the official releases.
+      "-Dsupported_build=true"
+      # Would dlopen libsoup to preserve compatibility with clients linking against older fwupd.
+      # https://github.com/fwupd/fwupd/commit/173d389fa59d8db152a5b9da7cc1171586639c97
+      "-Dsoup_session_compat=false"
       "-Dudevdir=lib/udev"
       "-Dsystemd_root_prefix=${placeholder "out"}"
       "-Dinstalled_test_prefix=${placeholder "installedTests"}"