diff options
author | R-VdP <141248+R-VdP@users.noreply.github.com> | 2023-02-26 16:39:54 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2023-03-02 12:31:56 +0100 |
commit | 51bcc9df5cbfd5884692cb0f6c2ae62eeb11964e (patch) | |
tree | d6c843b9f2eee89a7550072a1cf71dd9a7c51d3c /pkgs/os-specific | |
parent | e58bdb61c498a524b43e05497f4433f56457bab7 (diff) |
fwupd: 1.8.10 -> 1.8.12
Added pandoc as a native build dependency because it is now required to generate the manpages (see https://www.github.com/fwupd/fwupd/pull/5566). Requires disabling device-tests in our NixOS tests. They require network access to download emulation data. https://github.com/fwupd/fwupd/releases/tag/1.8.11 https://github.com/fwupd/fwupd/releases/tag/1.8.12
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 254bf7a3c8bd1..949a1dcf4f621 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -28,6 +28,7 @@ , ninja , gcab , gnutls +, pandoc , protobufc , python3 , wrapGAppsNoGuiHook @@ -130,9 +131,11 @@ stdenv.mkDerivation (finalAttrs: { # CLI programs go to out outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ]; - src = fetchurl { - url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${finalAttrs.version}.tar.xz"; - hash = "sha256-vvNUidNdhW9xeksjEVnkIR7CZ4oBQizZJRMFtZUq6Ow="; + src = fetchFromGitHub { + owner = "fwupd"; + repo = "fwupd"; + rev = finalAttrs.version; + hash = "sha256-a4F7skyukl4jW3apGi1ie/EcuGlkZoszyZdtLFuJewA="; }; patches = [ @@ -168,6 +171,7 @@ stdenv.mkDerivation (finalAttrs: { valgrind gcab gnutls + pandoc protobufc # for protoc python wrapGAppsNoGuiHook @@ -272,6 +276,15 @@ stdenv.mkDerivation (finalAttrs: { sed -i 's/test(.*)//' libfwupdplugin/meson.build # in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf sed -i "s/get_option('tests')/false/" plugins/redfish/meson.build + + # Device tests use device emulation and need to download emulation data from + # the internet, which does not work on our test VMs. + # It's probably better to disable these tests for NixOS by setting + # the device-tests directory to /dev/null. + # For more info on device emulation, see: + # https://github.com/fwupd/fwupd/blob/eeeac4e9ba8a6513428b456a551bffd95d533e50/docs/device-emulation.md + substituteInPlace data/installed-tests/meson.build \ + --replace "join_paths(datadir, 'fwupd', 'device-tests')" "'/dev/null'" ''; preBuild = '' |