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

x2goclient: Use nx-libs instead of nxproxy #55896

Merged
merged 1 commit into from
Feb 16, 2019
Merged

Conversation

srhb
Copy link
Contributor

@srhb srhb commented Feb 16, 2019

nxproxy was removed in favour of nx-libs, causing an eval failure in gcofborg (and possibly Hydra as well?) This should probably be reverted (or at least the nxproxy name should be removed instead of using lib.warn,) but this package also needs to refer to the nx-libs instead.

No real testing has been done here aside from running the executable -- I don't know the software.

See also #55723

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

nx-proxy was removed in favour of nx-libs
@srhb srhb requested a review from Ma27 February 16, 2019 11:34
@srhb
Copy link
Contributor Author

srhb commented Feb 16, 2019

Ah, it's only because the name only exists as an alias now, but this callPackage still depended on it. I think this should suffice to fix it. :)

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Feb 16, 2019
@srhb srhb merged commit 7e1fc7d into NixOS:master Feb 16, 2019
@LnL7
Copy link
Member

LnL7 commented Feb 16, 2019

ofborg checks evaluation without aliases, either keep the warning in all-packages.nix or fix the remaining references.

@LnL7
Copy link
Member

LnL7 commented Feb 16, 2019

Oh ignore me, this was the fix. 😄

@Ma27
Copy link
Member

Ma27 commented Feb 16, 2019

@srhb thanks a lot for fixing that!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants