fwupd: 2.1.3 -> 2.1.4

2.1.4 and 2.1.4-2 point to the same commit, but the GH release was done
with -2.

Diff: https://github.com/fwupd/fwupd/compare/2.1.3...2.1.4

Changelog: https://github.com/fwupd/fwupd/releases/tag/2.1.4-2

pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] Install fwupdplugin to out
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 1a56d3308..c7bf2c9aa 100644
+index 0d756bc0e748ba1c7be64bb9357f28fe8c5342e6..0cfca8e45b7ed6cc63be470ac0df916639ef52c4 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -734,7 +734,7 @@ if build_standalone
+@@ -719,7 +719,7 @@ if build_standalone
    if host_machine.system() == 'windows'
      libdir_pkg = bindir
    else

pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch

@@ -11,7 +11,7 @@ Subject: [PATCH] Add output for installed tests
  4 files changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/data/tests/meson.build b/data/tests/meson.build
-index e15cab2fa..bad033dbf 100644
+index 377ba2ccaa5e13a87443cbe65406eb5a9a3af79b..2dfb5f251383464c38e2f3202c9dfb1107ac7798 100644
 --- a/data/tests/meson.build
 +++ b/data/tests/meson.build
 @@ -139,7 +139,7 @@ configure_file(
@@ -22,12 +22,12 @@ index e15cab2fa..bad033dbf 100644
 +  install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
  )
  
- if umockdev_integration_tests.allowed()
+ if umockdev.found()
 diff --git a/meson.build b/meson.build
-index c7bf2c9aa..bf77bf6d6 100644
+index 0cfca8e45b7ed6cc63be470ac0df916639ef52c4..1561d1837a73425d9dda510d0ba25d16f92ed7f7 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -241,8 +241,8 @@ else
+@@ -243,8 +243,8 @@ else
    includedir = join_paths(prefix, get_option('includedir'))
    sysconfdir = join_paths(prefix, get_option('sysconfdir'))
    localstatedir = join_paths(prefix, get_option('localstatedir'))
@@ -38,7 +38,7 @@ index c7bf2c9aa..bf77bf6d6 100644
    daemon_dir = join_paths(libexecdir, 'fwupd')
  endif
  mandir = join_paths(prefix, get_option('mandir'))
-@@ -722,6 +722,7 @@ gnome = import('gnome')
+@@ -707,6 +707,7 @@ gnome = import('gnome')
  i18n = import('i18n')
  
  conf.set_quoted('FWUPD_PREFIX', prefix)
@@ -47,10 +47,10 @@ index c7bf2c9aa..bf77bf6d6 100644
  conf.set_quoted('FWUPD_LIBDIR', libdir)
  conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)
 diff --git a/meson_options.txt b/meson_options.txt
-index eb57391eb..420997355 100644
+index 6fe15e8beb8a85acdaca15f212bd3a917990ced2..b89ba371cee9dccf8457414f316ca697ef33216a 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -198,6 +198,11 @@ option(
+@@ -193,6 +193,11 @@ option(
    value: 'fwupd-refresh',
    description: 'User account to use for fwupd-refresh.service (empty for DynamicUser)',
  )
@@ -63,7 +63,7 @@ index eb57391eb..420997355 100644
    'tests',
    type: 'boolean',
 diff --git a/src/tests/host-emulate/meson.build b/src/tests/host-emulate/meson.build
-index c36da65cd..f0b70d4d6 100644
+index c36da65cd67e6081a758ed2ab7327276fb82d804..f0b70d4d68de6f534f1c1ecd37e51619ad1d85e7 100644
 --- a/src/tests/host-emulate/meson.build
 +++ b/src/tests/host-emulate/meson.build
 @@ -9,7 +9,7 @@ if build_standalone

pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch

@@ -7,15 +7,15 @@ Subject: [PATCH] Add option for installation sysconfdir
  data/bios-settings.d/meson.build |  2 +-
  data/meson.build                 |  2 +-
  data/pki/meson.build             |  4 ++--
- data/remotes.d/meson.build       |  8 ++++----
+ data/remotes.d/meson.build       | 10 +++++-----
  docs/meson.build                 | 16 ++++++++--------
  meson.build                      |  6 ++++++
  meson_options.txt                |  6 ++++++
  plugins/uefi-capsule/meson.build |  4 ++--
- 8 files changed, 30 insertions(+), 18 deletions(-)
+ 8 files changed, 31 insertions(+), 19 deletions(-)
 
 diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build
-index 2a2a07016..99df55afb 100644
+index 2a2a0701612e54a838d4d72f2bb00a793a31e0a3..99df55afb7636b090e2f57a5033bec6fe0017c15 100644
 --- a/data/bios-settings.d/meson.build
 +++ b/data/bios-settings.d/meson.build
 @@ -2,6 +2,6 @@ if build_standalone and host_machine.system() == 'linux'
@@ -27,7 +27,7 @@ index 2a2a07016..99df55afb 100644
    )
  endif
 diff --git a/data/meson.build b/data/meson.build
-index 70d08c55e..5a5d8bf46 100644
+index 74a9104c333330ce2aacaa7cac45c87d6c5c8e53..3d9cc87b443078888c6e72075095d644a9258dab 100644
 --- a/data/meson.build
 +++ b/data/meson.build
 @@ -29,7 +29,7 @@ if build_standalone
@@ -38,27 +38,26 @@ index 70d08c55e..5a5d8bf46 100644
 +    install_dir: join_paths(sysconfdir_install, 'fwupd'),
      install_mode: 'rw-r-----',
    )
-   plugin_quirks += files('cfi.quirk', 'ds20.quirk', 'power.quirk', 'vendors.quirk')
+   plugin_quirks += files(
 diff --git a/data/pki/meson.build b/data/pki/meson.build
-index b87068405..21f59753a 100644
+index 7574aebc60617d8d8456c210bb19fcaf25263e74..05e6642454123e715e2f80501cf1919f96905fde 100644
 --- a/data/pki/meson.build
 +++ b/data/pki/meson.build
-@@ -8,11 +8,11 @@ if supported_pkcs7
-   install_data(
-     ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'],
-     install_tag: 'runtime',
--    install_dir: join_paths(sysconfdir, 'pki', 'fwupd'),
-+    install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd'),
-   )
-   install_data(
-     ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'],
-     install_tag: 'runtime',
--    install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata'),
-+    install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata'),
-   )
- endif
+@@ -1,10 +1,10 @@
+ install_data(
+   ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'],
+   install_tag: 'runtime',
+-  install_dir: join_paths(sysconfdir, 'pki', 'fwupd'),
++  install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd'),
+ )
+ install_data(
+   ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'],
+   install_tag: 'runtime',
+-  install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata'),
++  install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata'),
+ )
 diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
-index b8d24c267..0dd4ad32a 100644
+index c0b4862ce6e13861da967cc2b8442849f63f0520..8bd00e9dbefd0ff386ad61f08ec861e7ad005090 100644
 --- a/data/remotes.d/meson.build
 +++ b/data/remotes.d/meson.build
 @@ -12,7 +12,7 @@ if build_standalone and get_option('lvfs') != 'false'
@@ -75,11 +74,20 @@ index b8d24c267..0dd4ad32a 100644
      install: true,
      install_tag: 'runtime',
 -    install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
++    install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
+   )
+   configure_file(
+     input: 'lvfs-embargo.conf',
+@@ -28,7 +28,7 @@ if build_standalone and get_option('lvfs') != 'false'
+     configuration: con3,
+     install: true,
+     install_tag: 'runtime',
+-    install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
 +    install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
    )
    i18n.merge_file(
      input: 'lvfs.metainfo.xml',
-@@ -59,7 +59,7 @@ configure_file(
+@@ -67,7 +67,7 @@ configure_file(
    configuration: con2,
    install: get_option('vendor_metadata'),
    install_tag: 'runtime',
@@ -88,7 +96,7 @@ index b8d24c267..0dd4ad32a 100644
  )
  configure_file(
    input: 'vendor-directory.conf',
-@@ -67,5 +67,5 @@ configure_file(
+@@ -75,5 +75,5 @@ configure_file(
    configuration: con2,
    install: true,
    install_tag: 'runtime',
@@ -96,7 +104,7 @@ index b8d24c267..0dd4ad32a 100644
 +  install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
  )
 diff --git a/docs/meson.build b/docs/meson.build
-index b4d48b086..8a1f8fc8c 100644
+index b4d48b086baf03a2f713ab9c7cb17e60b2a9d12b..8a1f8fc8ca9fc21f278575233348ca918635c161 100644
 --- a/docs/meson.build
 +++ b/docs/meson.build
 @@ -196,7 +196,7 @@ if build_docs
@@ -161,10 +169,10 @@ index b4d48b086..8a1f8fc8c 100644
    )
  endif
 diff --git a/meson.build b/meson.build
-index bf77bf6d6..f1f51e841 100644
+index 1561d1837a73425d9dda510d0ba25d16f92ed7f7..917770b38abb86056d6c42fa9c99dedf27ebe999 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -248,6 +248,12 @@ endif
+@@ -250,6 +250,12 @@ endif
  mandir = join_paths(prefix, get_option('mandir'))
  localedir = join_paths(prefix, get_option('localedir'))
  
@@ -178,7 +186,7 @@ index bf77bf6d6..f1f51e841 100644
  gio = dependency(
    'gio-2.0',
 diff --git a/meson_options.txt b/meson_options.txt
-index 420997355..67b3058d5 100644
+index b89ba371cee9dccf8457414f316ca697ef33216a..0dc66c4ec1ecb1547a21c4ec673ac1032462d91e 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -14,6 +14,12 @@ option(
@@ -195,7 +203,7 @@ index 420997355..67b3058d5 100644
    'build',
    type: 'combo',
 diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build
-index f104f36d7..30356ea53 100644
+index c2eb3b4300437d0d6b87d934441e69c306ba99a8..5c90240170c11ad3c75840ab6913018b6f7de85f 100644
 --- a/plugins/uefi-capsule/meson.build
 +++ b/plugins/uefi-capsule/meson.build
 @@ -23,7 +23,7 @@ if host_machine.system() == 'linux'

pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] Get the efi app from fwupd-efi
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index f1f51e841..aaefe55d9 100644
+index 917770b38abb86056d6c42fa9c99dedf27ebe999..f52f3ec12dd9def0a68ea1645f7d508acbb731b9 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -646,7 +646,7 @@ endif
+@@ -651,7 +651,7 @@ endif
  
  # EFI
  if build_standalone

pkgs/by-name/fw/fwupd/package.nix

@@ -53,7 +53,6 @@
   tpm2-tss,
   valgrind,
   xz, # for liblzma
-  flashrom,
 
   # mesonFlags
   hwdata,
@@ -74,16 +73,12 @@
   nixosTests,
   nix-update-script,
 
-  enableFlashrom ? false,
   enablePassim ? false,
 }:
 
 let
   isx86 = stdenv.hostPlatform.isx86;
 
-  # Experimental
-  haveFlashrom = isx86 && enableFlashrom;
-
   runPythonCommand =
     name: buildCommandPython:
 
@@ -127,7 +122,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fwupd";
-  version = "2.1.3";
+  version = "2.1.4";
 
   # libfwupd goes to lib
   # daemon, plug-ins and libfwupdplugin go to out
@@ -145,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "fwupd";
     repo = "fwupd";
     tag = finalAttrs.version;
-    hash = "sha256-AZ8DwhAoRLROExrGqEzzXppUI2285JoRZ4o748pyAaA=";
+    hash = "sha256-bKBEZR7Wzi9nZYH+KAzh1q+sh2t2Gl3puQmeogNdIsE=";
   };
 
   patches = [
@@ -193,6 +188,7 @@ stdenv.mkDerivation (finalAttrs: {
     ensureNewerSourcesForZipFilesHook # required for firmware zipping
     gettext
     gi-docgen
+    gnutls.bin
     gobject-introspection
     libjcat.bin
     libxml2
@@ -233,9 +229,6 @@ stdenv.mkDerivation (finalAttrs: {
     tpm2-tss
     valgrind
     xz # for liblzma
-  ]
-  ++ lib.optionals haveFlashrom [
-    flashrom
   ];
 
   mesonFlags = [
@@ -260,9 +253,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!enablePassim) [
     (lib.mesonEnable "passim" false)
-  ]
-  ++ lib.optionals (!haveFlashrom) [
-    (lib.mesonEnable "plugin_flashrom" false)
   ];
 
   # TODO: wrapGAppsHook3 wraps efi capsule even though it is not ELF
@@ -340,6 +330,7 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = nix-update-script { };
     filesInstalledToEtc = [
       "fwupd/fwupd.conf"
+      "fwupd/remotes.d/lvfs-embargo.conf"
       "fwupd/remotes.d/lvfs-testing.conf"
       "fwupd/remotes.d/lvfs.conf"
       "fwupd/remotes.d/vendor.conf"