public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging' into glibc230

Browse Source 
Conflicts:
	pkgs/applications/misc/vit/default.nix
This commit is contained in:
Maximilian Bosch
2020-01-28 14:54:51 +01:00
parent b7574e08a0 cdff57e1fc
commit 6b0cd9ad47
893 changed files with 19232 additions and 16946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/security/chrome-token-signing/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }:
{ mkDerivation, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "chrome-token-signing";
version = "1.0.7";

31
pkgs/tools/security/enum4linux/default.nix Normal file
View File

@@ -0,0 +1,31 @@
{ stdenv, fetchurl, makeWrapper, samba, perl, openldap }:
stdenv.mkDerivation rec {
pname = "enum4linux";
version = "0.8.9";
src = fetchurl {
url = "https://labs.portcullis.co.uk/download/enum4linux-${version}.tar.gz";
sha256 = "41334df0cb1ba82db9e3212981340372bb355a8160073331d2a1610908a62d85";
};
dontBuild = true;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ samba perl openldap ];
installPhase = ''
mkdir -p $out/bin
cp enum4linux.pl $out/bin/enum4linux
wrapProgram $out/bin/enum4linux \
--prefix PATH : ${stdenv.lib.makeBinPath [ samba openldap ]}
'';
meta = with stdenv.lib; {
description = "A tool for enumerating information from Windows and Samba systems";
homepage = "https://labs.portcullis.co.uk/tools/enum4linux/";
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = [ maintainers.fishi0x01 ];
};
}

15
pkgs/tools/security/fail2ban/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchpatch, python3, gamin }:
{ stdenv, fetchFromGitHub, python3, gamin }:
let version = "0.10.4"; in
let version = "0.10.5"; in
python3.pkgs.buildPythonApplication {
pname = "fail2ban";
@@ -10,18 +10,9 @@ python3.pkgs.buildPythonApplication {
owner = "fail2ban";
repo = "fail2ban";
rev = version;
sha256 = "07ik6rm856q0ic2r7vbg6j3hsdcdgkv44hh5ck0c2y21fqwrck3l";
sha256 = "1s8g46vkwhqnagj69v4wvcasypzkmq7awhfbxahffrypcpad5ach";
};
patches = [
# 0.10.3 supports Python 3 but somehow this got into the way
# https://github.com/fail2ban/fail2ban/issues/2255
(fetchpatch {
url = "https://github.com/fail2ban/fail2ban/commit/657b147c0d7830f3600f3dc7feaa4815a7e19fde.patch";
sha256 = "1hrk2x7ssrfhab1wrjk5xw1sxhiv2735glfcp6qcj8x4dss3q7f7";
})
];
pythonPath = with python3.pkgs;
stdenv.lib.optionals stdenv.isLinux [
systemd

6
pkgs/tools/security/fido2luks/default.nix
View File

@@ -7,19 +7,19 @@
rustPlatform.buildRustPackage rec {
pname = "fido2luks";
version = "0.2.2";
version = "0.2.3";
src = fetchFromGitHub {
owner = "shimunn";
repo = pname;
rev = version;
sha256 = "018qzbgmgm0f0d0c7i54nqqjbr4k5mzy1xfavi6hpifjll971wci";
sha256 = "0340xp7q6f0clb7wmqpgllllwsixmsy37k1f5kj3hwvb730rz93x";
};
buildInputs = [ cryptsetup ];
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "1kf757wxxk5h8dfbz588qw1pnyjbg5qzr7rz14i7x8rhmn5xwb74";
cargoSha256 = "1i37k4ih6118z3wip2qh4jqk7ja2z0v1w8dri1lwqwlciqw17zi9";
verifyCargoDeps = true;
meta = with stdenv.lib; {

14
pkgs/tools/security/fprintd/default.nix
View File

@@ -1,9 +1,11 @@
{ stdenv
{ thinkpad ? false
, stdenv
, fetchurl
, fetchpatch
, pkgconfig
, intltool
, libfprint
, libfprint-thinkpad ? null
, libfprint ? null
, glib
, dbus-glib
, polkit
@@ -15,7 +17,7 @@
}:
stdenv.mkDerivation rec {
pname = "fprintd";
pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad";
version = "0.9.0";
src = fetchurl {
@@ -44,8 +46,10 @@ stdenv.mkDerivation rec {
nss
pam
systemd
libfprint
];
]
++ stdenv.lib.optional thinkpad libfprint-thinkpad
++ stdenv.lib.optional (!thinkpad) libfprint
;
configureFlags = [
# is hardcoded to /var/lib/fprint, this is for the StateDirectory install target

4
pkgs/tools/security/munge/default.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gawk, gnused, libgcrypt, zlib, bzip2 }:
stdenv.mkDerivation rec {
name = "munge-0.5.13";
name = "munge-0.5.14";
src = fetchFromGitHub {
owner = "dun";
repo = "munge";
rev = name;
sha256 = "1c4ff3d8ad3inbliszr4slym3b4cn19bn6mxm13mzy20jyi2rm70";
sha256 = "15h805rwcb9f89dyrkxfclzs41n3ff8x7cc1dbvs8mb0ds682c4j";
};
nativeBuildInputs = [ autoreconfHook gawk gnused ];

43
pkgs/tools/security/nmap/default.nix
View File

@@ -1,24 +1,16 @@
{ stdenv, fetchurl, fetchpatch, libpcap, pkgconfig, openssl, lua5_3
, pcre, liblinear, libssh2
, graphicalSupport ? false
, libX11 ? null
, gtk2 ? null
, withPython ? false # required for the `ndiff` binary
, python2Packages ? null
, python2 ? null
, makeWrapper ? null
, withLua ? true
}:
assert withPython -> python2Packages != null;
with stdenv.lib;
let
# Zenmap (the graphical program) also requires Python,
# so automatically enable pythonSupport if graphicalSupport is requested.
pythonSupport = withPython || graphicalSupport;
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
version = "7.80";
@@ -48,10 +40,7 @@ in stdenv.mkDerivation rec {
configureFlags = [
(if withLua then "--with-liblua=${lua5_3}" else "--without-liblua")
]
++ optional (!pythonSupport) "--without-ndiff"
++ optional (!graphicalSupport) "--without-zenmap"
;
] ++ optionals (!graphicalSupport) [ "--without-ndiff" "--without-zenmap" ];
makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"AR=${stdenv.cc.bintools.targetPrefix}ar"
@@ -59,18 +48,22 @@ in stdenv.mkDerivation rec {
"CC=${stdenv.cc.targetPrefix}gcc"
];
postInstall = optionalString pythonSupport ''
wrapProgram $out/bin/ndiff --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH"
'' + optionalString graphicalSupport ''
wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath $pygtk)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pygobject)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pycairo)/gtk-2.0
pythonPath = with python2.pkgs; optionals graphicalSupport [
pygtk pysqlite pygobject2 pycairo
];
nativeBuildInputs = [ pkgconfig ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ];
buildInputs = [ pcre liblinear libssh2 libpcap openssl ] ++ optionals graphicalSupport (with python2.pkgs; [
python2 libX11 gtk2
]);
postInstall = optionalString graphicalSupport ''
buildPythonPath "$out $pythonPath"
patchPythonScript $out/bin/ndiff
patchPythonScript $out/bin/zenmap
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = with python2Packages; [ libpcap openssl ]
++ optionals pythonSupport [ makeWrapper python ]
++ optionals graphicalSupport [
libX11 gtk2 pygtk pysqlite pygobject2 pycairo
];
enableParallelBuilding = true;
doCheck = false; # fails 3 tests, probably needs the net

4
pkgs/tools/security/nmap/qt.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper
{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook
, dnsutils, nmap
, qtbase, qtscript, qtwebengine }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "10wqyrjzmad1g7lqa65rymbkna028xbp4xcpj442skw8gyrs3994";
};
nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
buildInputs = [ qtbase qtscript qtwebengine ];

24
pkgs/tools/security/rage/default.nix Normal file
View File

@@ -0,0 +1,24 @@
{ stdenv, rustPlatform, fetchFromGitHub, Security }:
rustPlatform.buildRustPackage rec {
pname = "rage";
version = "0.2.0";
src = fetchFromGitHub {
owner = "str4d";
repo = pname;
rev = "v${version}";
sha256 = "0ri4rfhy1wl0cppi2cp97kkiz08x2f072yfahn2kv9r4v1i9f4a7";
};
cargoSha256 = "02adwvcvha83zcvc5n7p88l7wmkg52j2xhznmhabc0zn328as2yd";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "A simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability";
homepage = "https://github.com/str4d/rage";
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
};
}

4
pkgs/tools/security/vault/default.nix
View File

@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "vault";
version = "1.3.1";
version = "1.3.2";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
sha256 = "052aj79gwmydc7ph1g567cbssqf8dsmqxad47k5hc5sc58bx7c93";
sha256 = "17zymmm1r4yxwazn2qx2l01i7g91rn40h7hzgwf0pr6pwmdxvkzg";
};
goPackagePath = "github.com/hashicorp/vault";