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 2023-10-26 #263535

Merged
merged 1,687 commits into from
Nov 16, 2023
Merged

staging-next 2023-10-26 #263535

merged 1,687 commits into from
Nov 16, 2023

Conversation

abd83e2 broke glslang support in ffmpeg_4. It's
only enabled in ffmepg-full and v4 is only kept for compat reasons, so let's
simply disable this feature.
@cole-h cole-h removed the ofborg-internal-error Ofborg encountered an error label Nov 15, 2023
Prevent a warning about using a GNU extension from being treated as an
error by clang.
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 16, 2023
@vcunat vcunat merged commit a7a8f82 into master Nov 16, 2023
6 of 8 checks passed
@ghost
Copy link

ghost commented Nov 16, 2023

Hooray!

@vcunat
Copy link
Member Author

vcunat commented Nov 17, 2023

I forgot to check. nixpkgs-unstable will apparently get blocked by darwin's stdenv bootstrap tools:
https://hydra.nixos.org/job/nixpkgs/staging-next/unstable#tabs-constituents

@ghost
Copy link

ghost commented Nov 17, 2023

I forgot to check. nixpkgs-unstable will apparently get blocked by darwin's stdenv bootstrap tools

#241692 (comment)

Apparently this ball might be was in my court. I have approved:

I will merge it as soon as CI passes (or somebody else can if they notice it first). That should hopefully get the Darwin stdenvBootstrapTools to build. Nothing depends on them (the dependencies are on the pinned hash, which is not being changed) -- so the channel should advance quite quickly after the PR merges.

@vcunat
Copy link
Member Author

vcunat commented Nov 18, 2023

Maybe it's notable that zpool-auto-expand-partitions broke due to rustc update? https://hydra.nixos.org/build/241313798

/cc (some of) maintainers: @cole-h, @lheckemann, @Hoverbear.

@cole-h
Copy link
Member

cole-h commented Nov 19, 2023

Maybe it's notable that zpool-auto-expand-partitions broke due to rustc update? hydra.nixos.org/build/241313798

It was only tangentially related to the rustc update; the true culprit was actually the LLVM update (according to some searching). Fix is here: #268562.

@jpds jpds mentioned this pull request Nov 20, 2023
13 tasks
@vcunat vcunat mentioned this pull request Dec 1, 2023
@boltzmannrain boltzmannrain mentioned this pull request Dec 12, 2023
25 tasks
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.