diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-02-01 12:24:57 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-02-01 12:25:11 +0100 |
| commit | 27fa02d0f19b46920eaf78f74c6b700e31086379 (patch) | |
| tree | 715ce671c4de5ecc52d4d40aa40a0b16cfd2ba00 /nixos/modules/services/hardware | |
| parent | a7e73864b4d7a8dbd9df8e144e612ed1ed5577d4 (diff) | |
| parent | 2c582510dbd6657db54222db0567e7c34bd9bb24 (diff) | |
| download | nixlib-27fa02d0f19b46920eaf78f74c6b700e31086379.tar nixlib-27fa02d0f19b46920eaf78f74c6b700e31086379.tar.gz nixlib-27fa02d0f19b46920eaf78f74c6b700e31086379.tar.bz2 nixlib-27fa02d0f19b46920eaf78f74c6b700e31086379.tar.lz nixlib-27fa02d0f19b46920eaf78f74c6b700e31086379.tar.xz nixlib-27fa02d0f19b46920eaf78f74c6b700e31086379.tar.zst nixlib-27fa02d0f19b46920eaf78f74c6b700e31086379.zip | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: - pkgs/development/compilers/llvm/10/clang/default.nix - pkgs/development/compilers/llvm/8/clang/default.nix
Diffstat (limited to 'nixos/modules/services/hardware')
| -rw-r--r-- | nixos/modules/services/hardware/acpid.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix index 6021aad09f45..821f4ef205fc 100644 --- a/nixos/modules/services/hardware/acpid.nix +++ b/nixos/modules/services/hardware/acpid.nix @@ -135,7 +135,6 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { - PrivateNetwork = true; ExecStart = escapeShellArgs ([ "${pkgs.acpid}/bin/acpid" "--foreground" |