git.iko.soy/typeable/nixpkgs
on master help sign in
fwupd: 1.2.8 → 1.2.10 (#67625)

fwupd: 1.2.8 → 1.2.10

commitc7f19d76268a6b2272ca25e23a226abee34bb63c authorJan Tojnar <jtojnar@gmail.com> dateSun 8 Sep 2019, 03:42 (7 years ago) parent03deb7cb0a142e
1 file changed+134−28
pkgs/os-specific/linux/firmware/fwupd/default.nix+134−28
pkgs/os-specific/linux/firmware/fwupd/default.nix+134−28
@@ -1,18 +1,68 @@
1−{ stdenv, fetchurl, substituteAll, gtk-doc, pkgconfig, gobject-introspection, intltool
2−, libgudev, polkit, libxmlb, gusb, sqlite, libarchive, glib-networking
3−, libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, gnu-efi
4−, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl
5−, ninja, gcab, gnutls, python3, wrapGAppsHook, json-glib, bash-completion
6−, shared-mime-info, umockdev, vala, makeFontsConf, freefont_ttf
7−, cairo, freetype, fontconfig, pango
8−, bubblewrap, efibootmgr, flashrom, tpm2-tools
9−}:
10−
111# Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc
122
3+{ stdenv
4+, fetchurl
5+, substituteAll
6+, gtk-doc
7+, pkgconfig
8+, gobject-introspection
9+, intltool
10+, libgudev
11+, polkit
12+, libxmlb
13+, gusb
14+, sqlite
15+, libarchive
16+, glib-networking
17+, libsoup
18+, help2man
19+, gpgme
20+, libxslt
21+, elfutils
22+, libsmbios
23+, efivar
24+, gnu-efi
25+, libyaml
26+, valgrind
27+, meson
28+, libuuid
29+, colord
30+, docbook_xml_dtd_43
31+, docbook_xsl
32+, ninja
33+, gcab
34+, gnutls
35+, python3
36+, wrapGAppsHook
37+, json-glib
38+, bash-completion
39+, shared-mime-info
40+, umockdev
41+, vala
42+, makeFontsConf
43+, freefont_ttf
44+, cairo
45+, freetype
46+, fontconfig
47+, pango
48+, bubblewrap
49+, efibootmgr
50+, flashrom
51+, tpm2-tools
52+, nixosTests
53+}:
54+
1355let
14− python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]);
15− installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]);
56+ python = python3.withPackages (p: with p; [
57+ pygobject3
58+ pycairo
59+ pillow
60+ ]);
61+
62+ installedTestsPython = python3.withPackages (p: with p; [
63+ pygobject3
64+ requests
65+ ]);
1666
1767 fontsConf = makeFontsConf {
1868 fontDirectories = [ freefont_ttf ];
@@ -26,30 +76,70 @@ let
2676 # only redfish for x86_64
2777 haveRedfish = stdenv.isx86_64;
2878
29− # Currently broken on Aarch64
30− haveFlashrom = isx86;
79+ # # Currently broken on Aarch64
80+ # haveFlashrom = isx86;
81+ # Experimental in 1.2.10
82+ haveFlashrom = false;
3183
32−in stdenv.mkDerivation rec {
84+in
85+
86+stdenv.mkDerivation rec {
3387 pname = "fwupd";
34− version = "1.2.8";
88+ version = "1.2.10";
3589
3690 src = fetchurl {
3791 url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
38− sha256 = "0qbvq52c0scn1h99i1rf2la6rrhckin6gb02k7l0v3g07mxs20wc";
92+ sha256 = "0inngs7i48akm9c7fmdsf9zjif595rkaba69rl76jfwfv8r21vjb";
3993 };
4094
4195 outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
4296
4397 nativeBuildInputs = [
44− meson ninja gtk-doc pkgconfig gobject-introspection intltool shared-mime-info
45− valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook vala
98+ meson
99+ ninja
100+ gtk-doc
101+ pkgconfig
102+ gobject-introspection
103+ intltool
104+ shared-mime-info
105+ valgrind
106+ gcab
107+ docbook_xml_dtd_43
108+ docbook_xsl
109+ help2man
110+ libxslt
111+ python
112+ wrapGAppsHook
113+ vala
46114 ];
47115
48116 buildInputs = [
49− polkit libxmlb gusb sqlite libarchive libsoup elfutils gnu-efi libyaml
50− libgudev colord gpgme libuuid gnutls glib-networking json-glib umockdev
51− bash-completion cairo freetype fontconfig pango efivar
52− ] ++ stdenv.lib.optionals haveDell [ libsmbios ];
117+ polkit
118+ libxmlb
119+ gusb
120+ sqlite
121+ libarchive
122+ libsoup
123+ elfutils
124+ gnu-efi
125+ libyaml
126+ libgudev
127+ colord
128+ gpgme
129+ libuuid
130+ gnutls
131+ glib-networking
132+ json-glib
133+ umockdev
134+ bash-completion
135+ cairo
136+ freetype
137+ fontconfig
138+ pango
139+ efivar
140+ ] ++ stdenv.lib.optionals haveDell [
141+ libsmbios
142+ ];
53143
54144 patches = [
55145 ./fix-paths.patch
@@ -65,7 +155,12 @@ in stdenv.mkDerivation rec {
65155 ];
66156
67157 postPatch = ''
68− patchShebangs .
158+ patchShebangs \
159+ libfwupd/generate-version-script.py \
160+ meson_post_install.sh \
161+ po/make-images \
162+ po/make-images.sh \
163+ po/test-deps
69164
70165 # we cannot use placeholder in substituteAll
71166 # https://github.com/NixOS/nix/issues/1846
@@ -85,9 +180,12 @@ in stdenv.mkDerivation rec {
85180 # doCheck = true;
86181
87182 preFixup = let
88− binPath = [ efibootmgr bubblewrap tpm2-tools ] ++ stdenv.lib.optional haveFlashrom flashrom;
89− in
90− ''
183+ binPath = [
184+ efibootmgr
185+ bubblewrap
186+ tpm2-tools
187+ ] ++ stdenv.lib.optional haveFlashrom flashrom;
188+ in ''
91189 gappsWrapperArgs+=(
92190 --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
93191 # See programs reached with fu_common_find_program_in_path in source
@@ -128,6 +226,10 @@ in stdenv.mkDerivation rec {
128226
129227 FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
130228
229+ # error: “PolicyKit files are missing”
230+ # https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428
231+ PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions";
232+
131233 # TODO: wrapGAppsHook wraps efi capsule even though it is not elf
132234 dontWrapGApps = true;
133235 # so we need to wrap the executables manually
@@ -157,11 +259,15 @@ in stdenv.mkDerivation rec {
157259 "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service"
158260 "pki/fwupd-metadata/LVFS-CA.pem"
159261 ];
262+
263+ tests = {
264+ installedTests = nixosTests.fwupd;
265+ };
160266 };
161267
162268 meta = with stdenv.lib; {
163269 homepage = https://fwupd.org/;
164− maintainers = with maintainers; [];
270+ maintainers = with maintainers; [ jtojnar ];
165271 license = [ licenses.gpl2 ];
166272 platforms = platforms.linux;
167273 };