diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/os-specific/linux/bluez | |
parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
download | nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.zip |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/os-specific/linux/bluez')
-rw-r--r-- | pkgs/os-specific/linux/bluez/bluez5.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 96c5af74db3..20fa830e320 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.36"; + name = "bluez-5.37"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "1wkqwmi5krr37mxcqqlp5m2xnw7vw70v3ww7j09vvlskxcdflhx3"; + sha256 = "c14ba9ddcb0055522073477b8fd8bf1ddf5d219e75fdfd4699b7e0ce5350d6b0"; }; pythonPath = with pythonPackages; |