Skip to content

Comments

staging-next 2022-06-10#177171

Merged
vcunat merged 418 commits intomasterfrom
staging-next
Jun 19, 2022
Merged

staging-next 2022-06-10#177171
vcunat merged 418 commits intomasterfrom
staging-next

Conversation

SuperSandro2000 and others added 30 commits June 6, 2022 11:46
github-actions bot and others added 9 commits June 16, 2022 18:01
…ements

[staging-next] home-assistant: fix parse-requirements.py
; Conflicts:
;	pkgs/top-level/python-packages.nix
This reverts commit cd49d60 to allow clean
merge of newer `certbot-1.28.0` from `master` on top of `staging-next`.
*buildInputs take .dev outputs by default, but we don't need it here.
The extra dependency (introduced by commit d172061) was breaking
tests like nixosTests.containers-imperative and nixosTests.installer.*
https://hydra.nixos.org/eval/1767666#tabs-still-fail
@vcunat
Copy link
Member Author

vcunat commented Jun 18, 2022

@vcunat
Copy link
Member Author

vcunat commented Jun 18, 2022

Otherwise I'm not aware of any merge blockers. Some builds regress, usually that seems related to the python upgrade (3.9 -> 3.10), but even more builds get fixed apparently.

We might want to wait a bit for aarch64-linux builders to catch up, too.

@trofi trofi mentioned this pull request Jun 18, 2022
13 tasks
@vcunat vcunat merged commit 8946781 into master Jun 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: kernel The Linux kernel 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: stdenv Standard environment 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 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.