diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-14 12:19:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-14 12:19:51 +0000 |
| commit | 6db494d5272c38e7a397e2d190caf131e1858d2d (patch) | |
| tree | d8fe6b238bbcce40119288a9e233a9602c576a2e /pkgs/tools/networking | |
| parent | 6d694e7ee16bf3fdca31afc5a8e90948a4a9ff58 (diff) | |
| parent | 971a85d2c11f65a0e87e8232b23cabc4090a7db3 (diff) | |
| download | nixpkgs-6db494d5272c38e7a397e2d190caf131e1858d2d.tar nixpkgs-6db494d5272c38e7a397e2d190caf131e1858d2d.tar.gz nixpkgs-6db494d5272c38e7a397e2d190caf131e1858d2d.tar.bz2 nixpkgs-6db494d5272c38e7a397e2d190caf131e1858d2d.tar.lz nixpkgs-6db494d5272c38e7a397e2d190caf131e1858d2d.tar.xz nixpkgs-6db494d5272c38e7a397e2d190caf131e1858d2d.tar.zst nixpkgs-6db494d5272c38e7a397e2d190caf131e1858d2d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/proxychains/default.nix | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 8eb20538ea9..56a553c0c80 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -1,27 +1,33 @@ -{ lib, stdenv, fetchFromGitHub } : +{ lib +, stdenv +, fetchFromGitHub +}: + stdenv.mkDerivation rec { pname = "proxychains"; - version = "4.2.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "haad"; - repo = "proxychains"; + repo = pname; rev = "${pname}-${version}"; - sha256 = "015skh3z1jmm8kxbm3nkqv1w56kcvabdmcbmpwzywxr4xnh3x3pc"; + sha256 = "083xdg6fsn8c2ns93lvy794rixxq8va6jdf99w1z0xi4j7f1nyjw"; }; postPatch = '' - # Temporary work-around; most likely fixed by next upstream release - sed -i Makefile -e '/-lpthread/a LDFLAGS+=-ldl' + # Suppress compiler warning. Remove it when upstream fix arrives + substituteInPlace Makefile --replace "-Werror" "-Werror -Wno-stringop-truncation" ''; + postInstall = '' cp src/proxychains.conf $out/etc ''; - meta = { + meta = with lib; { description = "Proxifier for SOCKS proxies"; homepage = "http://proxychains.sourceforge.net"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; }; } |