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

nixos/tests: fix x11 tests #99136

Merged
merged 1 commit into from Sep 30, 2020
Merged

Conversation

jonringer
Copy link
Contributor

@jonringer jonringer commented Sep 30, 2020

Motivation for this change

when trying to fix the plasma tests to fix #98657 (comment) I stumbled onto the fact that all plasma tests are broken in master right now

git bisect'd it to c451603

this is because the nixos tests don't allow for unfree fonts.
example error:

$ nix-build -A nixosTests.plasma5
error: Package ‘font-bh-lucidatypewriter-100dpi-1.0.3’ in /home/jon/projects/nixpkgs/pkgs/servers/x11/xorg/default.nix:199 has an unfree license (‘unfree’), refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

(use '--show-trace' to show detailed location information)

This PR is just a "quick fix". not sure what ramification this will have normal users

broken tests:

[19:42:41] jon@nixos ~/projects/nixpkgs/nixos/tests (fix-nixos-tests)
$ rg xserver -l
lightdm.nix
xfce.nix
xautolock.nix
xmonad.nix
pt2-clone.nix
signal-desktop.nix
networking-proxy.nix
gnome3.nix
gnome3-xorg.nix
i3wm.nix
common/auto.nix
common/x11.nix
plasma5.nix
enlightenment.nix
pantheon.nix
keymap.nix
shattered-pixel-dungeon.nix
sddm.nix
virtualbox.nix
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jonringer
Copy link
Contributor Author

@GrahamcOfBorg test lightdm

@jonringer
Copy link
Contributor Author

sorry, there's some other unfree ones from the fonts module, hold off merging

@jonringer
Copy link
Contributor Author

@GrahamcOfBorg test lightdm

@xaverdh
Copy link
Contributor

xaverdh commented Sep 30, 2020

not sure what ramification this will have normal users

building my system is currently blocked, unless I set allowUnfree = true, which I would prefer not to do unnecessarily ..
thanks for fixing this!

@jonringer
Copy link
Contributor Author

jonringer commented Sep 30, 2020

there's several other fonts which get installed. Since this is preventing people from doing a nixos-rebuild (without allowUnfree=true;, I'm going to merge. If a better alternative comes up, then I'll be happy to review that PR

@jonringer jonringer merged commit 46e27bc into NixOS:master Sep 30, 2020
@jonringer jonringer deleted the fix-nixos-tests branch September 30, 2020 16:12
7c6f434c added a commit to 7c6f434c/nixpkgs that referenced this pull request Oct 2, 2020
7c6f434c added a commit that referenced this pull request Oct 2, 2020
xdummy: make unfree fonts optional; see also #99136
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.

None yet

2 participants