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

[Backport release-21.11] nixops: fix dependencies #148255

Merged
merged 2 commits into from
Dec 2, 2021

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Dec 2, 2021

Bot-based backport to release-21.11, triggered by a label in #147049.

  • Before merging, ensure that this backport complies with the Criteria for Backporting.
    • Even as a non-commiter, if you find that it does not comply, leave a comment.

@github-actions github-actions bot mentioned this pull request Dec 2, 2021
13 tasks
@roberth roberth changed the base branch from release-21.11 to staging-21.11 December 2, 2021 09:55
@thiagokokada thiagokokada added the 9.needs: human intervention There were changes that bots cannot deal with. label Dec 2, 2021
@thiagokokada thiagokokada marked this pull request as draft December 2, 2021 13:38
@thiagokokada
Copy link
Contributor

Set this PR as draft since it is taking some unrelated commits (probably because of the release-21.11 -> staging-21.11 retarget).

@thiagokokada thiagokokada force-pushed the backport-147049-to-release-21.11 branch from 4007bfa to 6bb4295 Compare December 2, 2021 13:50
@thiagokokada
Copy link
Contributor

Set this PR as draft since it is taking some unrelated commits (probably because of the release-21.11 -> staging-21.11 retarget).

Fixed.

CC @roberth for a review.

@thiagokokada thiagokokada removed the 9.needs: human intervention There were changes that bots cannot deal with. label Dec 2, 2021
@thiagokokada thiagokokada marked this pull request as ready for review December 2, 2021 13:50
@thiagokokada
Copy link
Contributor

@ofborg build nixops

@roberth
Copy link
Member

roberth commented Dec 2, 2021

The build failure does not occur when this is rebased on the non-staging release branch, so this should be safe to merge and will be buildable once the underlying problem that is already on staging is fixed.

@roberth roberth merged commit db6bea6 into staging-21.11 Dec 2, 2021
@thiagokokada thiagokokada deleted the backport-147049-to-release-21.11 branch December 2, 2021 18:53
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/error-when-upgrading-to-nixos-21-11/16442/5

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.

4 participants