| 12 Oct 2025 |
 matthewcroughan | |Date: Mon, 25 Feb 2019 13:55:12 +0800
|Subject: [PATCH 03/26] missing_type.h: add comparison_fn_t
|
|Make it work with musl where comparison_fn_t and is not provided.
|
|Upstream-Status: Inappropriate [musl specific]
|
|Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
|[Rebased for v244]
|Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|[Rebased for v242]
|Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
|[Rebased for v250, Drop __compare_fn_t]
|Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
|---
| src/basic/missing_type.h | 4 ++++
| src/basic/sort-util.h | 1 +
| src/libsystemd/sd-journal/catalog.c | 1 +
| 3 files changed, 6 insertions(+)
|
|diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
|index 1d17705c35..fc33b76ec1 100644
|--- a/src/basic/missing_type.h
|+++ b/src/basic/missing_type.h
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file src/basic/sort-util.h
Hunk #1 FAILED at 4.
1 out of 1 hunk FAILED -- saving rejects to file src/basic/sort-util.h.rej
patching file src/libsystemd/sd-journal/catalog.c
Hunk #1 succeeded at 27 (offset -2 lines).
| 13:42:37 |
| matthewcroughan | ⋮
┃ > +------------------------+------------------------+------------------------+
┃ > | 3A45F6BA-A7AD-11F0-B08 | t/integration/failed.t | yath test t/integratio |
┃ > | 1-DC607653D5FB | | n/failed --ext=tx |
┃ > | | | yath test t/integratio |
┃ > | | | n/failed --ext=tx -> y |
┃ > | | | ath failed /build/yat[ |
┃ > | | | ...]HrRf.jsonl |
┃ > | | | |
┃ > | 3A45FAD4-A7AD-11F0-B08 | t/integration/help.t | yath help test |
┃ > | 1-DC607653D5FB | | |
┃ > +------------------------+------------------------+------------------------+
┃ >
┃ > Yath Result Summary
┃ > ---------------------------------------------------------------------------------------
┃ > Fail Count: 2
┃ > File Count: 61
┃ > Assertion Count: 1729
┃ > Wall Time: 12.07 seconds
┃ > CPU Time: 130.96 seconds (usr: 2.48s | sys: 0.02s | cusr: 78.26s | csys: 50.20s)
┃ > CPU Usage: 1085%
┃ > --> Result: FAILED <--
┃ >
┃ For full logs, run:
┃ nix log /nix/store/zmv1ab0v1jqj6a45kp49ifrjpksjlr65-perl5.40.0-Test2-Harness-1.000155.drv
┣━ Dependency Graph:
┃
| 20:53:07 |
| matthewcroughan | Is this just a flaky test, or is it actually broken on musl? | 20:53:15 |
| matthewcroughan | ( FAILED ) job 12 t/integration/failed.t0m
< REASON > job 12 Test script returned error (Err: 1)
< REASON > job 12 Errors were encountered (Count: 1)
< REASON > job 12 Assertion failures were encountered (Count: 1)
< REASON > job 12 Subtest failures were encountered (Count: 1)
( FAILED ) job 13 t/integration/help.t
< REASON > job 13 Test script returned error (Err: 1)
< REASON > job 13 Assertion failures were encountered (Count: 1)
< REASON > job 13 Subtest failures were encountered (Count: 1)
| 20:54:20 |
 Sergei Zimmerman (xokdvium) | Has been for some time. Noticed this in the Nix repo | 20:58:58 |
| Sergei Zimmerman (xokdvium) | I think I've seen this on i686? | 20:59:42 |
| matthewcroughan | hmm, I only notice it on this staging-next, a few weeks ago it wasn't failing | 21:38:25 |
| matthewcroughan | Does anyone know why pytest fails with ┃ error: build of '/nix/store/3haz9vxnx4v0fl5vadyzspy3kbx4rp05-python3.13-pytest-8.4.2-aarch64-unknown-linux-musl.drv' on 'ssh-ng://nix-ssh@m2u' failed: output '/nix/store/1vh3vhp6kf04350d6sjs… ┃ /nix/store/d29jvsi1x76l0bbwd704srmmsijfbl8a-python3-3.13.8 on musl? | 23:51:07 |
| matthewcroughan | I guess hooks sometimes produce bad references in outputs? | 23:52:02 |
| matthewcroughan | specifically in the case of cross | 23:52:37 |
 Ihar Hrachyshka | I just noticed it and asked in main nixpkgs channel. we disabled wrapper hook on pytest and it was supposed to replace shebangs to make use of host | 23:52:55 |
| Ihar Hrachyshka | https://github.com/NixOS/nixpkgs/commit/84dced5a94ed901362dc6e285d0ac0c08ba671ff | 23:53:13 |
| matthewcroughan | This blocks musl pretty hard | 23:54:21 |
| Ihar Hrachyshka | I have absolutely no clue how I can meaningfully
test this aside from kind of yoloing it into staging.
WELP
| 23:54:23 |
| matthewcroughan | at least with the default pkgs.nixos | 23:54:25 |
| Ihar Hrachyshka | yeah a lot of broken pieces... | 23:54:36 |
| matthewcroughan | Yeah it's unfortunate that they didn't test adequately | 23:54:37 |
| matthewcroughan | Did they just not have a big enough machine to perform testing? They could have asked? | 23:54:53 |
| matthewcroughan | Can we revert it? | 23:56:03 |
| Ihar Hrachyshka | maybe?
I am not sure they were aware this could affect cross. So even if they'd rebuild the main variant tree, they would not catch it. | 23:56:41 |
| matthewcroughan | It seems to effect native too | 23:56:58 |
| Ihar Hrachyshka | have a repro? | 23:57:18 |
| matthewcroughan | Ah no just nom playing tricks | 23:57:33 |
| Ihar Hrachyshka | I doubt pytest is broken in main... | 23:57:39 |
| matthewcroughan | nix build .#legacyPackages.aarch64-linux.pkgsMusl.pkgsLLVM.python3Packages.pytest -L | 23:58:14 |
| matthewcroughan | that would do it though | 23:58:19 |
| Ihar Hrachyshka | a revert would get cross scenario fixed... but I assume they were dealing with some other legit issue, so it would be unfortunate to regress there. | 23:58:27 |
| Ihar Hrachyshka | the dontWrap thing seems like a footgun. I tried some other packages using it - and surely enough they are broken for cross. | 23:59:23 |
| 13 Oct 2025 |
| matthewcroughan | it's pkgsLLVM that breaks actually | 00:00:28 |
| matthewcroughan | pkgsMusl is fine | 00:00:31 |
