From fa417a2bc0a18d2bd859a87c973f228d9491c61a Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 11 May 2025 13:46:33 -0400 Subject: [PATCH 1/3] sta: unbreak on darwin Builds and runs just fine. --- pkgs/by-name/st/sta/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/st/sta/package.nix b/pkgs/by-name/st/sta/package.nix index 64cbc1d4745a..c7487086bef6 100644 --- a/pkgs/by-name/st/sta/package.nix +++ b/pkgs/by-name/st/sta/package.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation { homepage = "https://github.com/simonccarter/sta"; maintainers = [ ]; platforms = platforms.all; - badPlatforms = platforms.darwin; mainProgram = "sta"; }; } From c4f6f75afc6932a12e5e6605bc24afb4199e1315 Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 11 May 2025 21:11:10 -0400 Subject: [PATCH 2/3] sta: enable tests --- pkgs/by-name/st/sta/package.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/by-name/st/sta/package.nix b/pkgs/by-name/st/sta/package.nix index c7487086bef6..b0b00a3d4e64 100644 --- a/pkgs/by-name/st/sta/package.nix +++ b/pkgs/by-name/st/sta/package.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, autoreconfHook, + cxxtest, }: stdenv.mkDerivation { @@ -18,6 +19,24 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; + doCheck = true; + nativeCheckInputs = [ cxxtest ]; + checkInputs = [ cxxtest ]; + + checkPhase = '' + runHook preCheck + + pushd test + + cxxtestgen --error-printer --have-std -o tests.cpp sta_test_1.h sta_test_2.h + ${stdenv.cc.targetPrefix}c++ -o tester tests.cpp + ./tester + + popd + + runHook postCheck + ''; + meta = with lib; { description = "Simple statistics from the command line interface (CLI), fast"; longDescription = '' From baf6ebeba5f60942d667662e7f481638fc390fac Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 11 May 2025 21:11:46 -0400 Subject: [PATCH 3/3] sta: enable strictDeps --- pkgs/by-name/st/sta/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/st/sta/package.nix b/pkgs/by-name/st/sta/package.nix index b0b00a3d4e64..a24b87d9ff7d 100644 --- a/pkgs/by-name/st/sta/package.nix +++ b/pkgs/by-name/st/sta/package.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { sha256 = "sha256-AiygCfBze7J1Emy6mc27Dim34eLR7VId9wodUZapIL4="; }; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook ]; doCheck = true;