movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-09-17 00:02:15 +00:00 • committed by GitHub
commit 2ad7b248e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
60 changed files with 404 additions and 365 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/misc/ids.nix
View file

@ -201,7 +201,7 @@ in
peerflix = 163;
#chronos = 164; # removed 2020-08-15
gitlab = 165;
tox-bootstrapd = 166;
# tox-bootstrapd = 166; removed 2021-09-15
cadvisor = 167;
nylon = 168;
#apache-kafka = 169;# dynamically allocated as of 2021-09-03

12
nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json
View file

@ -51,6 +51,18 @@
{
"name": "JBL LIVE650BTNC"
},
{
"name": "Motorola DC800",
"no-features": [
"sbc-xq"
]
},
{
"name": "Motorola S305",
"no-features": [
"sbc-xq"
]
},
{
"name": "Soundcore Life P2-L",
"no-features": [

21
nixos/modules/services/networking/tox-bootstrapd.nix
View file

@ -3,15 +3,15 @@
with lib;
let
home = "/var/lib/tox-bootstrapd";
PIDFile = "${home}/pid";
WorkingDirectory = "/var/lib/tox-bootstrapd";
PIDFile = "${WorkingDirectory}/pid";
pkg = pkgs.libtoxcore;
cfg = config.services.toxBootstrapd;
cfgFile = builtins.toFile "tox-bootstrapd.conf"
''
port = ${toString cfg.port}
keys_file_path = "${home}/keys"
keys_file_path = "${WorkingDirectory}/keys"
pid_file_path = "${PIDFile}"
${cfg.extraConfig}
'';
@ -36,7 +36,7 @@ in
keysFile = mkOption {
type = types.str;
default = "${home}/keys";
default = "${WorkingDirectory}/keys";
description = "Node key file.";
};
@ -56,13 +56,6 @@ in
config = mkIf config.services.toxBootstrapd.enable {
users.users.tox-bootstrapd =
{ uid = config.ids.uids.tox-bootstrapd;
description = "Tox bootstrap daemon user";
inherit home;
createHome = true;
};
systemd.services.tox-bootstrapd = {
description = "Tox DHT bootstrap daemon";
after = [ "network.target" ];
@ -70,8 +63,10 @@ in
serviceConfig =
{ ExecStart = "${pkg}/bin/tox-bootstrapd --config=${cfgFile}";
Type = "forking";
inherit PIDFile;
User = "tox-bootstrapd";
inherit PIDFile WorkingDirectory;
AmbientCapabilities = ["CAP_NET_BIND_SERVICE"];
DynamicUser = true;
StateDirectory = "tox-bootstrapd";
};
};