From 5fc971e616a890b163808841a74c72ef6db8a9ba Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 4 Feb 2026 16:51:19 +0100 Subject: [PATCH 1/3] vhs: replace `rev` with `tag` --- pkgs/by-name/vh/vhs/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/vh/vhs/package.nix b/pkgs/by-name/vh/vhs/package.nix index b7108579d106..fb6e4b3587d8 100644 --- a/pkgs/by-name/vh/vhs/package.nix +++ b/pkgs/by-name/vh/vhs/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "charmbracelet"; repo = "vhs"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-ZnE5G8kfj7qScsT+bZg90ze4scpUxeC6xF8dAhdUUCo="; }; From e24922cbe99377f93b8bb114b36fd903287e7a8b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 4 Feb 2026 16:51:44 +0100 Subject: [PATCH 2/3] vhs: replace `makeWrapper` with `makeBinaryWrapper` --- pkgs/by-name/vh/vhs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vh/vhs/package.nix b/pkgs/by-name/vh/vhs/package.nix index fb6e4b3587d8..ec2bc8bce860 100644 --- a/pkgs/by-name/vh/vhs/package.nix +++ b/pkgs/by-name/vh/vhs/package.nix @@ -7,7 +7,7 @@ ffmpeg, ttyd, chromium, - makeWrapper, + makeBinaryWrapper, }: buildGoModule rec { @@ -25,7 +25,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles - makeWrapper + makeBinaryWrapper ]; ldflags = [ From d33d3428c86a6e14c0ab2c06bfc157bd30cd1d04 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 4 Feb 2026 17:00:07 +0100 Subject: [PATCH 3/3] vhs: use `finalAttrs` pattern --- pkgs/by-name/vh/vhs/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/vh/vhs/package.nix b/pkgs/by-name/vh/vhs/package.nix index ec2bc8bce860..649d2e3d989e 100644 --- a/pkgs/by-name/vh/vhs/package.nix +++ b/pkgs/by-name/vh/vhs/package.nix @@ -10,14 +10,14 @@ makeBinaryWrapper, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "vhs"; version = "0.10.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "vhs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZnE5G8kfj7qScsT+bZg90ze4scpUxeC6xF8dAhdUUCo="; }; @@ -31,17 +31,17 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=main.Version=${version}" + "-X=main.Version=${finalAttrs.version}" ]; postInstall = '' wrapProgram $out/bin/vhs --prefix PATH : ${ lib.makeBinPath ( - lib.optionals stdenv.hostPlatform.isLinux [ chromium ] - ++ [ + [ ffmpeg ttyd ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ chromium ] ) } '' @@ -58,8 +58,8 @@ buildGoModule rec { description = "Tool for generating terminal GIFs with code"; mainProgram = "vhs"; homepage = "https://github.com/charmbracelet/vhs"; - changelog = "https://github.com/charmbracelet/vhs/releases/tag/v${version}"; + changelog = "https://github.com/charmbracelet/vhs/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ ]; }; -} +})