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
@@ -23,7 +23,7 @@ stdenv.mkDerivation {

  meta = with stdenv.lib; {
    homepage = https://github.com/powerline/fonts;
-    description = "Patched fonts for Powerline users.";
+    description = "Patched fonts for Powerline users";
    longDescription = ''
      Pre-patched and adjusted fonts for usage with the Powerline plugin.
    '';