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

Fix tests for Sshuttle on Darwin. #29757

Merged
merged 2 commits into from Sep 26, 2017
Merged

Fix tests for Sshuttle on Darwin. #29757

merged 2 commits into from Sep 26, 2017

Conversation

berdario
Copy link
Contributor

Motivation for this change

Tests for sshuttle are failing: https://hydra.nixos.org/build/60669852

I also opened another PR upstream for it sshuttle/sshuttle#170

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@berdario, thanks for your PR! By analyzing the history of the files in this pull request, we identified @zimbatm, @domenkozar and @aristidb to be potential reviewers.

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Sep 25, 2017
LnL7
LnL7 reviewed Sep 25, 2017
View reviewed changes
pkgs/tools/security/sshuttle/default.nix Outdated
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
url = "mirror://pypi/s/sshuttle/${name}.tar.gz";
};

patches = [ ./sudo.patch ];
patches = [ ./sudo.patch ./darwin.patch ];
Copy link
Member

Choose a reason for hiding this comment

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

that patch is pretty large, could you use fetchpatch for it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@LnL7 LnL7 merged commit 3ad8cc1 into NixOS:master Sep 26, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 LnL7 approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@berdario @mention-bot @LnL7