From ec6956aa05b3ea1f6a919815babdb1907322bd62 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sun, 18 May 2025 14:49:32 +0800 Subject: [PATCH 1/6] jo: avoid with lib; --- pkgs/by-name/jo/jo/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/jo/jo/package.nix b/pkgs/by-name/jo/jo/package.nix index 1c9bb4365a9e..19e0aa754199 100644 --- a/pkgs/by-name/jo/jo/package.nix +++ b/pkgs/by-name/jo/jo/package.nix @@ -26,12 +26,14 @@ stdenv.mkDerivation rec { pkg-config ]; - meta = with lib; { + meta = { description = "Small utility to create JSON objects"; homepage = "https://github.com/jpmens/jo"; mainProgram = "jo"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.markus1189 ]; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + markus1189 + ]; + platforms = lib.platforms.all; }; } From ee575ad6f02ea0d442be2bb933e26b3744281e24 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sun, 18 May 2025 14:50:01 +0800 Subject: [PATCH 2/6] jo: add xiaoxiangmoe to maintainers --- pkgs/by-name/jo/jo/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/jo/jo/package.nix b/pkgs/by-name/jo/jo/package.nix index 19e0aa754199..a094cc64937a 100644 --- a/pkgs/by-name/jo/jo/package.nix +++ b/pkgs/by-name/jo/jo/package.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { mainProgram = "jo"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ + xiaoxiangmoe markus1189 ]; platforms = lib.platforms.all; From 354c051178092c422a3b60f1102cf3b696a58c1b Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sun, 18 May 2025 14:51:16 +0800 Subject: [PATCH 3/6] jo: add updateScript --- pkgs/by-name/jo/jo/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/jo/jo/package.nix b/pkgs/by-name/jo/jo/package.nix index a094cc64937a..1a0e0c67d3e2 100644 --- a/pkgs/by-name/jo/jo/package.nix +++ b/pkgs/by-name/jo/jo/package.nix @@ -5,6 +5,7 @@ autoreconfHook, pandoc, pkg-config, + nix-update-script, }: stdenv.mkDerivation rec { @@ -26,6 +27,8 @@ stdenv.mkDerivation rec { pkg-config ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Small utility to create JSON objects"; homepage = "https://github.com/jpmens/jo"; From 7786d6d3d17b92d5abe0c24cb8f9ddb097fe97e1 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sun, 18 May 2025 14:52:42 +0800 Subject: [PATCH 4/6] jo: enable installCheck --- pkgs/by-name/jo/jo/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/jo/jo/package.nix b/pkgs/by-name/jo/jo/package.nix index 1a0e0c67d3e2..47a95cb32547 100644 --- a/pkgs/by-name/jo/jo/package.nix +++ b/pkgs/by-name/jo/jo/package.nix @@ -5,6 +5,7 @@ autoreconfHook, pandoc, pkg-config, + versionCheckHook, nix-update-script, }: @@ -27,6 +28,16 @@ stdenv.mkDerivation rec { pkg-config ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "-v"; + postInstallCheck = '' + $out/bin/jo -V > /dev/null + seq 1 10 | $out/bin/jo -a | grep '^\[1,2,3,4,5,6,7,8,9,10\]$' > /dev/null + ''; + doInstallCheck = true; + passthru.updateScript = nix-update-script { }; meta = { From 0c30a3fe00fc4945e839446879bc451654455d7b Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sun, 18 May 2025 14:53:54 +0800 Subject: [PATCH 5/6] jo: use finalAttrs style --- pkgs/by-name/jo/jo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jo/jo/package.nix b/pkgs/by-name/jo/jo/package.nix index 47a95cb32547..03e86e4be9ab 100644 --- a/pkgs/by-name/jo/jo/package.nix +++ b/pkgs/by-name/jo/jo/package.nix @@ -9,14 +9,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jo"; version = "1.9"; src = fetchFromGitHub { owner = "jpmens"; repo = "jo"; - rev = version; + tag = finalAttrs.version; sha256 = "sha256-1q4/RpxfoAdtY3m8bBuj7bhD17V+4dYo3Vb8zMbI1YU="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) From e533a48e6772c4ee18e6f70249074647a53a3d65 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sun, 18 May 2025 14:56:33 +0800 Subject: [PATCH 6/6] jo: add changelog --- pkgs/by-name/jo/jo/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/jo/jo/package.nix b/pkgs/by-name/jo/jo/package.nix index 03e86e4be9ab..cbfcb5257e69 100644 --- a/pkgs/by-name/jo/jo/package.nix +++ b/pkgs/by-name/jo/jo/package.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Small utility to create JSON objects"; homepage = "https://github.com/jpmens/jo"; + changelog = "https://github.com/jpmens/jo/blob/${finalAttrs.version}/ChangeLog"; mainProgram = "jo"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [