Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bluez: 5.75 → 5.76 #322127

Merged
merged 2 commits into from
Jul 7, 2024
+11 −4
Merged

bluez: 5.75 → 5.76 #322127

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d53d43
bluez: 5.75 → 5.76
szaffarano Jun 24, 2024
d0eebe8
bluez: fix hid devices
SuperSandro2000 Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions pkgs/by-name/bl/bluez/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
, docutils
, ell
, enableExperimental ? false
, fetchpatch
, fetchurl
, glib
, json_c
Expand All @@ -18,17 +19,23 @@

stdenv.mkDerivation (finalAttrs: {
pname = "bluez";
version = "5.75";
version = "5.76";

src = fetchurl {
url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz";
hash = "sha256-mIyzxFUfbjpmdwilePXKn5P8iWUI+Y8IcJvk+KsDPC8=";
hash = "sha256-VeLGRZCa2C2DPELOhewgQ04O8AcJQbHqtz+s3SQLvWM=";
};

patches =
patches = [
# hog-lib: Fix passing wrong parameters to bt_uhid_get_report_reply
(fetchpatch {
url = "https://github.com/bluez/bluez/commit/5ebaeab4164f80539904b9a520d9b7a8307e06e2.patch";
hash = "sha256-f1A8DmRPfm+zid4XMj1zsfcLZ0WTEax3YPbydKZF9RE=";
})
]
# Disable one failing test with musl libc, also seen by alpine
# https://github.com/bluez/bluez/issues/726
lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64)
++ lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any problem in patching unconditionally here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the test specifically fails on musl, we shouldn't really disable it everywhere.

(fetchurl {
url = "https://git.alpinelinux.org/aports/plain/main/bluez/disable_aics_unit_testcases.patch?id=8e96f7faf01a45f0ad8449c1cd825db63a8dfd48";
hash = "sha256-1PJkipqBO3qxxOqRFQKfpWlne1kzTCgtnTFYI1cFQt4=";
Expand Down