diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-18 15:40:49 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-18 15:40:49 -0400 |
commit | 1ea80c2cc378da8072f821267793561e22467c3b (patch) | |
tree | ea7d4024bb001330390b9b381402d5a1af156df4 /pkgs/tools/networking | |
parent | e3d50e5cb0ad9de55f0ea3a01fd837667b038a48 (diff) | |
parent | 45b21b38a8ca61fed1b2ea7db3cd1bbe8ff3d848 (diff) | |
download | nixlib-1ea80c2cc378da8072f821267793561e22467c3b.tar nixlib-1ea80c2cc378da8072f821267793561e22467c3b.tar.gz nixlib-1ea80c2cc378da8072f821267793561e22467c3b.tar.bz2 nixlib-1ea80c2cc378da8072f821267793561e22467c3b.tar.lz nixlib-1ea80c2cc378da8072f821267793561e22467c3b.tar.xz nixlib-1ea80c2cc378da8072f821267793561e22467c3b.tar.zst nixlib-1ea80c2cc378da8072f821267793561e22467c3b.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/httpie/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/sniffglue/default.nix | 27 |
2 files changed, 29 insertions, 2 deletions
diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index f97d868d7bd2..01986bf93219 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "httpie"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jakubroztocil"; repo = "httpie"; rev = version; - sha256 = "0d0rsn5i973l9y0ws3xmnzaw4jwxdlryyjbasnlddph5mvkf7dq0"; + sha256 = "1vwjlzx830q4dcm3r7j9cl8yzka37dw42rl1r05m5ysb1081cbj2"; }; outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/tools/networking/sniffglue/default.nix b/pkgs/tools/networking/sniffglue/default.nix new file mode 100644 index 000000000000..83f1e372aa58 --- /dev/null +++ b/pkgs/tools/networking/sniffglue/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, rustPlatform, libpcap, libseccomp, pkgconfig }: + +rustPlatform.buildRustPackage rec { + pname = "sniffglue"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = pname; + rev = "v${version}"; + sha256 = "0vyxlqwh90shihp80fk0plnkjix9i37n2dnypzyz6nx44xd5737s"; + }; + + cargoSha256 = "162p3a696k281cygqpl6gg4makwk2v0g2jnf1gd108dnz4jya11l"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libpcap libseccomp ]; + + meta = with lib; { + description = "Secure multithreaded packet sniffer"; + homepage = "https://github.com/kpcyrd/sniffglue"; + license = licenses.gpl3; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux; + }; +} |