diff options
| author | Austin Seipp <aseipp@pobox.com> | 2018-11-03 19:57:25 -0500 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2018-11-03 19:57:25 -0500 |
| commit | c55fa1e122b3dc6a62ce6cfc98b0a2dc032f7a46 (patch) | |
| tree | 45b1eeaef273d0f149933d5486fdb4056ea96171 /pkgs/tools | |
| parent | e1baed0143df32dd18630553aa4e770307fdf2cf (diff) | |
| parent | 800184df21cfe4924e1e901f387cda49a9a8269c (diff) | |
| download | nixlib-c55fa1e122b3dc6a62ce6cfc98b0a2dc032f7a46.tar nixlib-c55fa1e122b3dc6a62ce6cfc98b0a2dc032f7a46.tar.gz nixlib-c55fa1e122b3dc6a62ce6cfc98b0a2dc032f7a46.tar.bz2 nixlib-c55fa1e122b3dc6a62ce6cfc98b0a2dc032f7a46.tar.lz nixlib-c55fa1e122b3dc6a62ce6cfc98b0a2dc032f7a46.tar.xz nixlib-c55fa1e122b3dc6a62ce6cfc98b0a2dc032f7a46.tar.zst nixlib-c55fa1e122b3dc6a62ce6cfc98b0a2dc032f7a46.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/admin/ansible/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/tools/networking/i2pd/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/tor/default.nix | 4 |
3 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 2b6877cb25f5..c86a108fc425 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -53,15 +53,20 @@ in rec { }; ansible_2_5 = generic { - version = "2.5.2"; - sha256 = "1r9sq30xz3jrvx6yqssj5wmkml1f75rx1amd7g89f3ryngrq6m59"; + version = "2.5.11"; + sha256 = "07rhgkl3a2ba59rqh9pyz1p661gc389shlwa2sw1m6wwifg4lm24"; }; ansible_2_6 = generic { - version = "2.6.2"; - sha256 = "1y5gd9h641p6pphwd7j99yyqglyj23rkmid7wgzk62611754qzkl"; + version = "2.6.7"; + sha256 = "10pakw9k9wd3cy1qk3ah2253ph7c7h3qzpal4k0s5lschzgy2fh0"; }; - ansible2 = ansible_2_6; + ansible_2_7 = generic { + version = "2.7.1"; + sha256 = "0fg95x2nr3j4rwnlyd2n03h91xx9fssi34c32356vk3z6ir395g7"; + }; + + ansible2 = ansible_2_7; ansible = ansible2; } diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 9ecf69637872..7ab77b2d2ee7 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.21.0"; + version = "2.21.1"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "02zsig63cambwm479ckw4kl1dk00g1q2sbzsvn9vy1xpjy928n7v"; + sha256 = "0j892s9ga9fjc2q1rw3hp5il4mw1jc0aiw60y1rfaiflyv0wd696"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index d7344884951c..d43b8598c18b 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -14,11 +14,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.4.8"; + name = "tor-0.3.4.9"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "08qhzcmzxp5xr2l5721vagksqnnbrzzzy5hmz5y9r8lrq2r4qsl2"; + sha256 = "0jhnvnp08hsfrzgsvg5xnfxyaw3nzgg9h24cwbwnz6iby20i05qs"; }; outputs = [ "out" "geoip" ]; |