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.

Sign up for GitHub

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

nixosTests.nixos-rebuild-specialisations: Fix #237069

Merged
merged 1 commit into from
Jun 10, 2023
Merged

nixosTests.nixos-rebuild-specialisations: Fix #237069

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions nixos/tests/nixos-rebuild-specialisations.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
connect-timeout = 1;
};

system.extraDependencies = with pkgs; [
curl
desktop-file-utils
docbook5
docbook_xsl_ns
grub2
kmod.dev
libarchive
libarchive.dev
libxml2.bin
libxslt.bin
python3Minimal
shared-mime-info
stdenv
sudo
xorg.lndir
system.includeBuildDependencies = true;
Copy link
Member

Choose a reason for hiding this comment

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

Wouldn't this make the closure explode? :-(

I mean I dream of using this everywhere (while waiting for rebuildDependencyClosure which @JulienMalka is exploring).

Copy link
Member Author

Choose a reason for hiding this comment

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

Not the build closure ;)

It balloons, but does not explode.
Right now the test itself explodes. Pieces everywhere.

Copy link
Member Author

Choose a reason for hiding this comment

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

@JulienMalka

Awesome!

Added some thoughts here #180529 (comment)

Copy link
Member Author

Choose a reason for hiding this comment

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

So realistically I think our priorities should be

  1. maintainable tests
  2. working tests
  3. fast tests

This PR doesn't make (3) harder, because it's easy enough to find tests that do includeBuildDependencies = true.
Meanwhile it fixes (1) and (2).

Copy link
Member

Choose a reason for hiding this comment

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

I'm on board with the "correct by design".


system.extraDependencies = [
# Not part of the initial build apparently?
pkgs.grub2
];

virtualisation = {
Expand Down