Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

staging-next-23.11 iteration 5 - 2024-02-25 #291328

Merged
merged 92 commits into from
Mar 1, 2024
Merged

Conversation

marsam and others added 30 commits November 23, 2023 04:20
(cherry picked from commit 42b0713)
(cherry picked from commit 49b3d04)
(cherry picked from commit 17eb38c)
[Backport staging-23.11] libgit2: 1.7.1 -> 1.7.2
(cherry picked from commit 6a79a44)
(cherry picked from commit 1733c6d)
… issues

There is a subtle bug with unpacking `tar.xz` archives which seems to happen only on some setups, and sometimes not in a reproducible manner (#278130, #20950). On the last occurrence, it could be tracked down to `xz` failing from a `SIGPIPE`, which can happen when it's connected to `tar` through a pipe and `tar` exits earlier (see e.g. https://www.linuxquestions.org/questions/slackware-14/%5Bpatch%5D-tar-issuing-a-sigpipe-in-installpkg-4175637923/ or https://bugs.gentoo.org/573642#c5).

Since `tar` should be able by itself to detect whether the archive is complete, I suggest to disregard the exit code from the `xz` invocation, done in this PR.

Fixes  #278130 (script tested here: #286579)
Probably also fixes #20950 (issue not reproduced here, feedback therefore welcome)
[Backport staging-23.11] imagemagick: 7.1.1-27 -> 7.1.1-28
- switch to finalAttrs
- remove the patch from upstream

(cherry picked from commit ebb42ad)
@vcunat
Copy link
Member Author

vcunat commented Feb 29, 2024

fabaff and others added 8 commits February 29, 2024 18:24
`acl` is a pretty ubiquitious package on Linux and provides `getfacl`.

(cherry picked from commit c1cd336)
…nnot be added

docx2txt is *IN* nixpkgs but cannot be used.

lipo, otool are theoretically available in darling… but I doubt they would work.

(cherry picked from commit 4e9e090)
This was comparing stdenv.hostPlatform (an attr set) to a string. This
comparison always returned not-equal, which resulted in trying to
evaluate the broken gnumeric on macOS. This change fixes that to compare
the "system" string as was intended originally.

(cherry picked from commit 5d238d0)
@trofi
Copy link
Contributor

trofi commented Feb 29, 2024

I think the diffoscope failure was fixed upstreamin 256 version. Proposed diffoscope fix as #292428 by pulling all the fixes from master.

@vcunat vcunat merged commit 79baff8 into release-23.11 Mar 1, 2024
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.