From 7711d6d5a0b732448b5431565f52c0a80bdac0c9 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Mon, 28 Jul 2025 03:08:53 +0800 Subject: [PATCH 1/6] tinystatus: use finalAttrs --- pkgs/by-name/ti/tinystatus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ti/tinystatus/package.nix b/pkgs/by-name/ti/tinystatus/package.nix index 3b1b1e8be8b2..55c6bca87408 100644 --- a/pkgs/by-name/ti/tinystatus/package.nix +++ b/pkgs/by-name/ti/tinystatus/package.nix @@ -14,7 +14,7 @@ gnused, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "tinystatus"; version = "0-unstable-2021-07-09"; @@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation rec { runHook preInstall install -Dm555 tinystatus $out/bin/tinystatus wrapProgram $out/bin/tinystatus \ - --set PATH "${lib.makeBinPath runtimeInputs}" + --set PATH "${lib.makeBinPath finalAttrs.runtimeInputs}" runHook postInstall ''; @@ -69,4 +69,4 @@ stdenvNoCC.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ matthewcroughan ]; }; -} +}) From 329dc91add31ae30b4754248d752a44430e1b494 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Mon, 28 Jul 2025 03:08:59 +0800 Subject: [PATCH 2/6] tinystatus: remove with lib --- pkgs/by-name/ti/tinystatus/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ti/tinystatus/package.nix b/pkgs/by-name/ti/tinystatus/package.nix index 55c6bca87408..0099f2ff0d24 100644 --- a/pkgs/by-name/ti/tinystatus/package.nix +++ b/pkgs/by-name/ti/tinystatus/package.nix @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "bderenzo"; repo = "tinystatus"; rev = "fc128adf240261ac99ea3e3be8d65a92eda52a73"; - sha256 = "sha256-FvQwibm6F10l9/U3RnNTGu+C2JjHOwbv62VxXAfI7/s="; + hash = "sha256-FvQwibm6F10l9/U3RnNTGu+C2JjHOwbv62VxXAfI7/s="; }; nativeBuildInputs = [ makeWrapper ]; @@ -61,12 +61,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postCheck ''; - meta = with lib; { + meta = { description = "Static HTML status page generator written in pure shell"; mainProgram = "tinystatus"; homepage = "https://github.com/bderenzo/tinystatus"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ matthewcroughan ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ matthewcroughan ]; }; }) From d82eb97c111b8b2debc319a4cd94c49d69a06814 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Mon, 28 Jul 2025 03:09:01 +0800 Subject: [PATCH 3/6] tinystatus: add preInstallCheck and postInstallCheck and remove runtimeInputs --- pkgs/by-name/ti/tinystatus/package.nix | 34 ++++++++++++++------------ 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ti/tinystatus/package.nix b/pkgs/by-name/ti/tinystatus/package.nix index 0099f2ff0d24..6e8dffc07173 100644 --- a/pkgs/by-name/ti/tinystatus/package.nix +++ b/pkgs/by-name/ti/tinystatus/package.nix @@ -27,30 +27,32 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper ]; - runtimeInputs = [ - curl - netcat - unixtools.ping - coreutils - mktemp - findutils - gnugrep - gawk - gnused - ]; - installPhase = '' runHook preInstall - install -Dm555 tinystatus $out/bin/tinystatus + + install -Dm755 tinystatus $out/bin/tinystatus wrapProgram $out/bin/tinystatus \ - --set PATH "${lib.makeBinPath finalAttrs.runtimeInputs}" + --set PATH "${ + lib.makeBinPath [ + curl + netcat + unixtools.ping + coreutils + mktemp + findutils + gnugrep + gawk + gnused + ] + }" + runHook postInstall ''; doInstallCheck = true; installCheckPhase = '' - runHook preCheck + runHook preInstallCheck cat <test.csv ping, 0, testing, this.should.fail.example.com @@ -58,7 +60,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { $out/bin/tinystatus test.csv | grep Disrupted - runHook postCheck + runHook postInstallCheck ''; meta = { From c46d1ce27e3341fad31c4b9f03b999618ad82300 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Mon, 28 Jul 2025 03:09:05 +0800 Subject: [PATCH 4/6] tinystatus: sort --- pkgs/by-name/ti/tinystatus/package.nix | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ti/tinystatus/package.nix b/pkgs/by-name/ti/tinystatus/package.nix index 6e8dffc07173..2f04c27e8582 100644 --- a/pkgs/by-name/ti/tinystatus/package.nix +++ b/pkgs/by-name/ti/tinystatus/package.nix @@ -1,17 +1,17 @@ { lib, stdenvNoCC, - makeWrapper, - netcat, - curl, - unixtools, - coreutils, - mktemp, - findutils, - gnugrep, fetchFromGitHub, + makeWrapper, + coreutils, + curl, + findutils, gawk, + gnugrep, gnused, + mktemp, + netcat, + unixtools, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -34,15 +34,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { wrapProgram $out/bin/tinystatus \ --set PATH "${ lib.makeBinPath [ + coreutils curl + findutils + gawk + gnugrep + gnused + mktemp netcat unixtools.ping - coreutils - mktemp - findutils - gnugrep - gawk - gnused ] }" From 6db0899396b692bfa9b38f012f85d159f91d0b3e Mon Sep 17 00:00:00 2001 From: mivorasu Date: Mon, 28 Jul 2025 03:09:11 +0800 Subject: [PATCH 5/6] tinystatus: 0-unstable-2021-07-09 -> 0-unstable-2025-03-27 --- pkgs/by-name/ti/tinystatus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ti/tinystatus/package.nix b/pkgs/by-name/ti/tinystatus/package.nix index 2f04c27e8582..0f9144d80af0 100644 --- a/pkgs/by-name/ti/tinystatus/package.nix +++ b/pkgs/by-name/ti/tinystatus/package.nix @@ -16,13 +16,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tinystatus"; - version = "0-unstable-2021-07-09"; + version = "0-unstable-2025-03-27"; src = fetchFromGitHub { owner = "bderenzo"; repo = "tinystatus"; - rev = "fc128adf240261ac99ea3e3be8d65a92eda52a73"; - hash = "sha256-FvQwibm6F10l9/U3RnNTGu+C2JjHOwbv62VxXAfI7/s="; + rev = "169ee0bb2efe4531080936d1e2a46e451feebe3e"; + hash = "sha256-nPrABKKIDP1n1rhcojFJJ15kqa5b4s7F/wMAgD/eVBw="; }; nativeBuildInputs = [ makeWrapper ]; From 5205d193ab9bf78503f3fff296cbdb5ed3517131 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Mon, 28 Jul 2025 06:49:21 +0800 Subject: [PATCH 6/6] tinystatus: use makeBinaryWrapper --- pkgs/by-name/ti/tinystatus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tinystatus/package.nix b/pkgs/by-name/ti/tinystatus/package.nix index 0f9144d80af0..59569bbd3faa 100644 --- a/pkgs/by-name/ti/tinystatus/package.nix +++ b/pkgs/by-name/ti/tinystatus/package.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, - makeWrapper, + makeBinaryWrapper, coreutils, curl, findutils, @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-nPrABKKIDP1n1rhcojFJJ15kqa5b4s7F/wMAgD/eVBw="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; installPhase = '' runHook preInstall