Skip to content

staging-next 2022-08-06#185426

Merged
vcunat merged 197 commits intomasterfrom
staging-next
Aug 16, 2022
Merged

staging-next 2022-08-06#185426
vcunat merged 197 commits intomasterfrom
staging-next

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Aug 6, 2022

bootstrap-prime and others added 30 commits July 23, 2022 20:35
also make test output unconditional
python-dbusmock relies on bluez for it's checks. Which shouldn't be a
problem, and isn't one normally. However, checkPhase contained a string
substitution that was always constructed regardless of the value of
doCheck (and simply not used if doCheck was false), and so bluez, which
was not supposed to be a dependency, was used as and registered as one
and caused a dependency cycle when trying to add pcsclite as a
dependency of libfido2.

The string substitution has been removed in favor of something that can
remain disabled when doCheck is false.
- Release announcement: https://dev.gnupg.org/T5947
- Removed CVE-2022-34903 patch which is included in 2.3.7
With 0507725 "setup-hooks/strip.sh: run RANLIB on static
archives after stripping" it should now be safe to run strip
on wider range of .a files.

mingw-w64 is a good example where a reference was preserved
to gcc from intermediate stage. Enabling stripping by default
decreases `pkgsCross.mingw32` closure for 20%:

Before:

    $ nix path-info -rsSh $(nix-build -A pkgsCross.mingw32.stdenv)
    ...
    /nix/store/qzhkidff0wxhqf2gi97ng6qismzvpnbp-stdenv-linux 43.6K    1.0G

After:

    $ nix path-info -rsSh $(nix-build -A pkgsCross.mingw32.stdenv)
    ...
    /nix/store/fj4dv1n3sa3jgcb1j3nwn6njsf943n48-stdenv-linux 43.6K  792.4M
This reverts commit 49edde0.

Our packaged rsync version now contains the fix.
Revert "rsync: Work around upstream cross-compilation issue"
libtiff: get rid of aarch64-darwin.nix
it is a issue openal-soft's FindOSS.cmake https://github.com/kcat/openal-soft/blob/master/cmake/FindOSS.cmake

trofi> Looking at the build failure (if I remove libc from buildInputs) I think the problem here is that it tries to pull in build's headers, not host's headers:
trofi> These unexpected headers are injected from OSS headers: openal-soft-aarch64-unknown-linux-gnu> -- Found OSS: /nix/store/xy6ngc2gxqcypczxbahrqz31xr97m6gg-glibc-2.35-163-dev/include.
trofi> The header path detection comes from cmake/FindOSS.cmake:
trofi> Apparently glibc headers do provide sys/soundcard.h and confuse cmake.

see nixpkgs issue: #183774
@vcunat
Copy link
Member Author

vcunat commented Aug 15, 2022

I don't think libsForQt5.mailcommon is a channel blocker, so maybe it's OK-ish to let it regress on master?

@vcunat
Copy link
Member Author

vcunat commented Aug 16, 2022

That failure was triggered by cmake update in PR #185287. (though that information doesn't seem very useful)

@vcunat vcunat requested a review from ttuegel as a code owner August 16, 2022 08:42
@github-actions github-actions bot added the 6.topic: qt/kde Object-oriented framework for GUI creation label Aug 16, 2022
@vcunat vcunat merged commit 6c6409e into master Aug 16, 2022
@vcunat
Copy link
Member Author

vcunat commented Aug 16, 2022

Uh, so I worked around the failure for now.

@NickCao
Copy link
Member

NickCao commented Aug 16, 2022

I think I just found the missing piece of the puzzle: https://invent.kde.org/pim/messagelib/-/commit/6eaef36d42bdb05f3412c178e53077fb6224ff80

@vcunat
Copy link
Member Author

vcunat commented Aug 16, 2022

I haven't tried that due to qt6 not being involved in our case.

@NickCao
Copy link
Member

NickCao commented Aug 16, 2022

Opened #186967 to test it out.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: stdenv Standard environment 6.topic: vim Advanced text editor 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.