diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
| commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
| tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/tools/bluetooth | |
| parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
| parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
| download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/tools/bluetooth')
4 files changed, 6 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix b/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix index ac64242fe646..63845045c06b 100644 --- a/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix @@ -5,7 +5,6 @@ , cinnamon , gnome , gobject-introspection -, intltool , libnotify , pavucontrol , python3Packages diff --git a/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix b/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix index 5b887222c513..1fa18703459f 100644 --- a/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 -, obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2 +, obex_data_server, xdg-utils, dnsmasq, dhcpcd, iproute2 , gnome, librsvg, wrapGAppsHook, gobject-introspection , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { ]; makeWrapperArgs = [ - "--prefix PATH ':' ${lib.makeBinPath [ dnsmasq dhcp iproute2 ]}" + "--prefix PATH ':' ${lib.makeBinPath [ dnsmasq dhcpcd iproute2 ]}" "--suffix PATH ':' ${lib.makeBinPath [ xdg-utils ]}" ]; diff --git a/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix b/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix index fe39eb66650e..7904e8d5b5d0 100644 --- a/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix @@ -1,17 +1,17 @@ -{ buildGoModule, fetchFromGitHub, lib, stdenv }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "bluetuith"; - version = "0.1.3"; + version = "0.1.6"; src = fetchFromGitHub { owner = "darkhz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xcj+1zSAgizj5e1VY77ma8i9XEuDaebyNZJcFCsNYwI="; + sha256 = "sha256-9fhgld0jhljvDMsRlU+jXsJla2oNjdsFm8TbmmvcoL4="; }; - vendorSha256 = "sha256-vPVfI2MXrUEvx/jlt6A3EEHiyiy4R3FSw3UnF76ZZho="; + vendorHash = "sha256-eSgjIZmD5HL8S1XY0LK2IeWDchjFWBlRq5qriBg7l2U="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/tools/bluetooth/nrfconnect/default.nix b/nixpkgs/pkgs/tools/bluetooth/nrfconnect/default.nix index 8a89f5fc840f..07dc7303a06e 100644 --- a/nixpkgs/pkgs/tools/bluetooth/nrfconnect/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/nrfconnect/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchurl , appimageTools }: |