Merge pull request 'clanModules/state-version: use echo -n' (#2088) from kenji/clan-core:state-version-echo into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/2088
This commit is contained in:
kenji
2024-09-13 13:54:21 +00:00

View File

@@ -5,7 +5,7 @@ in
{ {
config = lib.mkMerge [ config = lib.mkMerge [
(lib.mkIf ((var.value or null) != null) { (lib.mkIf ((var.value or null) != null) {
system.stateVersion = lib.mkDefault (lib.removeSuffix "\n" var.value); system.stateVersion = lib.mkDefault var.value;
}) })
{ {
@@ -13,7 +13,7 @@ in
files.version.secret = false; files.version.secret = false;
runtimeInputs = [ ]; runtimeInputs = [ ];
script = '' script = ''
echo ${lib.versions.majorMinor lib.version} > $out/version echo -n ${lib.versions.majorMinor lib.version} > $out/version
''; '';
}; };
} }