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

2013-10-02 22:44:12 +02:00
parent b15c3e49e5 1d03574722
commit ac5d5297dd
175 changed files with 3016 additions and 1052 deletions
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
  doCheck = true;

  meta = {
-    description = "GNU Source-Highlight, source code renderer with syntax highlighting";
+    description = "source code renderer with syntax highlighting";
    homepage = "http://www.gnu.org/software/src-highlite/";
    license = "GPLv3+";
    maintainers = [ ];