diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-03 21:54:40 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-03 21:54:40 +0200 |
commit | 92124ed660c033aa3caa467876f7bc1c6f514d77 (patch) | |
tree | eaaac3b33ba341b7068ac11e536d56bb647c6480 /pkgs/tools/networking | |
parent | ac46ffbcfce03ad9b35c261301c008e9cf2bdb9b (diff) | |
parent | 3420bd63b9bbd4eb4e544b898a072c6fbbc9cfa9 (diff) | |
download | nixlib-92124ed660c033aa3caa467876f7bc1c6f514d77.tar nixlib-92124ed660c033aa3caa467876f7bc1c6f514d77.tar.gz nixlib-92124ed660c033aa3caa467876f7bc1c6f514d77.tar.bz2 nixlib-92124ed660c033aa3caa467876f7bc1c6f514d77.tar.lz nixlib-92124ed660c033aa3caa467876f7bc1c6f514d77.tar.xz nixlib-92124ed660c033aa3caa467876f7bc1c6f514d77.tar.zst nixlib-92124ed660c033aa3caa467876f7bc1c6f514d77.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/amass/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/croc/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/dnscrypt-proxy2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/dnsproxy/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/mosh/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/nethogs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/slirp4netns/default.nix | 16 | ||||
-rw-r--r-- | pkgs/tools/networking/yggdrasil/default.nix | 6 |
8 files changed, 30 insertions, 20 deletions
diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 348104e95913..93b2aba5dbfc 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "amass"; - version = "3.5.1"; + version = "3.5.4"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1lir0j6av5zl1jb3513cf7mlrydgnsvy0chn5ihg1fvbdiv5lww9"; + sha256 = "0sxcyrlgqajmlsicr4j2b8hq2fzw8ai1xsq176bz0f33q9m9wvhf"; }; - modSha256 = "1nahmgzd2akkr0zb80k6s1lz2s1fkggvilwi6bnafwqlaw0qxwcl"; + modSha256 = "1yjvwkm2zaf017lai5xl088x1z1ifwsbw56dagyf8z9jk9lhkcj7"; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 0412020518e5..20c9fe714511 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.0.4"; + version = "8.0.5"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0dc6h102jr5dkg6r3xxma51g702dnyd3d6s5rilwv1fivxn3bj43"; + sha256 = "1qc7na1c0c5i2r19vg54ggvcmnkyz024hqlbzgix2v5n6wlpk0fc"; }; - modSha256 = "0ng4x9zmwax2vskbcadra4pdkgy1p1prmgkg1bjmh3b8rwsrhr0q"; + modSha256 = "1y6qfb71vaard2l9fv83alprwpvii0pbzl8b3damd4j9x158hk7b"; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 089eee332b4c..b82f1e7bb4bb 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "dnscrypt-proxy2"; - version = "2.0.39"; + version = "2.0.42"; goPackagePath = "github.com/jedisct1/dnscrypt-proxy"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "jedisct1"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "0fvnp2brmqkwn04v01k53f9djk9ywa1cg26m2frhv4lj0581430y"; + sha256 = "1v4n0pkwcilxm4mnj4fsd4gf8pficjj40jnmfkiwl7ngznjxwkyw"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 8296600cf3d3..6f57e9812397 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.23.7"; + version = "0.24.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "1sfl2nyzspqllbklc9wf62wqxs0k3ac7vzqz8kl5h9ch654g542a"; + sha256 = "1jwy2qi99ks6zcas6h1n0zq3b0k47036ayas0mprdips60azw0hg"; }; - modSha256 = "0r5ybr4gpcdsldk12b0d4xiih6ckwnqkfwy89c97prv24v14zysv"; + modSha256 = "0kba3jay6m9ir1pc7i833p7ylbs610g0lkp8kc3gm47xnxy7j4gz"; meta = with stdenv.lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 98d2625aade9..5649ff06dda3 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { ++ (with perlPackages; [ perl IOTty ]) ++ lib.optional withUtempter libutempter; + enableParallelBuilding = true; + patches = [ ./ssh_path.patch ./utempter_path.patch diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix index a85d4d7ad108..7bc6d0e2be78 100644 --- a/pkgs/tools/networking/nethogs/default.nix +++ b/pkgs/tools/networking/nethogs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nethogs"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "raboof"; repo = "nethogs"; rev = "v${version}"; - sha256 = "13plwblwbnyyi40jaqx471gwhln08wm7f0fxyvj1yh3d81k556yx"; + sha256 = "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9"; }; buildInputs = [ ncurses libpcap ]; diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index b70bf2952f7a..01e4bdcaa8b5 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, libcap, libseccomp }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, glib +, libcap +, libseccomp +, libslirp +}: stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "0.4.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "1932q80s6187k4fsvgia5iwc9lqsdkxzqqwpw1ksy0mx8wzmwbih"; + sha256 = "152wmccz47anvx5w88qcz8higw80l17jl7i24xfj5574adviqnv2"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libcap libseccomp glib ]; + buildInputs = [ glib libcap libseccomp libslirp ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 3bf3b97c2355..91b080153279 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.3.13"; + version = "0.3.14"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "1k3xxarrl33sxik1dqahfllrhd501xqq5q5mcn4y5wi9lwywsy50"; + sha256 = "147kl2kvv1rn3yk0mlvd998a2yayjl07csxxkjvs6264j6csb860"; }; - modSha256 = "057yl3i29kwpd129aa2rb67s5rmz898fi2a7lxv3nfjp7018s9qw"; + modSha256 = "1ffp7q7kbkm1312sz6xnpc7342iczy9vj3m76lflirr1ljmw0dnb"; # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to |