diff options
| author | Tom Fitzhenry <tom@tom-fitzhenry.me.uk> | 2022-02-26 17:53:14 +1100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-03-08 13:29:25 +0100 |
| commit | 413a50ede61e06e17e160417bf743c881a48011e (patch) | |
| tree | cce129506336f248d267cba0218dd85d9e0777b4 /pkgs/os-specific/linux/firmware/fwupd/default.nix | |
| parent | 6896623f630ce8703e2201625eabd9f01dfcc5e0 (diff) | |
| download | nixpkgs-413a50ede61e06e17e160417bf743c881a48011e.tar nixpkgs-413a50ede61e06e17e160417bf743c881a48011e.tar.gz nixpkgs-413a50ede61e06e17e160417bf743c881a48011e.tar.bz2 nixpkgs-413a50ede61e06e17e160417bf743c881a48011e.tar.lz nixpkgs-413a50ede61e06e17e160417bf743c881a48011e.tar.xz nixpkgs-413a50ede61e06e17e160417bf743c881a48011e.tar.zst nixpkgs-413a50ede61e06e17e160417bf743c881a48011e.zip | |
fwupd: 1.7.2 -> 1.7.6
https://github.com/fwupd/fwupd/releases/tag/1.7.3 https://github.com/fwupd/fwupd/releases/tag/1.7.4 https://github.com/fwupd/fwupd/releases/tag/1.7.5 https://github.com/fwupd/fwupd/releases/tag/1.7.6
Diffstat (limited to 'pkgs/os-specific/linux/firmware/fwupd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 077c37a72cb..e11543fe94c 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -12,6 +12,7 @@ , libgudev , polkit , libxmlb +, glib , gusb , sqlite , libarchive @@ -112,7 +113,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.7.2"; + version = "1.7.6"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -121,7 +122,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "sha256-hjLfacO6/Fk4fNy1F8POMaWXoJAm5E9ZB9g4RnG5+DQ="; + sha256 = "sha256-fr4VFKy2iNJknOzDktuSkJTaPwPPyYqcD6zKuwhJEvo="; }; patches = [ @@ -145,6 +146,13 @@ let # EFI capsule is located in fwupd-efi now. ./efi-app-path.patch + + # Drop hard-coded FHS path + # https://github.com/fwupd/fwupd/issues/4360 + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/14cc2e7ee471b66ee2ef54741f4bec1f92204620.patch"; + sha256 = "47682oqE66Y6QKPtN2mYpnb2+TIJFqBgsgx60LmC3FM="; + }) ]; nativeBuildInputs = [ @@ -250,6 +258,9 @@ let contrib/generate-version-script.py \ meson_post_install.sh \ po/test-deps + + substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \ + --replace "gdbus" ${glib.bin}/bin/gdbus ''; preCheck = '' @@ -301,6 +312,7 @@ let passthru = { filesInstalledToEtc = [ "fwupd/daemon.conf" + "fwupd/msr.conf" "fwupd/remotes.d/lvfs-testing.conf" "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" |