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

nixops: fix dependencies #147049

Merged
merged 2 commits into from
Nov 23, 2021
Merged

nixops: fix dependencies #147049

merged 2 commits into from
Nov 23, 2021

Conversation

dotlambda
Copy link
Member

Motivation for this change

fixes #147034
#144627

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

Copy link
Member

@nixinator nixinator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@dotlambda dotlambda changed the base branch from master to staging November 22, 2021 22:37
@dotlambda dotlambda requested a review from mweinelt November 22, 2021 22:39
@roberth roberth mentioned this pull request Nov 22, 2021
13 tasks
@roberth
Copy link
Member

roberth commented Nov 23, 2021

@ofborg build nixops

@mweinelt
Copy link
Member

@ofborg build nixops

Not sure you are aware of what this is testing.

tests = {
# TODO: uncomment stable
# - Blocked on https://github.com/NixOS/nixpkgs/issues/138584 which has a
# PR in staging: https://github.com/NixOS/nixpkgs/pull/139986
# - Alternatively, blocked on a NixOps 2 release
# https://github.com/NixOS/nixops/issues/1242
# stable = testsLegacyNetwork { nixopsPkg = pkgs.nixops; };
unstable = testsForPackage { nixopsPkg = pkgs.nixopsUnstable; };
# inherit testsForPackage;
};

@roberth
Copy link
Member

roberth commented Nov 23, 2021

Not sure you are aware of what this is testing.

I was just building. I'm aware because I wrote that test.

@roberth
Copy link
Member

roberth commented Nov 23, 2021

The darwin builds do still fail.

@dotlambda
Copy link
Member Author

The darwin builds do still fail.

I won't be fixing that cause I can't test on Darwin.

@roberth
Copy link
Member

roberth commented Nov 23, 2021

Alright, then I'll merge this. Thank you @dotlambda!

@roberth roberth merged commit 5a6ec55 into NixOS:staging Nov 23, 2021
@github-actions
Copy link
Contributor

Backport failed for staging-21.11, because it was unable to create/access the git worktree directory.

Please cherry-pick the changes locally.

git fetch origin staging-21.11
git worktree add -d .worktree/backport-147049-to-staging-21.11 origin/staging-21.11
cd .worktree/backport-147049-to-staging-21.11
git checkout -b backport-147049-to-staging-21.11
ancref=$(git merge-base 40d43349e66e87b1009cc945e42acd90892f5306 192bbb938c50917e8a411ab0a73cba893dac0dbc)
git cherry-pick -x $ancref..192bbb938c50917e8a411ab0a73cba893dac0dbc

@dotlambda dotlambda deleted the nixops-fixes branch November 23, 2021 18:05
@Artturin
Copy link
Member

Artturin commented Dec 1, 2021

#148194

@dotlambda
Copy link
Member Author

@NixOS/nixops-committers Someone needs to backport this to 21.11.

@dotlambda dotlambda linked an issue Dec 2, 2021 that may be closed by this pull request
@roberth
Copy link
Member

roberth commented Dec 2, 2021

Oops, wrong label. I'll change the generated PR base to fix that.

The backport action failed last time for some reason. Let's see if it works now.

@github-actions
Copy link
Contributor

github-actions bot commented Dec 2, 2021

Successfully created backport PR #148255 for release-21.11.

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.

python2.7-flake8-4.0.1 failed to build nixops fails to build.
8 participants