Merge master into staging-next

pkgs/development/libraries/keystone/default.nix

@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
     sha256 = "020d1l1aqb82g36l8lyfn2j8c660mm6sh1nl4haiykwgdl9xnxfa";
   };
 
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+  ];
+
   nativeBuildInputs = [
     pkg-config
     cmake

pkgs/development/php-packages/event/default.nix

@@ -2,8 +2,8 @@
 buildPecl {
   pname = "event";
 
-  version = "3.0.1";
-  sha256 = "12629hi2ddyavzgl5ala53fi8m55l0xsmqsywy040f0grzp9r6rc";
+  version = "3.0.2";
+  sha256 = "1ws4l014z52vb23xbsfj6viwkf7fmh462af639xgbp0n6syf77dq";
 
   configureFlags = [
     "--with-event-libevent-dir=${pkgs.libevent.dev}"

pkgs/development/php-packages/php-cs-fixer/default.nix

@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, pkgs, lib, php }:
 let
   pname = "php-cs-fixer";
-  version = "2.16.7";
+  version = "2.17.0";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
-    sha256 = "1azivqvgqy224g2ch9v9qgi31w4ml7fph3bsk8c304yvbvvfv5nh";
+    sha256 = "163wz5y5ik7g1p7n0v3ckyawqjhg8d18cwx8a5c6fr1fkwb4mb12";
   };
 
   phases = [ "installPhase" ];

pkgs/development/php-packages/phpstan/default.nix

@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, pkgs, lib, php }:
 let
   pname = "phpstan";
-  version = "0.12.58";
+  version = "0.12.59";
 in
 mkDerivation {
   inherit pname version;
 
   src = pkgs.fetchurl {
     url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
-    sha256 = "1509z783rhrnlx32a3yg58sy81971dv1sf8nzs8am2m9qnpmdcll";
+    sha256 = "0lp25d9b7w8lk4ffrd17mjw93i234qnfpwz42k8lww1lrk5abnfa";
   };
 
   phases = [ "installPhase" ];

pkgs/development/php-packages/rdkafka/default.nix

@@ -3,8 +3,8 @@
 buildPecl {
   pname = "rdkafka";
 
-  version = "4.0.4";
-  sha256 = "18a8p43i2g93fv7qzvk2hk66z5iv0mk1rqn097x49bjigliv60mn";
+  version = "4.1.1";
+  sha256 = "0s6cqd71z5jpqb98myk4askmbqphzzslf0d4vqlg2rig9q6fyv7x";
 
   buildInputs = [ pkgs.rdkafka pcre' ];
 

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

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.3";
 
     # 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 = "005y5wicmm6f2v8i9m3axx7ivgj3z8mbqps4v9m71bsqmq298j86";
     };
 
     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"}"