Skip to content

Revert #178290: nixos/virtualisation: add option#213519

Merged
cole-h merged 1 commit intoNixOS:masterfrom
vcunat:p/revert-virtualisation
Jan 30, 2023
Merged

Revert #178290: nixos/virtualisation: add option#213519
cole-h merged 1 commit intoNixOS:masterfrom
vcunat:p/revert-virtualisation

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Jan 30, 2023

...for explicitly named network interfaces

This reverts commit 6ae3e76. (and evaluation fixups 08d26bb 7aed90a)
Some of the tests fail or time out after the merge.

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/)
  • 23.05 Release Notes (or backporting 22.11 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.

...for explicitly named network interfaces

This reverts commit 6ae3e76.
(and evaluation fixups 08d26bb 7aed90a)
Some of the tests fail or time out after the merge.
@vcunat vcunat added the 1.severity: channel blocker Blocks a channel label Jan 30, 2023
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 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/` labels Jan 30, 2023
@vcunat
Copy link
Member Author

vcunat commented Jan 30, 2023

I tried some of the tests locally, but OfBorg can also:
@ofborg test networking.scripted.sit networking.networkd.privacy

@vcunat
Copy link
Member Author

vcunat commented Jan 30, 2023

And of course, if you have an actual fix... I can't look into what's wrong.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 30, 2023
@Atemu
Copy link
Member

Atemu commented Jan 30, 2023

cc @andrew-hoff

Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

Confirmed, I get a time-out with nix-build -A nixosTests.networking.scripted.sit prior to this change, and it completes almost immediately after this change. Let's get this in so nixos-unstable can update again :D

@cole-h cole-h merged commit 23ce77d into NixOS:master Jan 30, 2023
@Atemu
Copy link
Member

Atemu commented Jan 30, 2023

Could someone trigger a trunk-combined eval now that this is in?

@vcunat vcunat deleted the p/revert-virtualisation branch January 30, 2023 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: channel blocker Blocks a channel 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 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: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants