Skip to content

staging-next 2024-07-20#328673

Merged
vcunat merged 727 commits intomasterfrom
staging-next
Jul 28, 2024
Merged

staging-next 2024-07-20#328673
vcunat merged 727 commits intomasterfrom
staging-next

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Jul 20, 2024

github-actions bot and others added 30 commits July 16, 2024 12:01
llvm_18, lld_18: Patch to support more OpenBSD sections
While at it added a trivial updater and enabled parallel builds.
home-assistant: drop ha-av override
This avoids the maintenance headache associated with conditionally
applied patches, and fixes building for s390.
python312: make portability backport unconditional
(cherry picked from commit 4a48f4c)
reckenrode and others added 6 commits July 27, 2024 22:55
…4-darwin

Because the binaries in the bindist lack the linker-signed flag in their signatures, `install_name_tool` will invalidate them when it processes them. Repair the signatures using `rcodesign`, which can also set the linker-signed flag when it replaces the signatures. Having the flag present causes future invocations of `install_name_tool` and `strip` on them to update the signatures.
On *-linux we get:
> FAILED TEST SUMMARY
> ---------------------------------------------------------------------
> SOAP Bug #71610 - Type Confusion Vulnerability - SOAP / make_http_soap_request() [tests/bug71610.phpt]
> Bug #76348 (WSDL_CACHE_MEMORY causes Segmentation fault) [tests/bugs/bug76348.phpt]
Logs e.g.: https://github.com/NixOS/nixpkgs/pull/330299/checks?check_run_id=27989364591
@github-actions github-actions bot added the 6.topic: php PHP is a general-purpose scripting language geared towards web development. label Jul 28, 2024
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 28, 2024
@vcunat vcunat merged commit a5b2fe7 into master Jul 28, 2024
@vcunat
Copy link
Member Author

vcunat commented Jul 28, 2024

Thanks for your fixes ❤️ The rest is for master.

@vcunat
Copy link
Member Author

vcunat commented Jul 30, 2024

Noticed quite late, but nixpkgs-unstable is blocked by darwin bootstrap tools:
https://hydra.nixos.org/build/267920930/nixlog/1/tail
Hopefully @reckenrode knows easily?

@reckenrode
Copy link
Contributor

Noticed quite late, but nixpkgs-unstable is blocked by darwin bootstrap tools: https://hydra.nixos.org/build/267920930/nixlog/1/tail Hopefully @reckenrode knows easily?

Fixed by #331145.

@vcunat vcunat mentioned this pull request Aug 6, 2024
de11n pushed a commit to deshaw/nixpkgs that referenced this pull request Aug 17, 2024
Two in-flight PRs (NixOS#327128 and NixOS#328673) both solved the same problem in a different way. This merges the best of both PRs and re-enables tests.
@de11n de11n mentioned this pull request Aug 17, 2024
13 tasks
alyssais pushed a commit that referenced this pull request Aug 17, 2024
Two in-flight PRs (#327128 and #328673) both solved the same problem in a different way. This merges the best of both PRs and re-enables tests.
de11n pushed a commit to deshaw/nixpkgs that referenced this pull request Aug 17, 2024
Two in-flight PRs (NixOS#327128 and NixOS#328673) both solved the same problem in
a different way. This merges the best of both PRs and re-enables tests.

This reverts commit e850cbb.

The original commit was accidentally merged to master instead of
staging.
alyssais pushed a commit that referenced this pull request Aug 17, 2024
Two in-flight PRs (#327128 and #328673) both solved the same problem in
a different way. This merges the best of both PRs and re-enables tests.

This reverts commit e850cbb.

The original commit was accidentally merged to master instead of
staging.
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 2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: dotnet Language: .NET 6.topic: emacs Text editor 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: llvm/clang Issues related to llvmPackages, clangStdenv and related 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: php PHP is a general-purpose scripting language geared towards web development. 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: 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.