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

tigervnc: unbreak the build (and add tests) #85124

Closed
wants to merge 3 commits into from
Closed

tigervnc: unbreak the build (and add tests) #85124

wants to merge 3 commits into from

Conversation

iblech
Copy link
Contributor

@iblech iblech commented Apr 13, 2020

Motivation for this change

Right now, the vncserver of tigervnc doesn't start because xauth is missing from $PATH. This pull request fixes this and also adds a basic test, both for tigervnc and for tightvnc.

Note that tightvnc in principle has the same xauth problem, but there it has already been solved by patching the start script (by replacing xauth with ${xauth}). Here we simply add it to the path with makeBinPath. I don't know which procedure is best practice.

I was not able to actually run the test I added since the computers I have access to lack kvm support.

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.

@ofborg ofborg bot requested a review from viric April 13, 2020 04:10
@iblech
Copy link
Contributor Author

iblech commented Apr 13, 2020 •
edited

@GrahamcOfBorg test vnc

(I don't actually know whether I have permissions to ask our bot for this favor, but thought that I might just try it.)

Update: I'm not a trusted user, hence the tests did not run. I'm grateful if somebody else could run them so that I can fix the test script if needed. :-)

@Mic92
Copy link
Member

Mic92 commented Apr 13, 2020

@GrahamcOfBorg test vnc

@jonringer
Copy link
Contributor

@GrahamcOfBorg test vnc

Mic92
Mic92 reviewed Apr 13, 2020
View reviewed changes
nixos/tests/tigervnc.nix

in with pkgs; {
testTigerVNC = makeVNCTest "tigervnc" tigervnc;
testTightVNC = makeVNCTest "tightvnc" tightvnc;
Copy link
Member

Choose a reason for hiding this comment

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

Ok. Maybe the renaming was not the best idea. Just spotted that it tests two different implementations. However trying to build this, still causes infinite recursion.

Copy link
Contributor Author

@iblech iblech Apr 23, 2020 •
edited

Choose a reason for hiding this comment

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

Yes, the idea was to have one test file for both packages, as they are very similar in their functionality.

What's the best way to proceed? If I'm honest then I'm not completely sure why we use passthru.tests.tigervnc = nixosTests.tigervnc which I believe to cause the infinite recursion. I loosely based the test on the test for Mumble, and the Mumble package also does not contain an analogue of this declaration.

Thank you for tending to this pull request! :-)

Copy link
Member

Choose a reason for hiding this comment

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

Actually I use the same thing here: https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/ferm/default.nix#L30

@Mic92
Copy link
Member

Mic92 commented Apr 23, 2020

I cherry-picked the vncserver fix itself into 4fb8fab
and backported it to 20.03 in 0321cea

@Ekleog
Copy link
Member

Ekleog commented Jun 18, 2020

@iblech AFAIU @Mic92 merged the fix, meaning that this PR only adds tests now. Are you still interested in rebasing on a recent master and pushing this to completion?

On that topic @Mic92, I can't see in the comments any reason for you not to merge the tests too. Or maybe you just didn't review them?

@lheckemann lheckemann mentioned this pull request Jul 20, 2021
Merged
11 tasks
@stale
Copy link

stale bot commented Nov 16, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Nov 16, 2021
@SuperSandro2000
Copy link
Member

Closing due to inactivity from author.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@viric viric Awaiting requested review from viric

Assignees
No one assigned
Labels
2.status: merge conflict 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 6.topic: nixos 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@iblech @Mic92 @jonringer @Ekleog @SuperSandro2000 @ryantm