patch minor incompatibilities with 3p/nixpkgs update

This commit is contained in:
Luke Granger-Brown 2023-07-01 12:53:49 +00:00
parent 551c4f27ad
commit dba2db07b1
2 changed files with 3 additions and 2 deletions

View file

@ -455,7 +455,7 @@ in {
headers = "username:X-Pomerium-Claim-User"; headers = "username:X-Pomerium-Claim-User";
auto_sign_up = "true"; auto_sign_up = "true";
}; };
security.cookie_secure = "true"; security.cookie_secure = true;
}; };
}; };
systemd.services.grafana.preStart = let systemd.services.grafana.preStart = let

View file

@ -106,7 +106,8 @@ in
target = mkDefault name; target = mkDefault name;
source = mkIf (config.text != null) ( source = mkIf (config.text != null) (
mkDefault (pkgs.writeTextFile { mkDefault (pkgs.writeTextFile {
inherit (config) executable text; inherit (config) text;
executable = if isNull config.executable then false else config.executable;
name = hm.strings.storeFileName name; name = hm.strings.storeFileName name;
}) })
); );