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

xpra: 2.3.4 -> 2.5, unbreak? #58151

Merged
merged 1 commit into from Jun 10, 2019
Merged

xpra: 2.3.4 -> 2.5, unbreak? #58151

merged 1 commit into from Jun 10, 2019

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Mar 22, 2019

Motivation for this change

It builds and bits seem to almost work,
would be nice to try it in a VM with the xpra module enabled or
something?

May want to fix default paths for things like sockets
in order to get usage other than via NixOS module working.

Thoughts/comments/testing appreciated :).

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@dtzWill
Copy link
Member Author

dtzWill commented Mar 23, 2019

Previously: #51877 (and others linked from there)

@aanderse
Copy link
Member

I'm going to guess that #58589 has fixed the broken build on aarch64-linux.

@GrahamcOfBorg build xpra

@aanderse
Copy link
Member

Results of nix-review:

1 package failed to build:
winswitch

2 package were build:
run-scaled xpra

@aanderse aanderse mentioned this pull request May 12, 2019
10 tasks
@c0bw3b
Copy link
Contributor

c0bw3b commented May 12, 2019

I think we can just mark winswitch as broken..
Its last commit was in Nov. 2016 for compat with Xpra 1.0

Copy link
Member

@Ekleog Ekleog left a comment

Choose a reason for hiding this comment

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

LGTM! @dtzWill, any reason not to merge (potentially after having marked winswitch as broken)? :)

@dtzWill
Copy link
Member Author

dtzWill commented Jun 4, 2019 via email

@Ekleog
Copy link
Member

Ekleog commented Jun 4, 2019

Right, AFAIU if a dep is broken then the package can't be built without having allowed the dep, so marking it as broken should not make anything additional broken.

@dtzWill dtzWill merged commit 0a59b4d into NixOS:master Jun 10, 2019
@dtzWill dtzWill deleted the update/xpra-2.5 branch June 10, 2019 11:30
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

6 participants