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

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
This commit is contained in:
Eelco Dolstra
2014-11-11 23:48:08 +01:00
parent 5cf4905f3b ea49ac0496
commit f33fa1b66b
307 changed files with 605 additions and 4972 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/nmap/default.nix
+2 -2
View File
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
];
meta = {
description = "A free and open source utility for network discovery and security auditing.";
homepage = "http://www.nmap.org";
description = "A free and open source utility for network discovery and security auditing";
homepage = http://www.nmap.org;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ mornfall thoughtpolice ];
pkgs/tools/security/tpm-quote-tools/default.nix
+6 -3
View File
@@ -11,9 +11,12 @@ stdenv.mkDerivation {
buildInputs = [ trousers openssl ];
meta = with stdenv.lib; {
description = ''The TPM Quote Tools is a collection of programs that provide support
for TPM based attestation using the TPM quote mechanism. The manual
page for tpm_quote_tools provides a usage overview.'';
description = "A collection of programs that provide support for TPM based attestation using the TPM quote mechanism";
longDescription = ''
The TPM Quote Tools is a collection of programs that provide support
for TPM based attestation using the TPM quote mechanism. The manual
page for tpm_quote_tools provides a usage overview.
'';
homepage = http://tpmquotetools.sourceforge.net/;
license = licenses.bsd3;
maintainers = [ maintainers.ak ];