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

https://github.com/fwupd/fwupd/blob/1.2.10/data/org.freedesktop.fwupd.metainfo.xml#L35-L81 * adopt the package * libflashrom is disabled by default since it is experimental now. * add installed tests to passthru for easier running * concretize patchShebags * no changes in filesInstalledToEtc

commitb0a142e0ae59d4f6db44be137b01914c526cd0e1 authorJan Tojnar <jtojnar@gmail.com> dateWed 28 Aug 2019, 14:37 (7 years ago) parentd3f6526
1 file changed+22−6
pkgs/os-specific/linux/firmware/fwupd/default.nix+22−6
pkgs/os-specific/linux/firmware/fwupd/default.nix+22−6
@@ -49,6 +49,7 @@
4949, efibootmgr
5050, flashrom
5151, tpm2-tools
52+, nixosTests
5253}:
5354
5455let
@@ -75,18 +76,20 @@ let
7576 # only redfish for x86_64
7677 haveRedfish = stdenv.isx86_64;
7778
78− # Currently broken on Aarch64
79− haveFlashrom = isx86;
79+ # # Currently broken on Aarch64
80+ # haveFlashrom = isx86;
81+ # Experimental in 1.2.10
82+ haveFlashrom = false;
8083
8184in
8285
8386stdenv.mkDerivation rec {
8487 pname = "fwupd";
85− version = "1.2.8";
88+ version = "1.2.10";
8689
8790 src = fetchurl {
8891 url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
89− sha256 = "0qbvq52c0scn1h99i1rf2la6rrhckin6gb02k7l0v3g07mxs20wc";
92+ sha256 = "0inngs7i48akm9c7fmdsf9zjif595rkaba69rl76jfwfv8r21vjb";
9093 };
9194
9295 outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
@@ -152,7 +155,12 @@ stdenv.mkDerivation rec {
152155 ];
153156
154157 postPatch = ''
155− 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
156164
157165 # we cannot use placeholder in substituteAll
158166 # https://github.com/NixOS/nix/issues/1846
@@ -218,6 +226,10 @@ stdenv.mkDerivation rec {
218226
219227 FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
220228
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+
221233 # TODO: wrapGAppsHook wraps efi capsule even though it is not elf
222234 dontWrapGApps = true;
223235 # so we need to wrap the executables manually
@@ -247,11 +259,15 @@ stdenv.mkDerivation rec {
247259 "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service"
248260 "pki/fwupd-metadata/LVFS-CA.pem"
249261 ];
262+
263+ tests = {
264+ installedTests = nixosTests.fwupd;
265+ };
250266 };
251267
252268 meta = with stdenv.lib; {
253269 homepage = https://fwupd.org/;
254− maintainers = with maintainers; [];
270+ maintainers = with maintainers; [ jtojnar ];
255271 license = [ licenses.gpl2 ];
256272 platforms = platforms.linux;
257273 };