From ebb9ee0fef2b237d2f9572defa0ab840b9fcce0b Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 19 Sep 2026 10:42:09 -0400 Subject: [PATCH 1/4] file: add mdaniels5757 as co-maintainer --- pkgs/by-name/fi/file/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fi/file/package.nix b/pkgs/by-name/fi/file/package.nix index 37516e53fe1e..c2b339fbfbce 100644 --- a/pkgs/by-name/fi/file/package.nix +++ b/pkgs/by-name/fi/file/package.nix @@ -64,7 +64,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://darwinsys.com/file"; description = "Program that shows the type of files"; - maintainers = with lib.maintainers; [ doronbehar ]; + maintainers = with lib.maintainers; [ + doronbehar + mdaniels5757 + ]; license = lib.licenses.bsd2; pkgConfigModules = [ "libmagic" ]; platforms = lib.platforms.all; From 780932049b42948653305433dd1edae27016a334 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 19 Sep 2026 10:50:28 -0400 Subject: [PATCH 2/4] file: add musl build to passthru.tests --- pkgs/by-name/fi/file/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fi/file/package.nix b/pkgs/by-name/fi/file/package.nix index c2b339fbfbce..9e1f9ddb492b 100644 --- a/pkgs/by-name/fi/file/package.nix +++ b/pkgs/by-name/fi/file/package.nix @@ -8,6 +8,7 @@ libgnurx ? windows.libgnurx, updateAutotoolsGnuConfigScriptsHook, testers, + pkgsMusl ? { }, # default to empty set to avoid CI fails with allowVariants = false }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -57,7 +58,10 @@ stdenv.mkDerivation (finalAttrs: { !lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform ) "FILE_COMPILE=${lib.getExe buildPackages.file}"; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru.tests = { + musl = pkgsMusl.file or null; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; __structuredAttrs = true; From b41e03e2d523f86fb317ad2c174f238bb5e91724 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 19 Sep 2026 10:50:42 -0400 Subject: [PATCH 3/4] file: always run tests --- pkgs/by-name/fi/file/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/file/package.nix b/pkgs/by-name/fi/file/package.nix index 9e1f9ddb492b..c0f19cfe8b8c 100644 --- a/pkgs/by-name/fi/file/package.nix +++ b/pkgs/by-name/fi/file/package.nix @@ -50,8 +50,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isMinGW libgnurx; - # https://bugs.astron.com/view.php?id=382 - doCheck = !stdenv.buildPlatform.isMusl; + doCheck = true; # In native builds, it will use the newly-compiled file instead. makeFlags = lib.optional ( From 93fd013de3bd188c39e9c5d0263a0581629a550d Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 19 Sep 2026 14:07:37 -0400 Subject: [PATCH 4/4] file: use versionCheckHook --- pkgs/by-name/fi/file/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/fi/file/package.nix b/pkgs/by-name/fi/file/package.nix index c0f19cfe8b8c..39c185a8fb19 100644 --- a/pkgs/by-name/fi/file/package.nix +++ b/pkgs/by-name/fi/file/package.nix @@ -9,6 +9,7 @@ updateAutotoolsGnuConfigScriptsHook, testers, pkgsMusl ? { }, # default to empty set to avoid CI fails with allowVariants = false + versionCheckHook, }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -52,6 +53,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + # In native builds, it will use the newly-compiled file instead. makeFlags = lib.optional ( !lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform