diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-08-28 14:37:44 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-08-28 17:14:43 +0200 |
commit | b0a142e0ae59d4f6db44be137b01914c526cd0e1 (patch) | |
tree | b3c3b7c642275a12440302815ed94366d4e843ac /pkgs/os-specific/linux/firmware | |
parent | d3f65267504c8aa2a9da11cfe5e884a30afd8736 (diff) | |
download | nixpkgs-b0a142e0ae59d4f6db44be137b01914c526cd0e1.tar nixpkgs-b0a142e0ae59d4f6db44be137b01914c526cd0e1.tar.gz nixpkgs-b0a142e0ae59d4f6db44be137b01914c526cd0e1.tar.bz2 nixpkgs-b0a142e0ae59d4f6db44be137b01914c526cd0e1.tar.lz nixpkgs-b0a142e0ae59d4f6db44be137b01914c526cd0e1.tar.xz nixpkgs-b0a142e0ae59d4f6db44be137b01914c526cd0e1.tar.zst nixpkgs-b0a142e0ae59d4f6db44be137b01914c526cd0e1.zip |
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
Diffstat (limited to 'pkgs/os-specific/linux/firmware')
-rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 02711ffe968..c688d8c6ab3 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -49,6 +49,7 @@ , efibootmgr , flashrom , tpm2-tools +, nixosTests }: let @@ -75,18 +76,20 @@ let # only redfish for x86_64 haveRedfish = stdenv.isx86_64; - # Currently broken on Aarch64 - haveFlashrom = isx86; + # # Currently broken on Aarch64 + # haveFlashrom = isx86; + # Experimental in 1.2.10 + haveFlashrom = false; in stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.2.8"; + version = "1.2.10"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "0qbvq52c0scn1h99i1rf2la6rrhckin6gb02k7l0v3g07mxs20wc"; + sha256 = "0inngs7i48akm9c7fmdsf9zjif595rkaba69rl76jfwfv8r21vjb"; }; outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ]; @@ -152,7 +155,12 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs . + patchShebangs \ + libfwupd/generate-version-script.py \ + meson_post_install.sh \ + po/make-images \ + po/make-images.sh \ + po/test-deps # we cannot use placeholder in substituteAll # https://github.com/NixOS/nix/issues/1846 @@ -218,6 +226,10 @@ stdenv.mkDerivation rec { FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + # error: “PolicyKit files are missing” + # https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428 + PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions"; + # TODO: wrapGAppsHook wraps efi capsule even though it is not elf dontWrapGApps = true; # so we need to wrap the executables manually @@ -247,11 +259,15 @@ stdenv.mkDerivation rec { "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service" "pki/fwupd-metadata/LVFS-CA.pem" ]; + + tests = { + installedTests = nixosTests.fwupd; + }; }; meta = with stdenv.lib; { homepage = https://fwupd.org/; - maintainers = with maintainers; []; + maintainers = with maintainers; [ jtojnar ]; license = [ licenses.gpl2 ]; platforms = platforms.linux; }; |