Merge remote-tracking branch 'origin/master' into stdenv-updates.

2013-02-24 19:27:08 +01:00
parent f20ff74afe 7d5056f8a3
commit 5f32207dfc
57 changed files with 474 additions and 224 deletions
--- a/pkgs/tools/security/aespipe/default.nix
+++ b/pkgs/tools/security/aespipe/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
    description = "AES encrypting or decrypting pipe";
    homepage = http://loop-aes.sourceforge.net/aespipe.README;
    license = "GPL";
-    maintainers = stdenv.lib.maintainers.goibniu;
+    maintainers = stdenv.lib.maintainers.goibhniu;
    platforms = stdenv.lib.platforms.linux;
  };
 }