Skip to content

nixops: fix dependencies#147049

Merged
roberth merged 2 commits intoNixOS:stagingfrom
dotlambda:nixops-fixes
Nov 23, 2021
Merged

nixops: fix dependencies#147049
roberth merged 2 commits intoNixOS:stagingfrom
dotlambda:nixops-fixes

Conversation

@dotlambda
Copy link
Member

@dotlambda dotlambda commented Nov 22, 2021

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.

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Nov 22, 2021
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Nov 22, 2021
@ofborg ofborg bot requested review from domenkozar and prikhi November 22, 2021 21:37
@ofborg ofborg bot added 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. labels Nov 22, 2021
nixinator
nixinator approved these changes Nov 22, 2021
View reviewed changes
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
Closed
13 tasks
SuperSandro2000
SuperSandro2000 reviewed Nov 23, 2021
View reviewed changes
@roberth
Copy link
Member

roberth commented Nov 23, 2021

@ofborg build nixops

@mweinelt
Copy link
Member

mweinelt commented Nov 23, 2021

@ofborg build nixops

Not sure you are aware of what this is testing.

nixpkgs/nixos/tests/nixops/default.nix

Lines 5 to 15 in 5cf75a4

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

dotlambda commented Nov 23, 2021

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
@roberth roberth mentioned this pull request Nov 23, 2021
Closed
@github-actions
Copy link
Contributor

github-actions bot commented Nov 23, 2021

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

dotlambda commented Dec 2, 2021

@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
python2.7-flake8-4.0.1 failed to build #148194
Closed
@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 github-actions bot mentioned this pull request Dec 2, 2021
Merged
1 task
@github-actions
Copy link
Contributor

github-actions bot commented Dec 2, 2021

Successfully created backport PR #148255 for release-21.11.

@rprije rprije mentioned this pull request Dec 13, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@mweinelt mweinelt mweinelt approved these changes

@roberth roberth Awaiting requested review from roberth

@FRidh FRidh Awaiting requested review from FRidh

@domenkozar domenkozar Awaiting requested review from domenkozar

@prikhi prikhi Awaiting requested review from prikhi

+2 more reviewers

@jonringer jonringer jonringer approved these changes

@nixinator nixinator nixinator approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 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-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

Milestone

No milestone

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

@dotlambda @roberth @mweinelt @Artturin @SuperSandro2000 @jonringer @nixinator @veprbl