From ca95f89a744e99ad18c604167adae1848897741d Mon Sep 17 00:00:00 2001 From: Luiz Ferraz Date: Tue, 17 Oct 2023 18:46:42 -0300 Subject: [PATCH 1/2] turso-cli: 0.85.3 -> 0.86.3 --- pkgs/development/tools/turso-cli/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index 0859e1a362c2..3fde1157181f 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -4,19 +4,20 @@ buildGo121Module, fetchFromGitHub, installShellFiles, + nix-update-script, }: buildGo121Module rec { pname = "turso-cli"; - version = "0.85.3"; + version = "0.86.3"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-dJpHrqPyikkUnE4Un1fGOEJL49U5IiInYeSWmI04r18="; + hash = "sha256-hTqjNQSScQzCUBs4pYgxRnRvUSoQXXeZIceSZAR1Oa0="; }; - vendorHash = "sha256-Hv4CacBrRX2YT3AkbNzyWrA9Ex6YMDPrPvezukwMkTE="; + vendorHash = "sha256-EqND/W+NNatoBUMXWrsjNPfxAtX0oUASUxN6Rmhp7SQ="; nativeBuildInputs = [ installShellFiles ]; @@ -38,6 +39,8 @@ buildGo121Module rec { --zsh <($out/bin/turso completion zsh) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "This is the command line interface (CLI) to Turso."; homepage = "https://turso.tech"; From 5d77e9448a69d98a2b919d444d5f8111efc2875c Mon Sep 17 00:00:00 2001 From: Luiz Ferraz Date: Wed, 18 Oct 2023 10:26:49 -0300 Subject: [PATCH 2/2] turso-cli: Use ldflags to set the version instead of embedding --- pkgs/development/tools/turso-cli/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index 3fde1157181f..ed1655cbd793 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -21,12 +21,9 @@ buildGo121Module rec { nativeBuildInputs = [ installShellFiles ]; - # Build with production code - tags = ["prod"]; - # Include version for `turso --version` reporting - preBuild = '' - echo "v${version}" > internal/cmd/version.txt - ''; + ldflags = [ + "-X github.com/tursodatabase/turso-cli/internal/cmd.version=v${version}" + ]; preCheck = '' export HOME=$(mktemp -d)