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

sshuttle: 0.78.3 -> 0.78.4 #44895

Merged
merged 1 commit into from
Aug 30, 2018
Merged

sshuttle: 0.78.3 -> 0.78.4 #44895

merged 1 commit into from
Aug 30, 2018
+3 −14

Conversation

markuskowa
Copy link
Member

Motivation for this change

Updated package while fixing licenses.

CC @domenkozar for checking update

Things done

Update, removed patches (should be included now?)

  • 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)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@matthewbauer
Copy link
Member

Looks like sudo.patch might still be needed.

@markuskowa
Copy link
Member Author

The the sudo.patch is not compatible with the new version (6 out of 6 hunks FAILED). (?)

@xeji
Copy link
Contributor

xeji commented Aug 30, 2018

sudo.patch applies just fine here (and it has 1 hunk, not 6...). Please re-enable it.

applying patch /nix/store/50mpb45s17vyfmifdfrwibvnhlkldav5-sudo.patch
patching file sshuttle/client.py
Hunk #1 succeeded at 186 (offset 28 lines).

@markuskowa
Copy link
Member Author

Yes, you're right. I did overlook that there are 3 patches not just two. The sudo.patch is back in.

@xeji
Copy link
Contributor

xeji commented Aug 30, 2018

@GrahamcOfBorg build sshuttle

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: sshuttle

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: sshuttle

Partial log (click to expand)

sshuttle/tests/client/test_helpers.py ............                       [ 22%]
sshuttle/tests/client/test_methods_nat.py .........                      [ 36%]
sshuttle/tests/client/test_methods_pf.py .............                   [ 56%]
sshuttle/tests/client/test_methods_tproxy.py ..........                  [ 71%]
sshuttle/tests/client/test_options.py ........                           [ 83%]
sshuttle/tests/client/test_sdnotify.py ......                            [ 92%]
sshuttle/tests/server/test_server.py .....                               [100%]

========================== 66 passed in 0.76 seconds ===========================
/nix/store/lhrp5pnlhdjmx8crrfi6z22h9fx7c8w4-sshuttle-0.78.4

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: sshuttle

Partial log (click to expand)

sshuttle/tests/client/test_helpers.py ............                       [ 22%]
sshuttle/tests/client/test_methods_nat.py .........                      [ 36%]
sshuttle/tests/client/test_methods_pf.py .............                   [ 56%]
sshuttle/tests/client/test_methods_tproxy.py ..........                  [ 71%]
sshuttle/tests/client/test_options.py ........                           [ 83%]
sshuttle/tests/client/test_sdnotify.py ......                            [ 92%]
sshuttle/tests/server/test_server.py .....                               [100%]

========================== 66 passed in 0.51 seconds ===========================
/nix/store/q3z466dm1sqhs1bm30c2qzrmncci44yb-sshuttle-0.78.4

@xeji xeji merged commit b0401fa into NixOS:master Aug 30, 2018
@markuskowa markuskowa deleted the sshuttle-pr branch September 4, 2018 11:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xeji xeji

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@markuskowa @matthewbauer @xeji @GrahamcOfBorg