movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-08 11:35:37 +03:00
Code Activity

Merge branch 'staging-next' into staging

Browse source 
In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
This commit is contained in:
Jan Tojnar 2021-04-08 17:14:31 +02:00
commit 625ce6c7f6
112 changed files with 2577 additions and 1772 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/hardware/video/amdgpu.nix
View file

@ -1,9 +0,0 @@
{ config, lib, ... }:
with lib;
{
config = mkIf (elem "amdgpu" config.services.xserver.videoDrivers) {
boot.blacklistedKernelModules = [ "radeon" ];
};
}

1
nixos/modules/module-list.nix
View file

@ -74,7 +74,6 @@
./hardware/sata.nix
./hardware/wooting.nix
./hardware/uinput.nix
./hardware/video/amdgpu.nix
./hardware/video/amdgpu-pro.nix
./hardware/video/ati.nix
./hardware/video/capture/mwprocapture.nix

8
nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json
View file

@ -8,7 +8,13 @@
}
],
"actions": {
"update-props": {}
"update-props": {
"bluez5.reconnect-profiles": [
"hfp_hf",
"hsp_hs",
"a2dp_sink"
]
}
}
},
{

2
nixos/modules/services/misc/home-assistant.nix
View file

@ -63,7 +63,7 @@ let
};
in {
meta.maintainers = with maintainers; [ ];
meta.maintainers = teams.home-assistant.members;
options.services.home-assistant = {
enable = mkEnableOption "Home Assistant";

1
nixos/modules/services/networking/tailscale.nix
View file

@ -28,6 +28,7 @@ in {
systemd.packages = [ cfg.package ];
systemd.services.tailscaled = {
wantedBy = [ "multi-user.target" ];
path = [ pkgs.openresolv ];
serviceConfig.Environment = "PORT=${toString cfg.port}";
};
};