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

Jump to bottom

xorg: allow overriding via overrideScope' for 18.09 #48673

Merged
merged 8 commits into from Oct 20, 2018
Merged

xorg: allow overriding via overrideScope' for 18.09 #48673

merged 8 commits into from Oct 20, 2018

Conversation

Ericson2314
Copy link
Member

Motivation for this change

Backport of #45328. Good so any other xorg backports during 18.09's tenure don't hit major merge conflicts. No hashes changed.

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@Ericson2314
Copy link
Member Author

I don't understand this failure. Don't no-aliases checks post-date 18.03?

@Ericson2314
Copy link
Member Author

CC @thefloweringash

@samueldr
Copy link
Member

samueldr commented Oct 19, 2018 •
edited

@Ericson2314 eval issues fixed in #48692; there were fixes in master that were not present in 18.09; and the check was just recently merged in ofborg.

@GrahamcOfBorg eval

@Ericson2314
Copy link
Member Author

Thanks!!

@Ericson2314
Copy link
Member Author

Ericson2314 commented Oct 20, 2018 •
edited

From https://gist.github.com/GrahamcOfBorg/c2bd575b88acf19b42b364f6738a3b09 the only real change is due to xeyes getting an extra xproto dep. Seems fine to me.

@Ericson2314 Ericson2314 merged commit 2569506 into NixOS:release-18.09 Oct 20, 2018
@Ericson2314 Ericson2314 deleted the xorg-override-18.09 branch October 20, 2018 17:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
8.has: clean-up 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Ericson2314 @samueldr @GrahamcOfBorg @thefloweringash