diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-07-21 15:41:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 15:41:22 +0100 |
| commit | 218298b30fe79be30716438a1906d1abd61b9377 (patch) | |
| tree | 65e0041ee5468689142d669c4c4fc4f73f3618ba /pkgs/tools/networking | |
| parent | cd6e2c9642b8e608c905f350cece21141435deef (diff) | |
| parent | e85db6863a546cfdde0150f03ed0d2db28992575 (diff) | |
| download | nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.gz nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.bz2 nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.lz nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.xz nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.zst nixlib-218298b30fe79be30716438a1906d1abd61b9377.zip | |
Merge branch 'master' into unused5
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/s3cmd/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/spoofer/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index c3d60d8e87b9..e74a3554dc29 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -2,13 +2,13 @@ python2Packages.buildPythonApplication rec { name = "s3cmd-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "s3tools"; repo = "s3cmd"; rev = "v${version}"; - sha256 = "198hzzplci57sb8hdan30nbakslawmijfw0j71wjvq85n3xn6qsl"; + sha256 = "0ninw830309cxga99gjnfghpkywf9kd6yz4wqsq85zni1dv39cdk"; }; propagatedBuildInputs = with python2Packages; [ python_magic dateutil ]; diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index 675777e4faa6..acda30dbfef8 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute , withGUI ? false, qt5 }: -let inherit (stdenv.lib) optional optionalString; +let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { |