Skip to content

Comments

staging-next 2023-10-26#263535

Merged
vcunat merged 1687 commits intomasterfrom
staging-next
Nov 16, 2023
Merged

staging-next 2023-10-26#263535
vcunat merged 1687 commits intomasterfrom
staging-next

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Oct 26, 2023

@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: kernel The Linux kernel 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: printing Drivers, CUPS & Co. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: vim Advanced text editor 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: steam Steam game store/launcher (store.steampowered.com) 6.topic: stdenv Standard environment 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. labels Oct 26, 2023
@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. 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-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 Oct 26, 2023
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
@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

Labels

6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: kernel The Linux kernel 6.topic: lib The Nixpkgs function library 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. 6.topic: printing Drivers, CUPS & Co. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: stdenv Standard environment 6.topic: steam Steam game store/launcher (store.steampowered.com) 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: vim Advanced text editor 8.has: changelog This PR adds or changes release notes 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 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.