From a13e66e36d600f11b165f45fac5b2f9b1d88415d Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 29 Dec 2024 16:56:40 +0100 Subject: [PATCH 1/2] termshot: 0.2.12 -> 0.3.0 --- pkgs/by-name/te/termshot/go-mod.patch | 12 ------------ pkgs/by-name/te/termshot/package.nix | 8 +++----- 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 pkgs/by-name/te/termshot/go-mod.patch diff --git a/pkgs/by-name/te/termshot/go-mod.patch b/pkgs/by-name/te/termshot/go-mod.patch deleted file mode 100644 index 5618ec24f8b2..000000000000 --- a/pkgs/by-name/te/termshot/go-mod.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/go.mod b/go.mod -index 6627fb1..a3397a9 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,6 +1,6 @@ - module github.com/homeport/termshot - --go 1.20 -+go 1.22.0 - - require ( - github.com/creack/pty v1.1.23 diff --git a/pkgs/by-name/te/termshot/package.nix b/pkgs/by-name/te/termshot/package.nix index d3e580ae3244..85d39a6f00b8 100644 --- a/pkgs/by-name/te/termshot/package.nix +++ b/pkgs/by-name/te/termshot/package.nix @@ -5,18 +5,16 @@ }: buildGoModule rec { pname = "termshot"; - version = "0.2.12"; + version = "0.3.0"; src = fetchFromGitHub { owner = "homeport"; repo = "termshot"; rev = "v${version}"; - hash = "sha256-ua2tFyOjLeqOpipLoSisASqwjqGEFdkxd2qHybZ1VDU="; + hash = "sha256-vvSUdXVLuc3GmxPX9SzSeb8vbmqjhSLjXd9nmU7Q46g="; }; - vendorHash = "sha256-JweKjKvShiimFHQwRtoVuongWqqGIPcPz77qEVNec+M="; - - patches = [ ./go-mod.patch ]; + vendorHash = "sha256-nXAIU07SY/GdWZGASHXDg36cSGKw4elLOBDCoJk/xlU="; ldflags = [ "-s" From 3aeb79f00f18099e853c64a90d6fcb0cae086989 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 29 Dec 2024 16:57:33 +0100 Subject: [PATCH 2/2] termshot: refactor --- pkgs/by-name/te/termshot/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/te/termshot/package.nix b/pkgs/by-name/te/termshot/package.nix index 85d39a6f00b8..b2cccc198b77 100644 --- a/pkgs/by-name/te/termshot/package.nix +++ b/pkgs/by-name/te/termshot/package.nix @@ -2,6 +2,9 @@ lib, fetchFromGitHub, buildGoModule, + testers, + termshot, + nix-update-script, }: buildGoModule rec { pname = "termshot"; @@ -10,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "homeport"; repo = "termshot"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-vvSUdXVLuc3GmxPX9SzSeb8vbmqjhSLjXd9nmU7Q46g="; }; @@ -22,9 +25,15 @@ buildGoModule rec { "-X github.com/homeport/termshot/internal/cmd.version=${version}" ]; + passthru = { + tests.version = testers.testVersion { package = termshot; }; + updateScript = nix-update-script { }; + }; + meta = { description = "Creates screenshots based on terminal command output"; homepage = "https://github.com/homeport/termshot"; + changelog = "https://github.com/homeport/termshot/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ defelo ]; mainProgram = "termshot";