Merge remote-tracking branch 'upstream/master' into HEAD

2017-08-14 09:34:10 +02:00
parent d87f53baf9 eb9f427d4e
commit 62dac1bdd9
270 changed files with 1294 additions and 449 deletions
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

  meta = with stdenv.lib; {
    description = "Wrapper for 'diff' that produces the same output but with pretty 'syntax' highlighting";
-    homepage = http://www.colordiff.org/;
+    homepage = https://www.colordiff.org/;
    license = licenses.gpl3;
    platforms = platforms.linux ++ platforms.darwin;
    maintainers = with maintainers; [ nckx ];