-
-
Notifications
You must be signed in to change notification settings - Fork 14.1k
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: 4.4.6 -> 5.0.9 #303930
xpra: 4.4.6 -> 5.0.9 #303930
Conversation
Result of 4 packages built:
|
ping maintainers @numinit @offlinehacker @mvnetbiz |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Works for me, can't find any traces of the error I previously mentioned
Looks like the tarballs are gone, probably as part of Xpra-org/xpra#2967 @aqrln can you add - src = fetchurl {
- url = "https://xpra.org/src/${pname}-${version}.tar.xz";
- hash = "sha256-np9g8F5PN4eB3VpuxMu/rtC2dJ+zXDhs9g9n/sy2iVY=";
+ src = fetchFromGitHub {
+ owner = "Xpra-org";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-geGgQUlUUT/kJ+0KxpHjcHyxOeZmgzka4MTew9kzsCk="; to your branch or would you prefer a new PR? I successfully tested xpra start with a Firefox window to x86_64-linux NixOS. This PR adds some type hints in the patches where there were none before (and only for some parameters) but otherwise LGTM 👍🏻 |
This is just the code updated from upstream (the surrounding code in the patches needed to be updated otherwise they couldn't be applied due to conflicts). The actual content of the patches (i.e. modifications in them) didn't change. It's hard to read a diff of a diff so it's confusing indeed. I basically just applied the old patches, fixed the conflicts and ran |
f0154a9
to
9b53b3d
Compare
Xpra 6.0.1 already exists but 5.0.8 is the last in the 5.x line. Should we aim at updating to 6.0.1 right away in this PR or should we merge the 4.x to 5.x update first, and then update to 6.x in a separate PR? |
I'd prefer the latter, then there is a commit with v5, binary cache etc. Also v5 is LTS with support planned until 2026. Not that it should keep us from updating but it sounds like a handy version to have easily accessible for troubleshooting. |
This needs updating for #324179. Our current Xpra server version is incompatible with the official 6.x clients, so it’d be great to get an update. |
96212a0
to
3b7900d
Compare
@emilazy done! |
Thanks. I understand not wanting to package 6.x in this PR, but could you bump to 5.0.9? |
sure, will do |
3b7900d
to
170cbd5
Compare
@emilazy done. 5.0.9 builds successfully but I haven't tested anything more than |
I just updated the server side of my setup. Could successfully use it for my seamless workflow from Debian stable official v6.1-r0 client. Have not checked the aspects regarding #324179 though. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Result of nixpkgs-review pr 303930
run on x86_64-linux 1
2 packages failed to build:
- xpraWithNvenc
- xpraWithNvenc.dist
3 packages built:
- run-scaled
- xpra
- xpra.dist
xpraWithNvenc
was already broken, so this looks good to me. A couple final nits; sorry for not catching these earlier!
Co-authored-by: Daniel Höxtermann <daniel@hxtm.dev>
170cbd5
to
dfc6da9
Compare
@emilazy thanks for the review, just pushed a new commit |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Glancing at their changelog it looks like 6.x broke compatibility but not 5.x, so I think we can merge this as‐is.
Description of changes
Update Xpra from 4.4.6 to 5.0.8.
Tested:
xpra start
andxpra shadow
: couldn't reproduce the issue reported by @kashw2 in Update request: xpra 4.4.6 → 5.0.3 #270566 (comment) on my NixOS 24.05.git.f0154a9104b0 aarch64.Not tested:
TODO: check the changelog and see if there are any breaking changes or incompatibilities in the major release. Add a release notes entry if necessary.
Closes: #270566
cc maintainers @offlinehacker @numinit @mvnetbiz
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.