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 | |
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')
-rw-r--r-- | pkgs/tools/filesystems/fuse-overlayfs/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/misc/3mux/default.nix | 24 | ||||
-rw-r--r-- | pkgs/tools/networking/httpie/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/sniffglue/default.nix | 27 |
4 files changed, 57 insertions, 6 deletions
diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 023479447882..4c8012de4f14 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, fuse3 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fuse3 }: stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "0.7.8"; + version = "1.0.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "10wsssf9mxgkgcqks3z02y9ya8xh4wd45lsb1jrvw31wmz9zpalc"; + sha256 = "0h1ay2l7zyiqplh8whanw68mcfri79lc03wjjrhqji5ddwznv6fa"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse3 ]; - meta = with lib; { + meta = with stdenv.lib; { description = "FUSE implementation for overlayfs"; longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers."; license = licenses.gpl3; diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix new file mode 100644 index 000000000000..3371b7956237 --- /dev/null +++ b/pkgs/tools/misc/3mux/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "3mux"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "aaronjanse"; + repo = pname; + rev = "v${version}"; + sha256 = "02ry066psvlqdyhimci7nskw4sfb70dw5z7ag7s7rz36gmx1vnmr"; + }; + + modSha256 = "1ag9lx8xcp2z9lrg404914zin45n8f4s08365yk71q5vyiwxjj3i"; + + meta = with stdenv.lib; { + description = "Terminal multiplexer inspired by i3"; + homepage = "https://github.com/aaronjanse/3mux"; + license = licenses.mit; + maintainers = with maintainers; [ aaronjanse filalex77 ]; + # TODO: fix modules build on darwin + broken = stdenv.isDarwin; + }; +} 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; + }; +} |