From dba2db07b12fef3c0a32aa8be817cacfc1fd76cd Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sat, 1 Jul 2023 12:53:49 +0000
Subject: [PATCH] patch minor incompatibilities with 3p/nixpkgs update

---
 ops/nixos/totoro/default.nix                       | 2 +-
 third_party/home-manager/modules/lib/file-type.nix | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ops/nixos/totoro/default.nix b/ops/nixos/totoro/default.nix
index 1d3c9d355c..ae9ac8abbe 100644
--- a/ops/nixos/totoro/default.nix
+++ b/ops/nixos/totoro/default.nix
@@ -455,7 +455,7 @@ in {
         headers = "username:X-Pomerium-Claim-User";
         auto_sign_up = "true";
       };
-      security.cookie_secure = "true";
+      security.cookie_secure = true;
     };
   };
   systemd.services.grafana.preStart = let
diff --git a/third_party/home-manager/modules/lib/file-type.nix b/third_party/home-manager/modules/lib/file-type.nix
index cc23292ba0..840122858d 100644
--- a/third_party/home-manager/modules/lib/file-type.nix
+++ b/third_party/home-manager/modules/lib/file-type.nix
@@ -106,7 +106,8 @@ in
         target = mkDefault name;
         source = mkIf (config.text != null) (
           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;
           })
         );