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] 2023-05-10 00:03:33 +00:00 • committed by GitHub
commit 2d07e76d1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
72 changed files with 10593 additions and 1359 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/web-apps/pict-rs.nix
View file

@ -34,8 +34,8 @@ in
config = lib.mkIf cfg.enable {
systemd.services.pict-rs = {
environment = {
PICTRS_PATH = cfg.dataDir;
PICTRS_ADDR = "${cfg.address}:${toString cfg.port}";
PICTRS__PATH = cfg.dataDir;
PICTRS__ADDR = "${cfg.address}:${toString cfg.port}";
};
wantedBy = [ "multi-user.target" ];
serviceConfig = {

2
nixos/modules/system/boot/networkd.nix
View file

@ -2848,7 +2848,7 @@ let
''
+ optionalString (def.tokenBucketFilterConfig != { }) ''
[TokenBucketFilter]
${attrsToSection def.tockenBucketFilterConfig}
${attrsToSection def.tokenBucketFilterConfig}
''
+ optionalString (def.pieConfig != { }) ''
[PIE]