staging-next: 21.11 iteration 6 - 2022-01-25#156696
Merged
vcunat merged 73 commits intorelease-21.11from Jan 29, 2022
Merged
Conversation
macOS's dyld can be rather picky as to what dylib it accepts. This even changes across macOS versions. Therefore we now build a fat dylib with all three architectures (x86_64, arm64, arm64e). This should then be compatible with pretty much any macOS's dyld. (cherry picked from commit a655bc0)
In pkgsStatic, /all/ build inputs are propagated. This means that netbsd.compat was propagated, along with its setup hook, which broke static glib builds because glib defines a function with the same name as one in nbtool_config.h, and nbtool_config.h was being automatically included in every C file processed by the compiler, in any transitive dependent of netbsd.compat's setup hook. To fix this, rather than forcing nbtool_config.h to be included for _every_ C file in a derivation that depends on netbsd.compat, modify the NetBSD-specific mkDerivation to detect files that need the header, and patch it in there where appropriate. That way, only files that are part of NetBSD will be affected, not all transitive dependents. (cherry picked from commit 7be5fbf)
When building glib statically, a Meson check would fail, because the check would interpret any warning as failure, and it would see the warning that the musl sys/cdefs.h emits about the file being deprecated. (cherry picked from commit 2b9c595)
(cherry picked from commit 5400fb8)
This reverts commit 34e50e2. Should have gone to staging
This reverts commit 92d0294. Placing to staging-21.11
(cherry picked from commit 7cb7d96)
(cherry picked from commit 3b8dc52)
https://sourceware.org/bugzilla/show_bug.cgi?id=22542 https://nvd.nist.gov/vuln/detail/CVE-2022-23219 https://sourceware.org/bugzilla/show_bug.cgi?id=28768 https://nvd.nist.gov/vuln/detail/CVE-2022-23218 (cherry picked from commit 8dd2546)
ofborg
bot
added
10.rebuild-darwin-stdenv
(cherry picked from commit 4bde5a3 / PR #156460) Co-authored-by: Jonathan Ringer <[email protected]> Co-authored-by: Vladimír Čunát <[email protected]>
(cherry picked from commit cc8cade)
(cherry picked from commit 2100043)
(cherry picked from commit 5d33b51)
(cherry picked from commit d50b6bf)
github-actions
bot
added
the
6.topic: golang
jonringer
approved these changes
Jan 28, 2022
Contributor
jonringer
left a comment
jonringer
left a comment
There was a problem hiding this comment.
my test script was able to pass successfully.
Guess we need to wait for rebuild count to go way down.
Member
Author
|
The main platform has almost finished and overall the risk of regressions should be low here, so let's not delay the fixes because of others. They have their own channels which will update when that platform gets ready. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
17 participants
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.
Documentation here: https://nixos.org/manual/nixpkgs/stable/#submitting-changes-staging-next-branch
https://hydra.nixos.org/job/nixpkgs/staging-next-21.11/unstable#tabs-constituents
Previous staging-next PR: #154489