diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-06-10 12:47:58 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-06-10 12:47:58 +0000 |
commit | 8b1862365600497def4999c7d32b8a0be87db5df (patch) | |
tree | dfe991cdb4d3df7451815f58dc1c068711fca07f /pkgs | |
parent | 4f6613b267398b116747d441dc268350e60e9cde (diff) | |
download | nixlib-8b1862365600497def4999c7d32b8a0be87db5df.tar nixlib-8b1862365600497def4999c7d32b8a0be87db5df.tar.gz nixlib-8b1862365600497def4999c7d32b8a0be87db5df.tar.bz2 nixlib-8b1862365600497def4999c7d32b8a0be87db5df.tar.lz nixlib-8b1862365600497def4999c7d32b8a0be87db5df.tar.xz nixlib-8b1862365600497def4999c7d32b8a0be87db5df.tar.zst nixlib-8b1862365600497def4999c7d32b8a0be87db5df.zip |
* Updated bluez and obexd.
svn path=/nixpkgs/trunk/; revision=22211
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/bluez/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/bluetooth/obexd/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 31241b3110a1..e125d2738225 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib}: - +{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib }: + assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-4.54"; + name = "bluez-4.65"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.gz"; - sha256 = "1ykhyin06gzim4496sgr89x2yaqh4nrwmnfzrp20kiqfslw6fzlp"; + sha256 = "08j9h2cm0d4ifq8jna9lgfg37b3bncmjgxm9nirdrsr6505542sz"; }; - buildInputs = [pkgconfig dbus.libs glib libusb alsaLib]; + buildInputs = [ pkgconfig dbus.libs glib libusb alsaLib ]; configureFlags = "--localstatedir=/var"; diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix index fbdeecba804f..a07394b02375 100644 --- a/pkgs/tools/bluetooth/obexd/default.nix +++ b/pkgs/tools/bluetooth/obexd/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez }: +{ stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez, libical }: stdenv.mkDerivation rec { - name = "obexd-0.18"; + name = "obexd-0.27"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.gz"; - sha256 = "0a3jpkgg8skiqmy2ksfffmwysji4dnd4h9fc46nj0wcn8n9vvfkd"; + sha256 = "17vlrhn1wgsbdd7f0ggw5nvs657miilhi5jc05pfmi4h18b8710l"; }; - buildInputs = [ pkgconfig glib dbus.libs openobex bluez ]; + buildInputs = [ pkgconfig glib dbus.libs openobex bluez libical ]; meta = { homepage = http://www.bluez.org/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23a07f25bfa3..f0c70f7d56c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1253,7 +1253,7 @@ let }; obexd = import ../tools/bluetooth/obexd { - inherit fetchurl stdenv pkgconfig dbus openobex bluez glib; + inherit fetchurl stdenv pkgconfig dbus openobex bluez glib libical; }; obexfs = import ../tools/bluetooth/obexfs { |