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

2015-05-01 15:57:09 -07:00
parent 8591db4b10 cf0b6b7be8
commit 00df204c82
122 changed files with 2018 additions and 323 deletions
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

  meta = with stdenv.lib; {
    homepage = "http://aide.sourceforge.net/";
-    description = "Advanced Intrusion Detection Environment (AIDE) is a file and directory integrity checker";
+    description = "A file and directory integrity checker";
    license = licenses.free;
    maintainers = [ maintainers.tstrobel ];
    platforms = platforms.linux;