Merge pull request #189056 from jtojnar/fwupd

Sandro 2902676b fb5ce122

Changed files
+20 -6
nixos
modules
services
hardware
pkgs
+2
nixos/modules/services/hardware/fwupd.nix
···
services.udev.packages = [ cfg.package ];
systemd.packages = [ cfg.package ];
+
+
security.polkit.enable = true;
};
meta = {
+15 -4
pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
···
+
diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build
+
index b0ff5b106..13ac380d0 100644
+
--- a/data/bios-settings.d/meson.build
+
+++ b/data/bios-settings.d/meson.build
+
@@ -1,5 +1,5 @@
+
if build_standalone and host_machine.system() == 'linux'
+
install_data('README.md',
+
- install_dir: join_paths(sysconfdir, 'fwupd', 'bios-settings.d')
+
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'bios-settings.d')
+
)
+
endif
diff --git a/data/meson.build b/data/meson.build
-
index d8494020d..7c896fa0d 100644
+
index 3a77a7bfc..747bd1988 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -26,7 +26,7 @@ endif
···
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
diff --git a/meson.build b/meson.build
-
index e6b717078..f8a7a7455 100644
+
index e7980e965..2c66e2dc4 100644
--- a/meson.build
+++ b/meson.build
@@ -195,6 +195,12 @@ endif
···
gio = dependency('gio-2.0', version: '>= 2.45.8')
giounix = dependency('gio-unix-2.0', version: '>= 2.45.8', required: false)
diff --git a/meson_options.txt b/meson_options.txt
-
index 06d242371..d9e517fc0 100644
+
index 6cf92e72e..2e8568292 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
···
)
endif
diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build
-
index 13f03ccd4..9235ebe33 100644
+
index d626c3ad3..5a2f847d5 100644
--- a/plugins/msr/meson.build
+++ b/plugins/msr/meson.build
@@ -10,7 +10,7 @@ install_data(['fwupd-msr.conf'],
+3 -2
pkgs/os-specific/linux/firmware/fwupd/default.nix
···
self = stdenv.mkDerivation rec {
pname = "fwupd";
-
version = "1.8.3";
+
version = "1.8.4";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
···
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
-
sha256 = "sha256-ciIpd86KhmJRH/o8CIFWb2xFjsjWHSUNlGYRfWEiOOw=";
+
sha256 = "sha256-rfoHQ0zcKexBxA/vRg6Nlwlj/gx+hJ3sfzkyrbFh+IY=";
};
patches = [
···
passthru = {
filesInstalledToEtc = [
+
"fwupd/bios-settings.d/README.md"
"fwupd/daemon.conf"
"fwupd/remotes.d/lvfs-testing.conf"
"fwupd/remotes.d/lvfs.conf"