Skip to content

Comments

staging-next 2025-03-13#389579

Merged
vcunat merged 510 commits intomasterfrom
staging-next
Mar 22, 2025
Merged

staging-next 2025-03-13#389579
vcunat merged 510 commits intomasterfrom
staging-next

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Mar 13, 2025

mweinelt added 30 commits March 11, 2025 13:17
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 20, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 20, 2025
nixpkgs-ci bot and others added 3 commits March 20, 2025 18:05
Without the change `powermanga` build fails on `staging-next` as
https://hydra.nixos.org/build/292745998:

    ./configure: line 5413: syntax error near unexpected token `SDL,'
    ./configure: line 5413: `    PKG_CHECK_MODULES(SDL, sdl >= $min_sdl_version,'

This happens because `PKG_CHECK_MODULES` definition is missing.
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 21, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 21, 2025
@vcunat vcunat merged commit 3fcae17 into master Mar 22, 2025
32 checks passed
@wolfgangwalther wolfgangwalther added the 4.workflow: staging A staging-next or staging-next-XX.YY branch label May 4, 2025
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 4.workflow: staging A staging-next or staging-next-XX.YY branch 6.topic: emacs Text editor 6.topic: games Gaming on NixOS 6.topic: kernel The Linux kernel 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 6.topic: mate The MATE Desktop Environment 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 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. 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.