diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-04-22 18:00:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-22 18:00:58 +0000 |
| commit | c1093794b3c2d2f667124900ee658c1ee2f30d64 (patch) | |
| tree | 0affb6e19a99578ddb47146e9853b18236197b19 /nixos | |
| parent | 90520cf646c489edc13b7c429708b885ffa7b3b8 (diff) | |
| parent | ca7894b07e22b974bebc03f3dbecaf524041e7b6 (diff) | |
| download | nixpkgs-c1093794b3c2d2f667124900ee658c1ee2f30d64.tar nixpkgs-c1093794b3c2d2f667124900ee658c1ee2f30d64.tar.gz nixpkgs-c1093794b3c2d2f667124900ee658c1ee2f30d64.tar.bz2 nixpkgs-c1093794b3c2d2f667124900ee658c1ee2f30d64.tar.lz nixpkgs-c1093794b3c2d2f667124900ee658c1ee2f30d64.tar.xz nixpkgs-c1093794b3c2d2f667124900ee658c1ee2f30d64.tar.zst nixpkgs-c1093794b3c2d2f667124900ee658c1ee2f30d64.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/gitea.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd/initrd.nix | 19 |
2 files changed, 1 insertions, 20 deletions
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) '' 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 = [ |