git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #106352 from NixOS/fwupd-1.5.3
commited98057f0aaeeef31185d91855a38af84c876bdc authorJan Tojnar <jtojnar@gmail.com> dateThu 10 Dec 2020, 06:31 (6 years ago) parent55a86ff113a866
2 files changed+9−39
compare with master
unifiedsplit
pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch−26 pkgs/os-specific/linux/firmware/fwupd/default.nix+9−13
pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch−26
@@ -122,32 +122,6 @@ index ed4eee70..76dbdb1d 100644
122122- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
123123+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
124124 )
125−diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build
126−index d829e153..e2917bbe 100644
127−--- a/plugins/msr/meson.build
128−+++ b/plugins/msr/meson.build
129−@@ -5,7 +5,7 @@ install_data(['msr.quirk'],
130− )
131−
132− install_data(['fwupd-msr.conf'],
133−- install_dir: join_paths(sysconfdir, 'modules-load.d')
134−+ install_dir: join_paths(sysconfdir_install, 'modules-load.d')
135− )
136−
137− shared_module('fu_plugin_msr',
138−diff --git a/plugins/platform-integrity/meson.build b/plugins/platform-integrity/meson.build
139−index 6f1c4bc5..c5d043fc 100644
140−--- a/plugins/platform-integrity/meson.build
141−+++ b/plugins/platform-integrity/meson.build
142−@@ -7,7 +7,7 @@ install_data([
143− )
144−
145− install_data(['fwupd-platform-integrity.conf'],
146−- install_dir: join_paths(sysconfdir, 'modules-load.d')
147−+ install_dir: join_paths(sysconfdir_install, 'modules-load.d')
148− )
149−
150− shared_module('fu_plugin_platform_integrity',
151125diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
152126index 92762791..08bb37ea 100644
153127--- a/plugins/redfish/meson.build
pkgs/os-specific/linux/firmware/fwupd/default.nix+9−13
@@ -2,7 +2,6 @@
22
33{ stdenv
44, fetchurl
5−, fetchpatch
65, fetchFromGitHub
76, substituteAll
87, gtk-doc
@@ -15,8 +14,7 @@
1514, gusb
1615, sqlite
1716, libarchive
18−, glib-networking
19−, libsoup
17+, curl
2018, help2man
2119, libjcat
2220, libxslt
@@ -89,7 +87,7 @@ let
8987
9088 self = stdenv.mkDerivation rec {
9189 pname = "fwupd";
92− version = "1.5.1";
90+ version = "1.5.3";
9391
9492 # libfwupd goes to lib
9593 # daemon, plug-ins and libfwupdplugin go to out
@@ -98,7 +96,7 @@ let
9896
9997 src = fetchurl {
10098 url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
101− sha256 = "0fpxcl6bighiipyl4qspjhi0lwisrgq8jdahm68mk34rmrx50sgf";
99+ sha256 = "005y5wicmm6f2v8i9m3axx7ivgj3z8mbqps4v9m71bsqmq298j86";
102100 };
103101
104102 patches = [
@@ -119,12 +117,6 @@ let
119117 # Needs a different set of modules than po/make-images.
120118 inherit installedTestsPython;
121119 })
122−
123− # Skip tests requiring network.
124− (fetchpatch {
125− url = "https://github.com/fwupd/fwupd/commit/db15442c7c217610954786bd40779c14ed0e034b.patch";
126− sha256 = "/jzpGMJcqLisjecKpSUfA8ZCU53n7BOPR6tMgEX/qL8=";
127− })
128120 ];
129121
130122 nativeBuildInputs = [
@@ -152,14 +144,13 @@ let
152144 gusb
153145 sqlite
154146 libarchive
155− libsoup
147+ curl
156148 elfutils
157149 gnu-efi
158150 libgudev
159151 colord
160152 libjcat
161153 libuuid
162− glib-networking
163154 json-glib
164155 umockdev
165156 bash-completion
@@ -176,6 +167,11 @@ let
176167 mesonFlags = [
177168 "-Dgtkdoc=true"
178169 "-Dplugin_dummy=true"
170+ # We are building the official releases.
171+ "-Dsupported_build=true"
172+ # Would dlopen libsoup to preserve compatibility with clients linking against older fwupd.
173+ # https://github.com/fwupd/fwupd/commit/173d389fa59d8db152a5b9da7cc1171586639c97
174+ "-Dsoup_session_compat=false"
179175 "-Dudevdir=lib/udev"
180176 "-Dsystemd_root_prefix=${placeholder "out"}"
181177 "-Dinstalled_test_prefix=${placeholder "installedTests"}"