bluez: add tools to output that we were building anyway #39813

peterhoeg · 2018-05-01T14:06:36Z

Motivation for this change

A bunch of the old bluez tools have been deprecated (hciconfig, hcitool) but we weren't distributing their (experimental) replacements making certain bluetooth operations rather difficult.

This PR just adds in what we were building anyway (lifted from Arch Linux) + a few minor style cleanups.

Cc: @globin @fpletz

I haven't run nox-review as it wants to build the ~~~entire KDE suite~~~ a ton of packages.

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

GrahamcOfBorg · 2018-05-01T14:19:32Z

Success on x86_64-linux (full log)

Attempted: bluez

Partial log (click to expand)

/nix/store/ac1mr87dfjdqnn9g32ah0jav4zk45v6p-bluez-5.49-test/test/.list-devices-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
/nix/store/ac1mr87dfjdqnn9g32ah0jav4zk45v6p-bluez-5.49-test/test/.test-sap-server-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
/nix/store/ac1mr87dfjdqnn9g32ah0jav4zk45v6p-bluez-5.49-test/test/.simple-agent-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
/nix/store/ac1mr87dfjdqnn9g32ah0jav4zk45v6p-bluez-5.49-test/test/.simple-endpoint-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
/nix/store/ac1mr87dfjdqnn9g32ah0jav4zk45v6p-bluez-5.49-test/test/.test-hfp-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
/nix/store/ac1mr87dfjdqnn9g32ah0jav4zk45v6p-bluez-5.49-test/test/.test-network-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
/nix/store/ac1mr87dfjdqnn9g32ah0jav4zk45v6p-bluez-5.49-test/test/.opp-client-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
/nix/store/ac1mr87dfjdqnn9g32ah0jav4zk45v6p-bluez-5.49-test/test/.simple-player-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
checking for references to /build in /nix/store/ac1mr87dfjdqnn9g32ah0jav4zk45v6p-bluez-5.49-test...
/nix/store/a3jw8vc44p72cl9w5si27jw8gx7zpwdl-bluez-5.49

GrahamcOfBorg · 2018-05-01T14:20:28Z

Success on aarch64-linux (full log)

Attempted: bluez

Partial log (click to expand)

/nix/store/0rfm4kl0p5p2a7cs9l5rcgmnb6n3afm9-bluez-5.49-test/test/.list-devices-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
/nix/store/0rfm4kl0p5p2a7cs9l5rcgmnb6n3afm9-bluez-5.49-test/test/.test-sap-server-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
/nix/store/0rfm4kl0p5p2a7cs9l5rcgmnb6n3afm9-bluez-5.49-test/test/.simple-agent-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
/nix/store/0rfm4kl0p5p2a7cs9l5rcgmnb6n3afm9-bluez-5.49-test/test/.simple-endpoint-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
/nix/store/0rfm4kl0p5p2a7cs9l5rcgmnb6n3afm9-bluez-5.49-test/test/.test-hfp-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
/nix/store/0rfm4kl0p5p2a7cs9l5rcgmnb6n3afm9-bluez-5.49-test/test/.test-network-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
/nix/store/0rfm4kl0p5p2a7cs9l5rcgmnb6n3afm9-bluez-5.49-test/test/.opp-client-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
/nix/store/0rfm4kl0p5p2a7cs9l5rcgmnb6n3afm9-bluez-5.49-test/test/.simple-player-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
checking for references to /build in /nix/store/0rfm4kl0p5p2a7cs9l5rcgmnb6n3afm9-bluez-5.49-test...
/nix/store/50b4vkhl62x6y02j7jz0jigw6nkr9dbs-bluez-5.49

matthewbauer · 2018-05-01T17:13:25Z

pkgs/os-specific/linux/bluez/default.nix

@@ -73,14 +76,21 @@ stdenv.mkDerivation rec {
    # Add extra configuration
    mkdir $out/etc/bluetooth
    ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf
+
+    # Add missing tools, ref https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/bluez


This doesn't seem like something we should be doing- but I guess if Arch thinks its a good idea. Could you try doing this instead though:

substituteInPlace Makefile.tools --replace noinst_PROGRAMS bin_PROGRAMS

Not sure if it will work but IMO much cleaner than the for loop.

This doesn't seem like something we should be doing

Why not? Some of these tools might be experimental but I fail to see why making them available is bad in any way. It's not a change of behaviour.

The substituteInPlace didn't do the trick unfortunately (it would indeed have been much cleaner).

I guess the main question is: why didn't the maintainers have these installed by default? It could just be a bug but there might also be a valid reason. Definitely not a blocker for this - I am just skeptical of custom install scripts in general.

Based on my reading of the ML archives, the bluez guys deprecated the existing tools before having the replacements ready and while these tools are experimental, they are needed for certain tasks (example: toggle an adapter to LE mode only) that were previously the responsibility of hciconfig and hcitool.

The existence of them doesn't mean that the bluetooth daemon starts doing stuff differently so everything should work as normal but we now make low-level manipulation of the bluetooth stack/adapters possible again.

GrahamcOfBorg · 2018-05-01T23:49:48Z

Success on aarch64-linux (full log)

Attempted: bluez

Partial log (click to expand)

/nix/store/gfkqd7aqlcz13jhwfm08f3aw2y3r3dp0-bluez-5.49-test/test/.list-devices-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
/nix/store/gfkqd7aqlcz13jhwfm08f3aw2y3r3dp0-bluez-5.49-test/test/.test-sap-server-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
/nix/store/gfkqd7aqlcz13jhwfm08f3aw2y3r3dp0-bluez-5.49-test/test/.simple-agent-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
/nix/store/gfkqd7aqlcz13jhwfm08f3aw2y3r3dp0-bluez-5.49-test/test/.simple-endpoint-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
/nix/store/gfkqd7aqlcz13jhwfm08f3aw2y3r3dp0-bluez-5.49-test/test/.test-hfp-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
/nix/store/gfkqd7aqlcz13jhwfm08f3aw2y3r3dp0-bluez-5.49-test/test/.test-network-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
/nix/store/gfkqd7aqlcz13jhwfm08f3aw2y3r3dp0-bluez-5.49-test/test/.opp-client-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
/nix/store/gfkqd7aqlcz13jhwfm08f3aw2y3r3dp0-bluez-5.49-test/test/.simple-player-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/ydxpyrgfqj6z7lqnv059566l7kpn35j3-python-2.7.14/bin/python"
checking for references to /build in /nix/store/gfkqd7aqlcz13jhwfm08f3aw2y3r3dp0-bluez-5.49-test...
/nix/store/dgwlfhsh326sxp73b5bn4jlwphjm3wch-bluez-5.49

GrahamcOfBorg · 2018-05-01T23:51:54Z

Success on x86_64-linux (full log)

Attempted: bluez

Partial log (click to expand)

/nix/store/78qy6zhvby6x3k68h0y8wcxzlxn4460j-bluez-5.49-test/test/.list-devices-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
/nix/store/78qy6zhvby6x3k68h0y8wcxzlxn4460j-bluez-5.49-test/test/.test-sap-server-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
/nix/store/78qy6zhvby6x3k68h0y8wcxzlxn4460j-bluez-5.49-test/test/.simple-agent-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
/nix/store/78qy6zhvby6x3k68h0y8wcxzlxn4460j-bluez-5.49-test/test/.simple-endpoint-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
/nix/store/78qy6zhvby6x3k68h0y8wcxzlxn4460j-bluez-5.49-test/test/.test-hfp-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
/nix/store/78qy6zhvby6x3k68h0y8wcxzlxn4460j-bluez-5.49-test/test/.test-network-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
/nix/store/78qy6zhvby6x3k68h0y8wcxzlxn4460j-bluez-5.49-test/test/.opp-client-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
/nix/store/78qy6zhvby6x3k68h0y8wcxzlxn4460j-bluez-5.49-test/test/.simple-player-wrapped: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
checking for references to /build in /nix/store/78qy6zhvby6x3k68h0y8wcxzlxn4460j-bluez-5.49-test...
/nix/store/w56d7v41x9vgzs0c56kf5crm78cnr7gs-bluez-5.49

peterhoeg · 2018-05-04T08:47:40Z

Cc @andir

andir · 2018-05-05T23:56:15Z

Thanks for working on this (@peterhoeg). I am currently building things and running a nox-review over night. It looks pretty cleanish. As Matthew already mentioned substituteInPlace would have be nicer but if that is not a working solution I am fine with the proposed one.

I'll give it some verification during the coming day. I expect no major breakage since we are just adding a few files.

peterhoeg · 2018-05-07T01:50:02Z

It should be quite safe considering we're just adding a few binaries but not otherwise changing the build.

peterhoeg · 2018-05-09T06:28:05Z

@andir, you're good with this?

andir · 2018-05-10T13:57:28Z

@peterhoeg It looks alright. I didn't get to testing this so far. If you (both?) tested that I'm fine with it.

peterhoeg · 2018-05-10T14:14:34Z

My interest was in btmgmt which works here - I haven't tested that it otherwise works as it will require a massive rebuild of packages here.

andir · 2018-05-10T15:28:14Z

I backported it to my 18.03 laptop that I've with me and will try to test the bluetooth stuff once my rebuild is finished.

andir

LGTM. I was able to pair with a new BT device.

Also the new tools seem to work for me.

peterhoeg requested review from fpletz and globin May 1, 2018 14:07

GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 101-500 labels May 1, 2018

matthewbauer reviewed May 1, 2018

View reviewed changes

bluez: add tools to output that we were building anyway

4c66aa8

peterhoeg force-pushed the f/bluez branch from cb7992e to 4c66aa8 Compare May 1, 2018 23:35

jtojnar mentioned this pull request May 5, 2018

Error while starting bluetooth service #39937

Closed

matthewbauer approved these changes May 9, 2018

View reviewed changes

andir approved these changes May 10, 2018

View reviewed changes

peterhoeg merged commit 10c9ec6 into NixOS:master May 10, 2018

peterhoeg deleted the f/bluez branch May 10, 2018 23:15

peterhoeg restored the f/bluez branch May 11, 2018 00:52

peterhoeg deleted the f/bluez branch October 8, 2018 01:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bluez: add tools to output that we were building anyway #39813

bluez: add tools to output that we were building anyway #39813

peterhoeg commented May 1, 2018 •

edited

Loading

GrahamcOfBorg commented May 1, 2018

GrahamcOfBorg commented May 1, 2018

matthewbauer May 1, 2018

peterhoeg May 1, 2018 •

edited

Loading

matthewbauer May 7, 2018

peterhoeg May 7, 2018

GrahamcOfBorg commented May 1, 2018

GrahamcOfBorg commented May 1, 2018

peterhoeg commented May 4, 2018

andir commented May 5, 2018 •

edited

Loading

peterhoeg commented May 7, 2018

peterhoeg commented May 9, 2018

andir commented May 10, 2018

peterhoeg commented May 10, 2018

andir commented May 10, 2018

andir left a comment

bluez: add tools to output that we were building anyway #39813

bluez: add tools to output that we were building anyway #39813

Conversation

peterhoeg commented May 1, 2018 • edited Loading

Motivation for this change

Things done

GrahamcOfBorg commented May 1, 2018

GrahamcOfBorg commented May 1, 2018

matthewbauer May 1, 2018

Choose a reason for hiding this comment

peterhoeg May 1, 2018 • edited Loading

Choose a reason for hiding this comment

matthewbauer May 7, 2018

Choose a reason for hiding this comment

peterhoeg May 7, 2018

Choose a reason for hiding this comment

GrahamcOfBorg commented May 1, 2018

GrahamcOfBorg commented May 1, 2018

peterhoeg commented May 4, 2018

andir commented May 5, 2018 • edited Loading

peterhoeg commented May 7, 2018

peterhoeg commented May 9, 2018

andir commented May 10, 2018

peterhoeg commented May 10, 2018

andir commented May 10, 2018

andir left a comment

Choose a reason for hiding this comment

peterhoeg commented May 1, 2018 •

edited

Loading

peterhoeg May 1, 2018 •

edited

Loading

andir commented May 5, 2018 •

edited

Loading