diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:10:38 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:10:38 +0200 |
commit | 4b706490da936a2d80708a090662af1523de40fa (patch) | |
tree | 718177c97875d2f81e9647ee23de04c0bb48e613 /pkgs/tools/networking | |
parent | 896680cd15cb5549c1985eb96d428828f6eaf2f1 (diff) | |
parent | 3d8e43691731037672c36129cbecb2fe43ffad7e (diff) | |
download | nixlib-4b706490da936a2d80708a090662af1523de40fa.tar nixlib-4b706490da936a2d80708a090662af1523de40fa.tar.gz nixlib-4b706490da936a2d80708a090662af1523de40fa.tar.bz2 nixlib-4b706490da936a2d80708a090662af1523de40fa.tar.lz nixlib-4b706490da936a2d80708a090662af1523de40fa.tar.xz nixlib-4b706490da936a2d80708a090662af1523de40fa.tar.zst nixlib-4b706490da936a2d80708a090662af1523de40fa.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/cjdns/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/corerad/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/networking/iftop/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/offlineimap/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/wifite2/default.nix | 30 |
5 files changed, 34 insertions, 16 deletions
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 065a77400323..452181754b17 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: -let version = "20.5"; in +let version = "20.6"; in stdenv.mkDerivation { name = "cjdns-"+version; @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "cjdelisle"; repo = "cjdns"; rev = "cjdns-v${version}"; - sha256 = "13f174bmbyqna899naja4fzpma3yaw815ylksk8klcc3glg07v7b"; + sha256 = "1d5rrnqb5dcmm5cg2ky1cgxz6ncb23n1j797j9zzw6xxdvkf3kgi"; }; buildInputs = [ which python27 nodejs ] ++ diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 96798c1c17e9..7be61d0e853d 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "corerad"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "0nxrksv98mxs5spykhzpydwjzii5cc6gk8az7irs3fdi4jx6pq1w"; + sha256 = "1594qrwrz4bc3iipm4aqb8l1zyi04pwmiz0vdlfn12qn1p7lad5p"; }; - modSha256 = "0vbbpndqwwz1mc59j7liaayxaj53cs8s3javgj3pvhkn4vp65p7c"; + modSha256 = "1cfhxkvwzf7sn227y6h5h19f27a9ngmpnyqdlfba5km8axqn29vm"; buildFlagsArray = '' -ldflags= - -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1583280117 + -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1586881022 -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} ''; diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index 66ce35e3a02d..70c1f0b6c965 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, libpcap, automake}: +{ stdenv, fetchurl, ncurses, libpcap, automake, nixosTests }: stdenv.mkDerivation { name = "iftop-1.0pre4"; @@ -18,6 +18,8 @@ stdenv.mkDerivation { buildInputs = [ncurses libpcap]; + passthru.tests = { inherit (nixosTests) iftop; }; + meta = with stdenv.lib; { description = "Display bandwidth usage on a network interface"; longDescription = '' diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 50a004754570..73e2e6b60f51 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -2,14 +2,14 @@ asciidoc, cacert, libxml2, libxslt, docbook_xsl }: python2Packages.buildPythonApplication rec { - version = "7.3.2"; + version = "7.3.3"; pname = "offlineimap"; src = fetchFromGitHub { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "0rmj1ws6hljqnfap3p3js5s46kx85yc02hjkiki5zg44wn3hswjg"; + sha256 = "1gg8ry67i20qapj4z20am9bm67m2q28kixcj7ja75m897vhzarnq"; }; postPatch = '' diff --git a/pkgs/tools/networking/wifite2/default.nix b/pkgs/tools/networking/wifite2/default.nix index 2333408f0781..8ff0c6d84ab5 100644 --- a/pkgs/tools/networking/wifite2/default.nix +++ b/pkgs/tools/networking/wifite2/default.nix @@ -1,16 +1,29 @@ -{ stdenv, lib, fetchFromGitHub, python3, aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools, which }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, python3, wirelesstools +, aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools +, hcxdumptool, pyrit, which }: python3.pkgs.buildPythonApplication rec { - version = "2.2.5"; + version = "2.5.2"; pname = "wifite2"; src = fetchFromGitHub { - owner = "derv82"; + owner = "kimocoder"; repo = "wifite2"; rev = version; - sha256 = "1hfy90wf2bjg0z8rbs8cfhhvz78pzg2c6nj0zksal42mb6b5cjdp"; + sha256 = "0hsb59d86szn27s3hynpzkp49rmw4g692vrl67nal7rfcdvpp8hb"; }; + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/${version}-1/debian/patches/Disable-aircrack-failing-test.patch"; + sha256 = "04qql8w27c1lqk59ghkr1n6r08jwdrb1dcam5k88szkk2bxv8yx1"; + }) + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/${version}-1/debian/patches/Disable-two-failing-tests.patch"; + sha256 = "1sixcqz1kbkhxf38yq55pwycm54adjx22bq46dfnl44mg69nx356"; + }) + ]; + propagatedBuildInputs = [ aircrack-ng wireshark-cli @@ -18,6 +31,9 @@ python3.pkgs.buildPythonApplication rec { cowpatty hashcat hcxtools + hcxdumptool + wirelesstools + pyrit which ]; @@ -27,14 +43,14 @@ python3.pkgs.buildPythonApplication rec { mv ${sitePackagesDir}/wifite/__main__.py ${sitePackagesDir}/wifite/wifite.py ''; - # which is not found - doCheck = false; + checkInputs = propagatedBuildInputs; + checkPhase = "python -m unittest discover tests -v"; meta = with stdenv.lib; { homepage = "https://github.com/derv82/wifite2"; description = "Rewrite of the popular wireless network auditor, wifite"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ lassulus ]; + maintainers = with maintainers; [ lassulus danielfullmer ]; }; } |