movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

bluez: 5.79 -> 5.80

Browse source
This commit is contained in:
K900 2025-03-23 22:36:15 +03:00
parent f0313503cd
commit ce2459e27e
1 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

42
pkgs/by-name/bl/bluez/package.nix
View file

@ -6,7 +6,6 @@
docutils, docutils,
ell, ell,
enableExperimental ? false, enableExperimental ? false,
fetchpatch,
fetchurl, fetchurl,
glib, glib,
json_c, json_c,
@ -28,31 +27,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "bluez"; pname = "bluez";
version = "5.79"; version = "5.80";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz"; url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz";
hash = "sha256-QWSlMDqfcccPSMA/9gvjQjG1aNk6mtXnmSjTTmqg6oo="; hash = "sha256-pNC8oymWkfBtW9l3O4VGOCBKUaUCbEKwrX8cbPFrRZo=";
}; };
patches =
[
(fetchpatch {
name = "musl.patch";
url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9d69dba21f1e46b34cdd8ae27fec11d0803907ee";
hash = "sha256-yMXPRPK8aT+luVoXNxx9zIa4c6E0BKYKS55DCfr8EQ0=";
})
]
++ lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64)
# Disable one failing test with musl libc, also seen by alpine
# https://github.com/bluez/bluez/issues/726
(
fetchurl {
url = "https://git.alpinelinux.org/aports/plain/main/bluez/disable_aics_unit_testcases.patch?id=8e96f7faf01a45f0ad8449c1cd825db63a8dfd48";
hash = "sha256-1PJkipqBO3qxxOqRFQKfpWlne1kzTCgtnTFYI1cFQt4=";
}
);
buildInputs = [ buildInputs = [
alsa-lib alsa-lib
dbus dbus
@ -87,12 +68,21 @@ stdenv.mkDerivation (finalAttrs: {
# Disable some tests: # Disable some tests:
# - test-mesh-crypto depends on the following kernel settings: # - test-mesh-crypto depends on the following kernel settings:
# CONFIG_CRYPTO_[USER|USER_API|USER_API_AEAD|USER_API_HASH|AES|CCM|AEAD|CMAC] # CONFIG_CRYPTO_[USER|USER_API|USER_API_AEAD|USER_API_HASH|AES|CCM|AEAD|CMAC]
# - test-vcp is flaky (?), see:
# - https://github.com/bluez/bluez/issues/683
# - https://github.com/bluez/bluez/issues/726
'' ''
if [[ ! -f unit/test-mesh-crypto.c ]]; then skipTest() {
echo "unit/test-mesh-crypto.c no longer exists" if [[ ! -f unit/$1.c ]]; then
false echo "unit/$1.c no longer exists"
fi false
echo 'int main() { return 77; }' > unit/test-mesh-crypto.c fi
echo 'int main() { return 77; }' > unit/$1.c
}
skipTest test-mesh-crypto
skipTest test-vcp
''; '';
configureFlags = [ configureFlags = [