pyrox.dev
Merge pull request #116435 from jtojnar/fwupd-1.5.7
fwupd: 1.5.5 → 1.5.7
authored by Jan Tojnar and committed by GitHub ca4e26d1 d687129d
+12
-10
pkgs/os-specific/linux/firmware/fwupd/default.nix
+12
-10
pkgs/os-specific/linux/firmware/fwupd/default.nix
···
91
92
self = stdenv.mkDerivation rec {
93
pname = "fwupd";
94
-
# A regression is present in https://github.com/fwupd/fwupd/commit/fde4b1676a2c64e70bebd88f7720307c62635654
95
-
# released with 1.5.6.
96
-
# Fix for the regression: https://github.com/fwupd/fwupd/pull/2902
97
-
# Maintainer says a new release is to be expected in a few days:
98
-
# https://twitter.com/hughsient/status/1362476792297185289
99
-
# In the mean time, please do not release 1.5.6 and go strait to 1.5.7
100
-
version = "1.5.5";
101
102
# libfwupd goes to lib
103
# daemon, plug-ins and libfwupdplugin go to out
···
106
107
src = fetchurl {
108
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
109
-
sha256 = "0c2m9qz1g7zxqc6w90w9hksf8y9hvlh0vyvx06q01x893j5hzxh6";
110
};
111
112
patches = [
···
189
"-Defi-libdir=${gnu-efi}/lib"
190
"-Defi-ldsdir=${gnu-efi}/lib"
191
"-Defi-includedir=${gnu-efi}/include/efi"
192
"--localstatedir=/var"
193
"--sysconfdir=/etc"
194
"-Dsysconfdir_install=${placeholder "out"}/etc"
···
236
contrib/get-version.py \
237
contrib/generate-version-script.py \
238
meson_post_install.sh \
239
po/make-images \
240
po/make-images.sh \
241
po/test-deps
···
250
testFw = fetchFromGitHub {
251
owner = "fwupd";
252
repo = "fwupd-test-firmware";
253
-
rev = "42b62c62dc85ecfb8e38099fe5de0625af87a722";
254
-
sha256 = "XUpxE003DZSeLJMtyV5UN5CNHH89/nEVKpCbMStm91Q=";
255
};
256
in ''
257
# These files have weird licenses so they are shipped separately.
···
311
# DisabledPlugins key in fwupd/daemon.conf
312
defaultDisabledPlugins = [
313
"test"
314
"invalid"
315
];
316
···
91
92
self = stdenv.mkDerivation rec {
93
pname = "fwupd";
94
+
version = "1.5.7";
95
96
# libfwupd goes to lib
97
# daemon, plug-ins and libfwupdplugin go to out
···
100
101
src = fetchurl {
102
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
103
+
sha256 = "16isrrv6zhdgccbfnz7km5g1cnvfnip7aiidkfhf5dlnrnyb2sxh";
104
};
105
106
patches = [
···
183
"-Defi-libdir=${gnu-efi}/lib"
184
"-Defi-ldsdir=${gnu-efi}/lib"
185
"-Defi-includedir=${gnu-efi}/include/efi"
186
+
"-Defi_sbat_distro_id=nixos"
187
+
"-Defi_sbat_distro_summary=NixOS"
188
+
"-Defi_sbat_distro_pkgname=fwupd"
189
+
"-Defi_sbat_distro_version=${version}"
190
+
"-Defi_sbat_distro_url=https://search.nixos.org/packages?channel=unstable&show=fwupd&from=0&size=50&sort=relevance&query=fwupd"
191
"--localstatedir=/var"
192
"--sysconfdir=/etc"
193
"-Dsysconfdir_install=${placeholder "out"}/etc"
···
235
contrib/get-version.py \
236
contrib/generate-version-script.py \
237
meson_post_install.sh \
238
+
plugins/uefi-capsule/efi/generate_sbat.py \
239
+
plugins/uefi-capsule/efi/generate_binary.py \
240
po/make-images \
241
po/make-images.sh \
242
po/test-deps
···
251
testFw = fetchFromGitHub {
252
owner = "fwupd";
253
repo = "fwupd-test-firmware";
254
+
rev = "c13bfb26cae5f4f115dd4e08f9f00b3cb9acc25e";
255
+
sha256 = "US81i7mtLEe85KdWz5r+fQTk61IhqjVkzykBaBPuKL4=";
256
};
257
in ''
258
# These files have weird licenses so they are shipped separately.
···
312
# DisabledPlugins key in fwupd/daemon.conf
313
defaultDisabledPlugins = [
314
"test"
315
+
"test_ble"
316
"invalid"
317
];
318