atf: remove all-packages.nix definition

This commit is contained in:
Michael Daniels
2025-12-26 19:42:18 -05:00
parent 0895c91db5
commit 765c801092
2 changed files with 8 additions and 9 deletions
+8 -3
View File
@@ -1,6 +1,7 @@
{
lib,
stdenv,
darwin,
fetchFromGitHub,
fetchpatch,
autoreconfHook,
@@ -8,7 +9,11 @@
gitUpdater,
}:
stdenv.mkDerivation (finalAttrs: {
let
# atf is a dependency of libiconv. Avoid an infinite recursion with `pkgsStatic` by using a bootstrap stdenv.
stdenv' = if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
in
stdenv'.mkDerivation (finalAttrs: {
pname = "atf";
version = "0.23";
@@ -26,12 +31,12 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail 'atf_test_program{name="srcdir_test"}' ""
''
# These tests fail on Darwin.
+ lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isDarwin) ''
+ lib.optionalString (finalAttrs.doInstallCheck && stdenv'.hostPlatform.isDarwin) ''
substituteInPlace atf-c/detail/process_test.c \
--replace-fail 'ATF_TP_ADD_TC(tp, status_coredump);' ""
''
# This test fails on Linux.
+ lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isLinux) ''
+ lib.optionalString (finalAttrs.doInstallCheck && stdenv'.hostPlatform.isLinux) ''
substituteInPlace atf-c/detail/fs_test.c \
--replace-fail 'ATF_TP_ADD_TC(tp, eaccess);' ""
'';
-6
View File
@@ -8539,12 +8539,6 @@ with pkgs;
### DEVELOPMENT / TESTING TOOLS
atf = callPackage ../by-name/at/atf/package.nix {
stdenv =
# atf is a dependency of libiconv. Avoid an infinite recursion with `pkgsStatic` by using a bootstrap stdenv.
if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
};
### DEVELOPMENT / LIBRARIES / AGDA
agdaPackages = recurseIntoAttrs (