diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
| commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
| tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/tools/security/sshuttle | |
| parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
| parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
| download | nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.zip | |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/tools/security/sshuttle')
| -rw-r--r-- | pkgs/tools/security/sshuttle/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 62d3d2613cc1..b7cefdd86ea4 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -2,8 +2,8 @@ , coreutils, iptables, nettools, openssh, procps }: pythonPackages.buildPythonPackage rec { - version = "0.76"; name = "sshuttle-${version}"; + version = "0.76"; src = fetchurl { sha256 = "1q0hr0vhdvv23cw5dqndsmf61283mvs6b14662ci00xj6zp5v48b"; @@ -26,7 +26,6 @@ pythonPackages.buildPythonPackage rec { ''; meta = with stdenv.lib; { - inherit version; homepage = https://github.com/sshuttle/sshuttle/; description = "Transparent proxy server that works as a poor man's VPN"; longDescription = '' |