staging-next 2022-05-04 #171497
Merged
staging-next 2022-05-04 #171497
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
vcunat
commented
May 4, 2022
vcunat
commented
- workflow docs: nixos.org/manual/nixpkgs/unstable/#submitting-changes-commit-policy
- constitutents: hydra.nixos.org/job/nixpkgs/staging-next/unstable#tabs-constituents
- jobset: hydra.nixos.org/jobset/nixpkgs/staging-next
- nix-review reports: https://malob.github.io/nix-review-tools-reports/
- previous staging-next: staging-next 2022-04-23 #169965
Pandoc no longer depends on haskellPackages.HTTP at all.
The following error occurs when using `imagemagickBig`:
$ ./result/bin/identify sample.jp2
[1] 699089 IOT instruction (core dumped) ./result/bin/identify sample.jp2
When looking at the call-trace it seems as if certain symbols, e.g.
`opj_malloc` are mixed up:
#8 0x00007f78c79ad2f5 in MagickSignalHandler.cold () from /nix/store/bqy80qiw6czqh7vsmmmivwdswp9zzjgl-imagemagick-7.1.0-29/lib/libMagickCore-7.Q16HDRI.so.10
#9 <signal handler called>
#10 0x00007f78c5a6095f in opj_malloc () from /nix/store/wg6ly83k1k1fjiygiv1jr7li3p6dwsvq-ghostscript-with-X-9.55.0/lib/libgs.so.9
#11 0x00007f78c5a60981 in opj_calloc () from /nix/store/wg6ly83k1k1fjiygiv1jr7li3p6dwsvq-ghostscript-with-X-9.55.0/lib/libgs.so.9
#12 0x00007f78c4f48e24 in opj_create_decompress () from /nix/store/qwalb0kjz1p9c4j48qkk6ql47ds2lnhh-openjpeg-2.4.0/lib/libopenjp2.so.7
The `opj_create_decompress()` is called from the `openjpeg`-integration
of `imagemagick` and thus shouldn't affect `ghostscript` at all.
However, `ghostscript` (`libgs.so` to be precise) also exposes e.g.
`opj_malloc`:
$ objdump -t /nix/store/wg6ly83k1k1fjiygiv1jr7li3p6dwsvq-ghostscript-with-X-9.55.0/lib/libgs.so.9.55|grep opj_malloc
0000000000205940 g F .text 000000000000002b opj_malloc
Because of that, two incompatible symbols are used in the same process
and thus the `identify`-call breaks because the wrong one is used. To
work around that I decided to use the system-wide openjpeg instead.
I'm not sure why `libgs.so` wants to expose these symbols anyways, but
with that workaround the problem is solved.
Even though it's mentioned that ghostscript's openjpeg is heavily
patched, I think that this is somewhat outdated or at least irrelevant
considering that both ArchLinux[1] and Fedora[2] use the system-wide
`openjpeg` instead.
[1] https://github.com/archlinux/svntogit-packages/blob/bafcb5473b59d5386dd110d1cb249372dce9ea6c/trunk/PKGBUILD#L50
[2] https://src.fedoraproject.org/rpms/ghostscript/blob/e4eec13ab6ace2bad64b740d352964bbf61d1aa7/f/ghostscript.spec#_245
In Issue #169693 we found out that systemd-bootaa64.efi does not have required `#### LoaderInfo: systemd-boot 250.4 ####` marking. It is destroyed by `nixpkgs`'s `_doStrip` hook (part of `fixupOutputHooks`). It makes sense as PE32+ is a bit different from ELF where `.sdmagic` section is inserted. The change avoids stripping EFI files altogether by moving them out of default strip directories of _doStrip for the time while `fixupPhase` is running. Closes: #169693
- add pythonImportsCheck - disable on older Python releases
libsForQt5.signond: 8.60 -> 8.61
Noticed option globbing when tried to enable parallelism by default
locally for most packages by default. python3Packages.yt-dlp failed as:
python3.9-yt-dlp> /nix/store/5mywvxdjkk1q6srwwwgdkzc37ibla801-python3.9-setuptools-61.2.0/lib/python3.9/site-packages/setuptools/dist.py:516: UserWarning: Normalizing '2022.04.08' to '2022.4.8'
python3.9-yt-dlp> warnings.warn(tmpl.format(**locals()))
python3.9-yt-dlp> invalid command name 'build_lazy_extractors--parallel'
The change adds leading whitespace everywhere where options might
already be present.
icu: 70.1 -> 71.1
Bug fix release. Changes: https://gcc.gnu.org/gcc-11/changes.html (11.3 link below).
elfutils uses dlopen for central features.
python310Packages.pkgconfig: execute tests, adopt
ghostscript: use system-wide openjpeg
Context: #84312 documents that using .gitattributes on GitHub results in non-reproducible release tarballs. versioneer uses this to provide version numbers for Python libraries. Hack around that issue by deleting the file containing substitutions in the fixed hash input derivation, and recreate the required info from the derivation's version info at patchPhase time.
|
No surprise, this is related to #164163. The culprit seems to be this part of the firefox wrapper: nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix Lines 216 to 219 in 384d446 It rewrites to instead of in the gapps wrapper, |
github-actions
bot
removed
the
6.topic: GNOME
https://gitlab.pyicu.org/main/pyicu/-/blob/v2.9/CHANGES The important bit is support for ICU 71.1; otherwise tests failed.
|
instead of just buildInput omission. darwin still fails to build with svg or heif support, but a change in one of the present dependencies may cause one of these libraries to be detected and the support accidentally enabled.
...into staging-next
We can't just edit binary wrappers in place because of a length mismatch, so we have to parse the generating makeCWrapper call out of the binary, extract wrapper arguments from it and add them to the Firefox wrapper. All these contortions are needed because Firefox looks for its runtime in argv0, so the proper argv0 needs to be set by wrappers to always point to the "final" runtime. I think this could be avoided by wrapping /lib/$libName/firefox instead of /bin/firefox, and I'd like to look into that in the future, but for now I'm just fixing the immediate problem.
I shouldn't have been so hasty rearranging things, and also should have tested Darwin before merging! Sorry @vcunat!
...into staging-next
...into staging-next
...into staging-next
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.