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

Jump to bottom

nixos/xterm: Set default to xserver.enable #69093

Merged
merged 1 commit into from Sep 19, 2019
Merged

nixos/xterm: Set default to xserver.enable #69093

merged 1 commit into from Sep 19, 2019

Conversation

alexarice
Copy link
Contributor

Motivation for this change

Fixes #69079
I bisected this issue down to 456c42c
This changes the default for xterm to be true if stateVersion is older than 19.09.
I believe that in this case the default should be set to the xserver.enable default, as it was 2 commits before.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.
Notify maintainers

cc @worldofpeace

@matthewbauer
Copy link
Member

We may want to just enable xterm on those tests that need it.

@alexarice
Copy link
Contributor Author

The problem is that it is enabled when it shouldn't be (i.e. when xserver is not enabled). The tests don't need it

@matthewbauer
Copy link
Member

The problem is that it is enabled when it shouldn't be (i.e. when xserver is not enabled). The tests don't need it

Ah ok! My bad, I misunderstood what the problem.

@worldofpeace
Copy link
Contributor

Yeah this is what I meant to fix after it got merged a bit back, but I forgot about it 🤣

I actually want a fix like #68371, but I'm not too sure about the PR because I don't understand what we need to support.

@FRidh
Copy link
Member

FRidh commented Sep 19, 2019 •
edited

Let's get this in first to unblock the channels, if the fix is acceptable.

worldofpeace
worldofpeace approved these changes Sep 19, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

LGTM

@worldofpeace worldofpeace changed the title xterm: Set default to xserver.enable nixos/xterm: Set default to xserver.enable Sep 19, 2019
@worldofpeace worldofpeace merged commit db3d31b into NixOS:master Sep 19, 2019
@alexarice alexarice deleted the xterm-default branch September 19, 2019 17:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Unstable channel hasn't updated for 10+ days
4 participants
@alexarice @matthewbauer @worldofpeace @FRidh