Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a12ad22c2cc7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 97c60ab34a8c
Choose a head ref
  • 3 commits
  • 1 file changed
  • 3 contributors

Commits on Mar 14, 2018

  1. sshuttle: fix build on i686-linux

    volth committed Mar 14, 2018
    Copy the full SHA
    f161fe0 View commit details

  2. shuttle: disable buggy test on darwin

    @Mic92
    Mic92 committed Mar 14, 2018
    Copy the full SHA
    ca1921e View commit details

  3. Merge pull request #36971 from volth/no-pandoc-on-i686 

    sshuttle: fix build on i686-linux
    @Mic92
    Mic92 authored Mar 14, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    97c60ab View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 pkgs/tools/security/sshuttle/default.nix
6 changes: 5 additions & 1 deletion pkgs/tools/security/sshuttle/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
})
];

nativeBuildInputs = [ makeWrapper pandoc python3Packages.setuptools_scm ];
nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.system != "i686-linux") pandoc;
buildInputs =
[ coreutils openssh ] ++
stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ];
@@ -29,6 +29,10 @@ python3Packages.buildPythonApplication rec {
# uses Python 3, so it should be fine.
doCheck = true;

checkPhase = ''
py.test -k "${stdenv.lib.optionalString stdenv.isDarwin "not test_parse_subnetport_ip6"}"
'';

postInstall = let
mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x);
in ''