Merge branch 'staging' into fix-ncurses-darwin-extensions

This commit is contained in:
Matthew Justin Bauer
2018-05-02 15:40:38 -05:00
committed by GitHub
251 changed files with 2068 additions and 1387 deletions

View File

@@ -53,6 +53,8 @@ in stdenv.mkDerivation rec {
libX11 gtk2 pygtk pysqlite pygobject2 pycairo
];
doCheck = false; # fails 3 tests, probably needs the net
meta = {
description = "A free and open source utility for network discovery and security auditing";
homepage = http://www.nmap.org;

View File

@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
# configure script is not autotools-based, doesn't support these options
configurePlatforms = [ ];
doCheck = false; # fails
installTargets = [ "install" "install-lib-shared" "install-lib-so-link" ];
postInstall = "make -C librhash install-headers";

View File

@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doCheck = false; # needs root
postInstall =
''
rm -f $out/share/doc/sudo/ChangeLog