From 4b7baf82cd00c52aa0b548b0fa06654ce856ce52 Mon Sep 17 00:00:00 2001 From: Lucas <43530291+LuckShiba@users.noreply.github.com> Date: Tue, 13 Jan 2026 13:24:51 -0300 Subject: [PATCH] nix: escape version string (#1353) --- flake.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 65bffc5f..8dcc0af2 100644 --- a/flake.nix +++ b/flake.nix @@ -61,11 +61,13 @@ (builtins.substring 6 2 longDate) ]; version = - pkgs.lib.removePrefix "v" (pkgs.lib.trim (builtins.readFile ./quickshell/VERSION)) - + "+date=" - + mkDate (self.lastModifiedDate or "19700101") - + "_" - + (self.shortRev or "dirty"); + let + rawVersion = pkgs.lib.removePrefix "v" (pkgs.lib.trim (builtins.readFile ./quickshell/VERSION)); + cleanVersion = builtins.replaceStrings [ " " ] [ "" ] rawVersion; + dateSuffix = "+date=" + mkDate (self.lastModifiedDate or "19700101"); + revSuffix = "_" + (self.shortRev or "dirty"); + in + "${cleanVersion}${dateSuffix}${revSuffix}"; in { dms-shell = pkgs.buildGoModule ( @@ -83,7 +85,7 @@ ldflags = [ "-s" "-w" - "-X main.Version=${version}" + "-X 'main.Version=${version}'" ]; nativeBuildInputs = with pkgs; [