From 19f42620ef9158262d2e67948aa38165825a04b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 26 Sep 2019 08:22:02 +0200 Subject: [PATCH 1/2] bluez: 5.50 -> 5.51 Also add new configuration flag options and enable them for the bluezFull package by default. --- .../bluez-5.37-obexd_without_systemd-1.patch | 61 ------------------- pkgs/os-specific/linux/bluez/default.nix | 43 +++++++------ pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 26 insertions(+), 84 deletions(-) delete mode 100644 pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch diff --git a/pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch b/pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch deleted file mode 100644 index 749787c5b3a..00000000000 --- a/pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch +++ /dev/null @@ -1,61 +0,0 @@ -Submitted By: Armin K. -Date: 2013-04-29 -Initial Package Version: 5.17 -Upstream Status: unknown -Origin: Arch Linux (Giovanni Campagna) -Description: Allow using obexd without systemd in the user session - -Not all sessions run systemd --user (actually, the majority -doesn't), so the dbus daemon must be able to spawn obexd -directly, and to do so it needs the full path of the daemon. ---- - Makefile.obexd | 4 ++-- - obexd/src/org.bluez.obex.service | 4 ---- - obexd/src/org.bluez.obex.service.in | 4 ++++ - 3 files changed, 6 insertions(+), 6 deletions(-) - delete mode 100644 obexd/src/org.bluez.obex.service - create mode 100644 obexd/src/org.bluez.obex.service.in - -diff --git a/Makefile.obexd b/Makefile.obexd -index 3760867..142e7c3 100644 ---- a/Makefile.obexd -+++ b/Makefile.obexd -@@ -2,12 +2,12 @@ - if SYSTEMD - systemduserunitdir = @SYSTEMD_USERUNITDIR@ - systemduserunit_DATA = obexd/src/obex.service -+endif - - dbussessionbusdir = @DBUS_SESSIONBUSDIR@ - dbussessionbus_DATA = obexd/src/org.bluez.obex.service --endif - --EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service -+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in - - obex_plugindir = $(libdir)/obex/plugins - -diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service -deleted file mode 100644 -index a538088..0000000 ---- a/obexd/src/org.bluez.obex.service -+++ /dev/null -@@ -1,4 +0,0 @@ --[D-BUS Service] --Name=org.bluez.obex --Exec=/bin/false --SystemdService=dbus-org.bluez.obex.service -diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in -new file mode 100644 -index 0000000..9c815f2 ---- /dev/null -+++ b/obexd/src/org.bluez.obex.service.in -@@ -0,0 +1,4 @@ -+[D-BUS Service] -+Name=org.bluez.obex -+Exec=@libexecdir@/obexd -+SystemdService=dbus-org.bluez.obex.service --- -1.8.3.1 - - diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index cca3674bdd1..bc33ddd4c9b 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,13 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, - python3, readline, udev, libical, systemd, fetchpatch, - enableWiimote ? false, enableMidi ? false, enableSixaxis ? false }: +{ stdenv, lib, fetchurl, pkgconfig, dbus, glib, alsaLib, + python3, readline, udev, libical, systemd, json_c, + enableHealth ? false, + enableMesh ? false, + enableMidi ? false, + enableNfc ? false, + enableSap ? false, + enableSixaxis ? false, + enableWiimote ? false, +}: stdenv.mkDerivation rec { - name = "bluez-5.50"; + version = "5.51"; + name = "bluez-${version}"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z"; + sha256 = "1fpbsl9kkfq6mn6n0dg4h0il4c7fzhwhn79gh907k5b2kwszpvgb"; }; pythonPath = with python3.pkgs; [ @@ -17,26 +25,12 @@ stdenv.mkDerivation rec { buildInputs = [ dbus glib alsaLib python3 python3.pkgs.wrapPython readline udev libical - ]; + ] ++ lib.optional enableSap json_c; nativeBuildInputs = [ pkgconfig ]; outputs = [ "out" "dev" "test" ]; - patches = [ - ./bluez-5.37-obexd_without_systemd-1.patch - (fetchpatch { - url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=1880b299086659844889cdaf687133aca5eaf102"; - name = "CVE-2018-10910-1.patch"; - sha256 = "17spsxza27gif8jpxk7360ynvwii1llfdfwg35rwywjjmvww0qj4"; - }) - (fetchpatch { - url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9213ff7642a33aa481e3c61989ad60f7985b9984"; - name = "CVE-2018-10910-2.patch"; - sha256 = "0j7klbhym64yhn86dbsmybqmwx47bviyyhx931izl1p29z2mg8hn"; - }) - ]; - postConfigure = '' substituteInPlace tools/hid2hci.rules \ --replace /sbin/udevadm ${systemd}/bin/udevadm \ @@ -54,9 +48,14 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" "--with-udevdir=${placeholder "out"}/lib/udev" - ] ++ optional enableWiimote [ "--enable-wiimote" ] + ] ++ optional enableHealth [ "--enable-health" ] + ++ optional enableMesh [ "--enable-mesh" ] ++ optional enableMidi [ "--enable-midi" ] - ++ optional enableSixaxis [ "--enable-sixaxis" ]); + ++ optional enableNfc [ "--enable-nfc" ] + ++ optional enableSap [ "--enable-sap" ] + ++ optional enableSixaxis [ "--enable-sixaxis" ] + ++ optional enableWiimote [ "--enable-wiimote" ] + ); # Work around `make install' trying to create /var/lib/bluetooth. installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 488fdb046cd..71e2ed09010 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15853,9 +15853,13 @@ in bluez = bluez5; bluezFull = bluez.override { - enableWiimote = true; + enableHealth = true; + enableMesh = true; enableMidi = true; + enableNfc = true; + enableSap = true; enableSixaxis = true; + enableWiimote = true; }; inherit (python3Packages) bedup; From 83655d69937f6d1b62e8cc791cea27026bd21249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Sun, 8 Dec 2019 20:53:49 +0100 Subject: [PATCH 2/2] bluez: 5.51 -> 5.52, aliased bluezFull to bluez --- pkgs/os-specific/linux/bluez/default.nix | 75 ++++++++++++++---------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 16 +---- 3 files changed, 47 insertions(+), 45 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index bc33ddd4c9b..8024adeac64 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,43 +1,58 @@ -{ stdenv, lib, fetchurl, pkgconfig, dbus, glib, alsaLib, - python3, readline, udev, libical, systemd, json_c, - enableHealth ? false, - enableMesh ? false, - enableMidi ? false, - enableNfc ? false, - enableSap ? false, - enableSixaxis ? false, - enableWiimote ? false, +{ stdenv +, lib +, fetchurl +, alsaLib +, dbus +, glib +, json_c +, libical +, pkgconfig +, python3 +, readline +, systemd +, udev }: stdenv.mkDerivation rec { - version = "5.51"; - name = "bluez-${version}"; + pname = "bluez"; + version = "5.52"; src = fetchurl { - url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "1fpbsl9kkfq6mn6n0dg4h0il4c7fzhwhn79gh907k5b2kwszpvgb"; + url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; + sha256 = "02jng21lp6fb3c2bh6vf9y7cj4gaxwk29dfc32ncy0lj0gi4q57p"; }; pythonPath = with python3.pkgs; [ - dbus-python pygobject2 pygobject3 recursivePthLoader + dbus-python + pygobject3 + recursivePthLoader ]; buildInputs = [ - dbus glib alsaLib python3 python3.pkgs.wrapPython - readline udev libical - ] ++ lib.optional enableSap json_c; + alsaLib + dbus + glib + json_c + libical + python3 + readline + udev + ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + python3.pkgs.wrapPython + ]; outputs = [ "out" "dev" "test" ]; - postConfigure = '' + postPatch = '' substituteInPlace tools/hid2hci.rules \ --replace /sbin/udevadm ${systemd}/bin/udevadm \ --replace "hid2hci " "$out/lib/udev/hid2hci " ''; - configureFlags = (with stdenv.lib; [ + configureFlags = [ "--localstatedir=/var" "--enable-library" "--enable-cups" @@ -48,19 +63,19 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" "--with-udevdir=${placeholder "out"}/lib/udev" - ] ++ optional enableHealth [ "--enable-health" ] - ++ optional enableMesh [ "--enable-mesh" ] - ++ optional enableMidi [ "--enable-midi" ] - ++ optional enableNfc [ "--enable-nfc" ] - ++ optional enableSap [ "--enable-sap" ] - ++ optional enableSixaxis [ "--enable-sixaxis" ] - ++ optional enableWiimote [ "--enable-wiimote" ] - ); + "--enable-health" + "--enable-mesh" + "--enable-midi" + "--enable-nfc" + "--enable-sap" + "--enable-sixaxis" + "--enable-wiimote" + ]; # Work around `make install' trying to create /var/lib/bluetooth. - installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; + installFlags = [ "statedir=$(TMPDIR)/var/lib/bluetooth" ]; - makeFlags = "rulesdir=${placeholder "out"}/lib/udev/rules.d"; + makeFlags = [ "rulesdir=${placeholder "out"}/lib/udev/rules.d" ]; postInstall = '' mkdir -p $test/{bin,test} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cc92b56da57..b1dd739fcea 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -48,6 +48,7 @@ mapAliases ({ bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 beegfs = throw "beegfs has been removed."; # added 2019-11-24 + bluezFull = bluez; # Added 2019-12-03 bridge_utils = bridge-utils; # added 2015-02-20 bro = zeek; # added 2019-09-29 btrfsProgs = btrfs-progs; # added 2016-01-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71e2ed09010..c67aa54fe86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15852,16 +15852,6 @@ in bluez = bluez5; - bluezFull = bluez.override { - enableHealth = true; - enableMesh = true; - enableMidi = true; - enableNfc = true; - enableSap = true; - enableSixaxis = true; - enableWiimote = true; - }; - inherit (python3Packages) bedup; bolt = callPackage ../os-specific/linux/bolt { }; @@ -25319,11 +25309,7 @@ in xteddy = callPackage ../applications/misc/xteddy { }; - xwiimote = callPackage ../misc/drivers/xwiimote { - bluez = pkgs.bluez5.override { - enableWiimote = true; - }; - }; + xwiimote = callPackage ../misc/drivers/xwiimote { }; xzoom = callPackage ../tools/X11/xzoom {};