Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-07-25 12:47:13 +00:00
parent 1f04b4a566 e725c927d4
commit f222d98746
261 changed files with 7674 additions and 1000924 deletions
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

  meta = {
    description = "Old-style RAID configuration utility";
-    longDescritipn = ''
+    longDescription = ''
      Old RAID configuration utility (still under development, though).
      It is fully compatible with modern kernels and mdadm recognizes
      its volumes. May be needed for rescuing an older system or nuking