From 3856e84b79e86b1c9c269a207b1c3e8a07e5f4d3 Mon Sep 17 00:00:00 2001
From: David Knaack <davidkna@users.noreply.github.com>
Date: Sat, 22 Apr 2023 09:01:06 +0200
Subject: nixos/gitea: remove extra `"` in prestart

---
 nixos/modules/services/misc/gitea.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nixos')

diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index a5d7a73dd06..0c414c2466b 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -553,7 +553,7 @@ in
             ${replaceSecretBin} '#internaltoken#' '${internalToken}' '${runConfig}'
 
             ${lib.optionalString cfg.lfs.enable ''
-              ${replaceSecretBin} '#lfsjwtsecret#' '${lfsJwtSecret}' '${runConfig}'"
+              ${replaceSecretBin} '#lfsjwtsecret#' '${lfsJwtSecret}' '${runConfig}'
             ''}
 
             ${lib.optionalString (cfg.mailerPasswordFile != null) ''
-- 
cgit 1.4.1


From e56084d2a0ab8f6c2e7b68550842101b8c1fc546 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sat, 22 Apr 2023 10:25:16 -0400
Subject: systemd-stage-1: Revert assertions about initrd commands

---
 nixos/modules/system/boot/systemd/initrd.nix | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'nixos')

diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index 6f991b84bbd..c9c219d0a0a 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -338,25 +338,6 @@ in {
   };
 
   config = mkIf (config.boot.initrd.enable && cfg.enable) {
-    assertions = map (name: {
-      assertion = config.boot.initrd.${name} == "";
-      message = ''
-        systemd stage 1 does not support 'boot.initrd.${name}'. Please
-        convert it to analogous systemd units in 'boot.initrd.systemd'.
-
-          Definitions:
-          ${lib.concatMapStringsSep "\n" ({ file, ... }: "- ${file}") options.boot.initrd.${name}.definitionsWithLocations}
-      '';
-    }) [
-      "preFailCommands"
-      "preDeviceCommands"
-      "preLVMCommands"
-      "postDeviceCommands"
-      "postMountCommands"
-      "extraUtilsCommands"
-      "extraUtilsCommandsTest"
-    ];
-
     system.build = { inherit initialRamdisk; };
 
     boot.initrd.availableKernelModules = [
-- 
cgit 1.4.1