Merge master into staging

2018-08-09 18:28:15 +02:00
parent 8b83460562 8c7fa1e836
commit d9fa74ba78
353 changed files with 13577 additions and 11052 deletions
@@ -93,11 +93,12 @@ let

    doCheck = false; # fails 10 out of ~2300 tests

-    meta = {
+    meta = with stdenv.lib; {
      description = "A version control system intended to be a compelling replacement for CVS in the open source community";
+      license = licenses.asl20;
      homepage = http://subversion.apache.org/;
-      maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ];
-      platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+      maintainers = with maintainers; [ eelco lovek323 ];
+      platforms = platforms.linux ++ platforms.darwin;
    };

  } // stdenv.lib.optionalAttrs stdenv.isDarwin {