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

xvfb-run: refactor && add update script #167233

Merged
merged 1 commit into from
Apr 5, 2022
Merged

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Apr 4, 2022

Closes #72906
Supersedes #74499

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

@siraben
Copy link
Member

siraben commented Apr 4, 2022

Result of nixpkgs-review pr 167233 run on aarch64-darwin 1

@Artturin
Copy link
Member Author

Artturin commented Apr 5, 2022

added a installCheckPhase which runs xterm with xvfb-run

@Artturin Artturin merged commit a3fdbc6 into NixOS:master Apr 5, 2022
@Artturin Artturin deleted the xvfbhookadd branch April 5, 2022 19:05
@SuperSandro2000
Copy link
Member

I am overwriting xterm to a dummy package because I don't want its icon in my applications and it is enforced when using something with X here https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/x11/xserver.nix#L670 . Now I need to rebuild a bunch of stuff just because the test here uses it. Any ideas how to solve that in a nice way?

@Artturin
Copy link
Member Author

I am overwriting xterm to a dummy package because I don't want its icon in my applications and it is enforced when using something with X here https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/x11/xserver.nix#L670 . Now I need to rebuild a bunch of stuff just because the test here uses it. Any ideas how to solve that in a nice way?

Maybe this warrants a new option

remove =

paths = config.environment.systemPackages;

https://search.nixos.org/options?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=excludepackages

@SuperSandro2000
Copy link
Member

Very good idea. Currently testing locally and probably pushing later.

@SuperSandro2000 SuperSandro2000 mentioned this pull request Apr 10, 2022
13 tasks
@SuperSandro2000
Copy link
Member

#168194

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.

xvfb-run: update and clean up
3 participants