git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #79309 from jtojnar/hugsie-pkgs

fwupd: 1.3.3 → 1.3.7

commitf4f39fc8248ea89f50c08259154f48a7ceda9216 authorJan Tojnar <jtojnar@gmail.com> dateThu 6 Feb 2020, 16:20 (7 years ago) parent67312c6444538e
6 files changed+36−78
pkgs/development/libraries/gusb/default.nix+2−2 pkgs/development/libraries/libxmlb/default.nix+2−4 pkgs/development/libraries/libxmlb/installed-tests-path.patch+10−10 pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch+17−17 pkgs/os-specific/linux/firmware/fwupd/default.nix+5−14 pkgs/os-specific/linux/firmware/fwupd/no-which.patch−31
pkgs/development/libraries/gusb/default.nix+2−2
@@ -4,13 +4,13 @@
44}:
55stdenv.mkDerivation rec {
66 pname = "gusb";
7− version = "0.3.0";
7+ version = "0.3.3";
88
99 outputs = [ "bin" "out" "dev" "devdoc" ];
1010
1111 src = fetchurl {
1212 url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";
13− sha256 = "1p4f6jdjw6zl986f93gzdjg2hdcn5dlz6rcckcz4rbmnk47rbryq";
13+ sha256 = "14pbd0812151ga7jrpzi88fcrwkckx6m07ay84l7dzkxbdc44fgr";
1414 };
1515
1616 nativeBuildInputs = [
pkgs/development/libraries/libxmlb/default.nix+2−4
@@ -5,7 +5,6 @@
55, glib
66, gobject-introspection
77, gtk-doc
8−, libuuid
98, meson
109, ninja
1110, pkgconfig
@@ -16,7 +15,7 @@
1615
1716stdenv.mkDerivation rec {
1817 pname = "libxmlb";
19− version = "0.1.13";
18+ version = "0.1.14";
2019
2120 outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ];
2221
@@ -24,7 +23,7 @@ stdenv.mkDerivation rec {
2423 owner = "hughsie";
2524 repo = "libxmlb";
2625 rev = version;
27− sha256 = "14bk7bk08mjbildak1l7jq7idcyask7384vigpq9zmwai1gax4s7";
26+ sha256 = "05snbv1dvqa96k7xlwi2sj161315kps3baansr9xdpwim5ckmwc6";
2827 };
2928
3029 patches = [
@@ -45,7 +44,6 @@ stdenv.mkDerivation rec {
4544
4645 buildInputs = [
4746 glib
48− libuuid
4947 ];
5048
5149 mesonFlags = [
pkgs/development/libraries/libxmlb/installed-tests-path.patch+10−10
@@ -1,18 +1,18 @@
11diff --git a/meson.build b/meson.build
2−index b064cb8..1a470cf 100644
2+index 38486c9..c567613 100644
33--- a/meson.build
44+++ b/meson.build
5−@@ -103,8 +103,8 @@
6−
7− libexecdir = join_paths(prefix, get_option('libexecdir'))
8− datadir = join_paths(prefix, get_option('datadir'))
9−-installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name())
10−-installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name())
11−+installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
12−+installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
5+@@ -110,8 +110,8 @@
6+ prefix = get_option('prefix')
7+ datadir = join_paths(prefix, get_option('datadir'))
8+ libexecdir = join_paths(prefix, get_option('libexecdir'))
9+- installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name())
10+- installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name())
11++ installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
12++ installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
13+ endif
1314
1415 gio = dependency('gio-2.0', version : '>= 2.45.8')
15− uuid = dependency('uuid')
1616diff --git a/meson_options.txt b/meson_options.txt
1717index 27e8cb6..74548ae 100644
1818--- a/meson_options.txt
pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch+17−17
@@ -1,10 +1,10 @@
11diff --git a/data/meson.build b/data/meson.build
2−index 25db9509..f394eb25 100644
2+index d59bdc88..4a4cfc35 100644
33--- a/data/meson.build
44+++ b/data/meson.build
5−@@ -13,7 +13,7 @@
6− if build_daemon
7− subdir('installed-tests')
5+@@ -16,7 +16,7 @@
6+
7+ if build_standalone
88 install_data(['daemon.conf'],
99- install_dir : join_paths(sysconfdir, 'fwupd')
1010+ install_dir : join_paths(sysconfdir_install, 'fwupd')
@@ -76,10 +76,10 @@ index 826a3c1d..b78db663 100644
7676+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
7777 )
7878diff --git a/meson.build b/meson.build
79−index 8e1de887..a5bb1fe6 100644
79+index b1a523d2..aacb8e0a 100644
8080--- a/meson.build
8181+++ b/meson.build
82−@@ -158,6 +158,12 @@
82+@@ -169,6 +169,12 @@
8383 mandir = join_paths(prefix, get_option('mandir'))
8484 localedir = join_paths(prefix, get_option('localedir'))
8585
@@ -89,14 +89,14 @@ index 8e1de887..a5bb1fe6 100644
8989+ sysconfdir_install = sysconfdir
9090+endif
9191+
92+ diffcmd = find_program('diff')
9293 gio = dependency('gio-2.0', version : '>= 2.45.8')
93− giounix = dependency('gio-unix-2.0', version : '>= 2.45.8')
94− if gio.version().version_compare ('>= 2.55.0')
94+ giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false)
9595diff --git a/meson_options.txt b/meson_options.txt
96−index 71b50c6a..561c2031 100644
96+index be0adfef..73983333 100644
9797--- a/meson_options.txt
9898+++ b/meson_options.txt
99−@@ -24,6 +24,7 @@
99+@@ -26,6 +26,7 @@
100100 option('systemd', type : 'boolean', value : true, description : 'enable systemd support')
101101 option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units')
102102 option('elogind', type : 'boolean', value : false, description : 'enable elogind support')
@@ -105,10 +105,10 @@ index 71b50c6a..561c2031 100644
105105 option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
106106 option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules')
107107diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
108−index cb9f4555..b972d7fb 100644
108+index ed4eee70..76dbdb1d 100644
109109--- a/plugins/dell-esrt/meson.build
110110+++ b/plugins/dell-esrt/meson.build
111−@@ -36,5 +36,5 @@
111+@@ -37,5 +37,5 @@
112112 output : 'dell-esrt.conf',
113113 configuration : con2,
114114 install: true,
@@ -116,10 +116,10 @@ index cb9f4555..b972d7fb 100644
116116+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
117117 )
118118diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
119−index 5c88504e..7706da71 100644
119+index 25fc5c7d..77eb9a83 100644
120120--- a/plugins/redfish/meson.build
121121+++ b/plugins/redfish/meson.build
122−@@ -26,7 +26,7 @@
122+@@ -27,7 +27,7 @@
123123 )
124124
125125 install_data(['redfish.conf'],
@@ -129,7 +129,7 @@ index 5c88504e..7706da71 100644
129129
130130 if get_option('tests')
131131diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build
132−index 42718abf..bc815491 100644
132+index 06ab34ee..297a9182 100644
133133--- a/plugins/thunderbolt/meson.build
134134+++ b/plugins/thunderbolt/meson.build
135135@@ -46,7 +46,7 @@
@@ -142,10 +142,10 @@ index 42718abf..bc815491 100644
142142 # we use functions from 2.52 in the tests
143143 if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52')
144144diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build
145−index 45b18d7d..ef8e0b04 100644
145+index 39b5f566..0f904a22 100644
146146--- a/plugins/uefi/meson.build
147147+++ b/plugins/uefi/meson.build
148−@@ -85,7 +85,7 @@
148+@@ -87,7 +87,7 @@
149149 )
150150
151151 install_data(['uefi.conf'],
pkgs/os-specific/linux/firmware/fwupd/default.nix+5−14
@@ -87,14 +87,14 @@ in
8787
8888stdenv.mkDerivation rec {
8989 pname = "fwupd";
90− version = "1.3.3";
90+ version = "1.3.7";
9191
9292 src = fetchurl {
9393 url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
94− sha256 = "0nqzqvx8nzflhb4kzvkdcv7kixb50vh6h21kpkd7pjxp942ndzql";
94+ sha256 = "02mzn3whk5mba4nxyrkypawr1gzjx79n4nrkhrp8vja6mxxgsf10";
9595 };
9696
97− outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
97+ outputs = [ "out" "dev" "devdoc" "man" "installedTests" ];
9898
9999 nativeBuildInputs = [
100100 meson
@@ -148,10 +148,6 @@ stdenv.mkDerivation rec {
148148 ./fix-paths.patch
149149 ./add-option-for-installation-sysconfdir.patch
150150
151− # do not require which
152− # https://github.com/fwupd/fwupd/pull/1568
153− ./no-which.patch
154−
155151 # installed tests are installed to different output
156152 # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle
157153 (substituteAll {
@@ -163,7 +159,8 @@ stdenv.mkDerivation rec {
163159
164160 postPatch = ''
165161 patchShebangs \
166− libfwupd/generate-version-script.py \
162+ contrib/get-version.py \
163+ contrib/generate-version-script.py \
167164 meson_post_install.sh \
168165 po/make-images \
169166 po/make-images.sh \
@@ -173,11 +170,6 @@ stdenv.mkDerivation rec {
173170 # https://github.com/NixOS/nix/issues/1846
174171 substituteInPlace data/installed-tests/meson.build --subst-var installedTests
175172
176− # install plug-ins to out, they are not really part of the library
177− substituteInPlace meson.build \
178− --replace "plugin_dir = join_paths(libdir, 'fwupd-plugins-3')" \
179− "plugin_dir = join_paths('${placeholder "out"}', 'fwupd_plugins-3')"
180−
181173 substituteInPlace data/meson.build --replace \
182174 "install_dir: systemd.get_pkgconfig_variable('systemdshutdowndir')" \
183175 "install_dir: '${placeholder "out"}/lib/systemd/system-shutdown'"
@@ -211,7 +203,6 @@ stdenv.mkDerivation rec {
211203 "--localstatedir=/var"
212204 "--sysconfdir=/etc"
213205 "-Dsysconfdir_install=${placeholder "out"}/etc"
214− "--libexecdir=${placeholder "out"}/libexec"
215206 ] ++ stdenv.lib.optionals (!haveDell) [
216207 "-Dplugin_dell=false"
217208 "-Dplugin_synaptics=false"
pkgs/os-specific/linux/firmware/fwupd/no-which.patchdeleted−31
@@ -1,31 +0,0 @@
1−--- a/plugins/uefi/efi/generate_binary.sh
2−+++ b/plugins/uefi/efi/generate_binary.sh
3−@@ -1,9 +1,9 @@
4− #!/bin/sh
5− output=$2
6−-objcopy_cmd=$(which objcopy)
7−-genpeimg_cmd=$(which genpeimg)
8−+objcopy_cmd=$(command -v objcopy)
9−+genpeimg_cmd=$(command -v genpeimg)
10−
11−-$objcopy_cmd -j .text \
12−+"$objcopy_cmd" -j .text \
13− -j .sdata \
14− -j .data \
15− -j .dynamic \
16−@@ -11,7 +11,7 @@
17− -j .rel \
18− -j .rela \
19− -j .reloc \
20−- $*
21−+ "$@"
22−
23− if [ -n "${genpeimg_cmd}" ]; then
24− $genpeimg_cmd -d \
25−@@ -20,5 +20,5 @@
26− +n \
27− -d \
28− +s \
29−- $output
30−+ "$output"
31− fi