From cbafb3b8b9c6cf1d28b7edd6fe318750bd90a87d Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Sun, 21 Jan 2024 14:50:47 +0100 Subject: [PATCH 1/3] yx: Don't misuse pname It's considered best practice to not overuse references to pname. --- pkgs/tools/text/yx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/yx/default.nix b/pkgs/tools/text/yx/default.nix index 629cf442c48b..b3098fb6dcc4 100644 --- a/pkgs/tools/text/yx/default.nix +++ b/pkgs/tools/text/yx/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "tomalok"; - repo = pname; + repo = "yx"; rev = version; sha256 = "sha256-oY61V9xP0DwRooabzi0XtaFsQa2GwYbuvxfERXQtYcA="; }; From b667423f97f2b5ea088b82d18197ec71f2883121 Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Sun, 21 Jan 2024 15:00:35 +0100 Subject: [PATCH 2/3] yx: add version test --- pkgs/tools/text/yx/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/yx/default.nix b/pkgs/tools/text/yx/default.nix index b3098fb6dcc4..ec308bcfbad2 100644 --- a/pkgs/tools/text/yx/default.nix +++ b/pkgs/tools/text/yx/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitLab, libyaml }: +{ lib +, stdenv +, fetchFromGitLab +, libyaml +, testers +, yx +}: stdenv.mkDerivation rec { pname = "yx"; version = "1.0.0"; @@ -20,6 +26,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.version = testers.testVersion { + package = yx; + command = "${meta.mainProgram} -v"; + version = "v${yx.version}"; + }; + meta = with lib; { description = "YAML Data Extraction Tool"; homepage = "https://gitlab.com/tomalok/yx"; From e9996977148c5c516c15cc669252722e9aa2c0f7 Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Sat, 27 Jan 2024 23:36:56 +0100 Subject: [PATCH 3/3] yx: 1.0.0 -> 1.0.2 --- pkgs/tools/text/yx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/yx/default.nix b/pkgs/tools/text/yx/default.nix index ec308bcfbad2..732be1760c9e 100644 --- a/pkgs/tools/text/yx/default.nix +++ b/pkgs/tools/text/yx/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "yx"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitLab { owner = "tomalok"; repo = "yx"; rev = version; - sha256 = "sha256-oY61V9xP0DwRooabzi0XtaFsQa2GwYbuvxfERXQtYcA="; + hash = "sha256-uuso+hsmdsB7VpIRKob8rfMaWvRMCBHvCFnYrHPC6iw="; }; makeFlags = [