samasaur | okay so applying this diff
diff --git a/pkgs/by-name/at/atf/package.nix b/pkgs/by-name/at/atf/package.nix
index 326419c5f7..a285cd207f 100644
--- a/pkgs/by-name/at/atf/package.nix
+++ b/pkgs/by-name/at/atf/package.nix
@@ -1,19 +1,13 @@
{
lib,
stdenv,
- darwin,
fetchFromGitHub,
- fetchpatch,
autoreconfHook,
kyua,
gitUpdater,
}:
-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: {
+stdenv.mkDerivation (finalAttrs: {
pname = "atf";
version = "0.23";
@@ -31,12 +25,12 @@
--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);' ""
'';
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix
index be9b1e32d6..169d9f8b24 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix
@@ -5,6 +5,8 @@
mkAppleDerivation,
pkg-config,
stdenv,
+ runTests ? false,
+ libiconv,
}:
let
@@ -72,7 +74,7 @@
nativeInstallCheckInputs = [ pkg-config ];
installCheckInputs = [ atf ];
- doInstallCheck = stdenv.buildPlatform.canExecute hostPlatform;
+ doInstallCheck = runTests;
# Can’t use `mesonCheckPhase` because it runs the wrong hooks for `installCheckPhase`.
installCheckPhase = ''
@@ -81,6 +83,8 @@
runHook postInstallCheck
'';
+ passthru.tests = libiconv.override { runTests = true; };
+
meta = {
description = "Iconv(3) implementation";
license = [
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index a63e0c9b07..62f8e5774f 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -236,7 +236,6 @@
# Any libraries in the list must only be used as dependencies of packages in this list.
stage1Packages = prevStage: {
inherit (prevStage)
- atf
autoconf
automake
bison
@@ -251,7 +250,6 @@
gettext
groff
jq
- kyua
libedit
libtool
m4
@@ -266,7 +264,6 @@
python3Minimal
scons
serf
- sqlite
subversion
texinfo
unzip
@@ -650,6 +647,7 @@
self = self.python3-bootstrap;
pythonAttr = "python3-bootstrap";
enableLTO = false;
+ withSqlite = false;
};
scons = super.scons.override { python3Packages = self.python3.pkgs; };
I get the following diff in the output of nix-store -qR:
69d68
< 5.2.darwin.patch
95,96d93
< atf-0.23.drv
< atf-0.23.drv
234d230
< CVE-2022-28805.patch
337,339d332
< kyua-0.13-unstable-2024-01-22.drv
< kyua-0.13-unstable-2024-01-22.drv
< kyua-check-hook.sh
400,404d392
< lua-5.2.4.drv
< lua-5.2.4.tar.gz.drv
< lua-setup-hook
< lutok-0.4.drv
< lutok-0.4.drv
634,639d621
< source.drv
< source.drv
< source.drv
< sqlite-3.51.1.drv
< sqlite-autoconf-3510100.tar.gz.drv
< sqlite-doc-3510100.zip.drv
685,686d666
< utils.sh
< utils.sh.drv
and nix-build -A darwin.libiconv.passthru.tests does still build and run the tests
| 06:49:47 |