Merge branch 'master.upstream' into staging.upstream

2015-06-12 13:47:46 -07:00
parent 85ae0cb070 5ee75e236c
commit 954801a9a8
127 changed files with 1911 additions and 6798 deletions
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
      aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code.
    '';
    homepage = https://github.com/theZiz/aha;
-    downloadPage = https://github.com/theZiz/aha/releases;
    license = with licenses; [ lgpl2Plus mpl11 ];
    platforms = with platforms; linux;
    maintainers = with maintainers; [ nckx ];