Skip to content

staging-next: 21.11 iteration 5 - 2022-01-11#154489

Merged
vcunat merged 78 commits intorelease-21.11from
staging-next-21.11
Jan 13, 2022
Merged

staging-next: 21.11 iteration 5 - 2022-01-11#154489
vcunat merged 78 commits intorelease-21.11from
staging-next-21.11

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Jan 11, 2022

risicle and others added 30 commits December 16, 2021 00:37
@risicle
python3Packages.lxml: 4.6.3 -> 4.6.5
afe3035
@mweinelt @veprbl
openssl_1_1: 1.1.1l -> 1.1.1m
02fbc90 
(cherry picked from commit 29f216c)
@github-actions
Merge staging-next-21.11 into staging-21.11
16744be
@github-actions
Merge staging-next-21.11 into staging-21.11
aeba947
@github-actions
Merge staging-next-21.11 into staging-21.11
ec22e20
@r-burns @github-actions
llvmPackages_*.llvm: fix llvm-config-native with static libs
0263955 
Since both static and shared libs are installed to the same `lib`
output, we override the ActiveLibDir unconditionally.

Fixes `llvm-config-native --link-static --libs`

(cherry picked from commit 544707d)
@7c6f434c
Merge pull request #151996 from NixOS/backport-148367-to-staging-21.11
e19011e 
[Backport staging-21.11] llvmPackages_*.llvm: fix llvm-config-native with static libs
@github-actions
Merge release-21.11 into staging-next-21.11
e0afcce
@github-actions
Merge staging-next-21.11 into staging-21.11
7e5abdf
@risicle @github-actions
binutils: add patch for CVE-2021-45078
b04e5f4 
(cherry picked from commit bcf0761)
@risicle @github-actions
gmp: add patch for CVE-2021-43618
44856a6 
(cherry picked from commit d35c79a)
@risicle @github-actions
gmp5: add patch for CVE-2021-43618
28d5656 
(cherry picked from commit 7ba3788)
@github-actions
Merge release-21.11 into staging-next-21.11
ad9ad71
@github-actions
Merge staging-next-21.11 into staging-21.11
0d55316
@thiagokokada
Merge pull request #152148 from NixOS/backport-151658-to-staging-21.11
3596c5f 
[Backport staging-21.11] binutils: add patch for CVE-2021-45078
@github-actions
Merge release-21.11 into staging-next-21.11
51d046f
@github-actions
Merge staging-next-21.11 into staging-21.11
ddfb4d9
@risicle
lapack: add patch for CVE-2021-4048
c7900c5 
(cherry picked from commit 6d952e4)
@github-actions
Merge release-21.11 into staging-next-21.11
aec9f05
@github-actions
Merge staging-next-21.11 into staging-21.11
c6854c5
@7c6f434c
Merge pull request #152147 from NixOS/backport-150788-to-release-21.11
fe856f4 
[Backport release-21.11] lapack: add patch for CVE-2021-4048
@github-actions
Merge release-21.11 into staging-next-21.11
a09caf8
@github-actions
Merge staging-next-21.11 into staging-21.11
ca34aed
@github-actions
Merge release-21.11 into staging-next-21.11
670c11d
@github-actions
Merge staging-next-21.11 into staging-21.11
c8dee75
@github-actions
Merge release-21.11 into staging-next-21.11
c2cda06
@github-actions
Merge staging-next-21.11 into staging-21.11
201ef3b
@github-actions
Merge release-21.11 into staging-next-21.11
351c348
@github-actions
Merge staging-next-21.11 into staging-21.11
1a27325
@angerman @github-actions
Check link type based on expanded parameters
f6054e2 
So far we've ignored response files in arguments, and did not
check linkType against expanded parameters.  This means if
we have `-static` in a @reponse-file, linkType will not be
set to `-static` as we never check against the expanded arguments
from response files.

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

vcunat commented Jan 11, 2022 •
edited
Loading

I'm sorry, me forgetting to change the target branch created quite a mess.

EDIT: I hope I managed to undo most of it quickly.

@vcunat vcunat added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Jan 11, 2022
@vcunat vcunat mentioned this pull request Jan 11, 2022
Closed
@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Jan 11, 2022
@sternenseemann
Copy link
Member

sternenseemann commented Jan 11, 2022

unstable currently fails to evaluate with:

in job ‘unstable’:
error: unsupported libc for bootstrap tools

I'm pretty sure I am to blame for this and will look into it.

I also noticed that x86_64-darwin is disabled for the jobset at the moment, we may want to flick that back on?

@vcunat
Copy link
Member Author

vcunat commented Jan 11, 2022

I did it seconds after eval was triggered (noticed too late), so let me just re-trigger it.

@sternenseemann
Copy link
Member

sternenseemann commented Jan 11, 2022 •
edited
Loading

I'm pretty sure I am to blame for this and will look into it.

Turns out I am innocent in this case! In any case fix for master at: #154506, for staging-next-21.11 at #154507.

The issue was that darwin specific stuff was conditional on x86_64-darwin only, so eval broke when only aarch64-darwin, but not x86_64-darwin was in supportedSystems, so it'll also be fixed with the next eval directly.

@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 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-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. labels Jan 11, 2022
jonringer
jonringer approved these changes Jan 11, 2022
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

local test suite passed.

Still need to check regressions, and waiting for rebuild count to go to 0

@sternenseemann
Copy link
Member

sternenseemann commented Jan 13, 2022

Can't reproduce the libuv failure on aarch64-linux causing a lot of aarch64-linux regressions on the community machine, a bit annoying. Either need to restart the offending jobs or disable the offending test (which is failing whyever in this instance).

@vcunat vcunat linked an issue Jan 13, 2022 that may be closed by this pull request
qt5.qtsvg fails to build on x86_64-darwin [21.11] #152902
Closed
@vcunat
Copy link
Member Author

vcunat commented Jan 13, 2022

Also Hydra succeeded on restarting the build. I poked upstream: libuv/libuv#2235 (comment)

@vcunat vcunat merged commit b809f89 into release-21.11 Jan 13, 2022
@vcunat
Copy link
Member Author

vcunat commented Jan 13, 2022

Merged in a bit earlier phase due to #154931, to avoid more rebuilds in the big 21.11 jobsets. I trust these backports won't cause significant regressions.

@vcunat
Copy link
Member Author

vcunat commented Jan 16, 2022

And the nixos-21.11 channel updated now 🎉

@vcunat vcunat mentioned this pull request Jan 25, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@jonringer jonringer jonringer approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: stdenv Standard environment 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

qt5.qtsvg fails to build on x86_64-darwin [21.11]