Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2021-03-18 13:35:59 +01:00
206 changed files with 3936 additions and 1371 deletions

View File

@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "bettercap";
version = "2.29";
version = "2.30";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-hXYsFRYSyYKYJM4gS0Dyiia9aPA07GWSsp9doA0vYGI=";
sha256 = "sha256-Ge+fbNEWq+84LypUbNrnNMOxcDJb8rFlP/QUoE7yEds=";
};
vendorSha256 = "sha256-yIvwYUK+4cnHFwvJS2seDa9vJ/2cQ10Q46hR8U0aSRE=";
vendorSha256 = "sha256-fApxHxdzEEc+M+U5f0271VgrkXTGkUD75BpDXpVYd5k=";
doCheck = false;

View File

@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs
, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
, glib , libgee, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ autoconf automake intltool libtool vala glib encfs
gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE
gtk3 libgnome-keyring libgee xorg.libSM xorg.libICE
wrapGAppsHook gobject-introspection ];
patches = [ ./makefile-mkdir.patch ];

View File

@@ -1,25 +1,28 @@
{ buildGoModule
{ lib
, buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "nuclei";
version = "2.2.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "nuclei";
repo = pname;
rev = "v${version}";
sha256 = "0xrvza86aczlnb11x58fiqch5g0q6gvpxwsi5dq3akfi95gk3a3x";
sha256 = "sha256-NM/Ggd5MKctQKE0MNawyE+Xciuj9++6DXXkMrrpfkhA=";
};
vendorSha256 = "1v3ax8l1lgp2vs50gsa2fhdd6bvyfdlkd118akrqmwxahyyyqycv";
vendorSha256 = "sha256-h+MuMfIKXgXzLU6hNMxfPXawic9UZrwzVlzjjRF7X3o=";
preBuild = ''
mv v2/* .
'';
# Test files are not part of the release tarball
doCheck = false;
meta = with lib; {
description = "Tool for configurable targeted scanning";
longDescription = ''

View File

@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "sn0int";
version = "0.20.0";
version = "0.20.1";
src = fetchFromGitHub {
owner = "kpcyrd";
repo = pname;
rev = "v${version}";
sha256 = "1zjrbrkk7phv8s5qr0gj6fnssa31j3k3m8c55pdfmajh7ry7wwd1";
sha256 = "sha256-vnSpItch9RDUyYxERKRwYPmRLwRG9gAI7iIY+7iRs1w=";
};
cargoSha256 = "1jvaavhjyalnh10vfhrdyqg1jnl8b4a3gnp8a31bgi3mb0v466k3";
cargoSha256 = "sha256-1QqNI7rdH5wb1Zge8gkJtzg2Hgd/Vk9DAU9ULk/5wiw=";
nativeBuildInputs = [ pkg-config ];

View File

@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "sudo";
version = "1.9.6";
version = "1.9.6p1";
src = fetchurl {
url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
sha256 = "sha256-YslYBJLNLn3WJztc/hl1YPLFCKg2SdHOT2HI7gL/OlU=";
sha256 = "sha256-qenNwFj6/rnNPr+4ZMgXVeUk2YqgIhUnY/JbzoyjypA=";
};
prePatch = ''

View File

@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "teler";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "kitabisa";
repo = "teler";
rev = "v${version}";
sha256 = "sha256-0tx/oyHl6s1mj7NyWMZGCJoSuOeB+BMlBrnGY4IN/i4=";
sha256 = "sha256-FZG23j7LUwfJ0dSbU4xW0YyCKJxOjVf1uqkuGlrwnqs=";
};
vendorSha256 = "sha256-KvUnDInUqFW7FypgsppIBQZKNu6HVsEeHtGwdqYtoys=";