Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging

There was one conflict in the NixOS manual; I checked that it still built after resolving it.
2019-04-01 00:40:03 -04:00
parent 7551417592 18aa59b0f2
commit 4ccb74011f
319 changed files with 5657 additions and 2610 deletions
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "catch2-${version}";
-  version = "2.6.0";
+  version = "2.7.0";

  src = fetchFromGitHub {
    owner = "catchorg";
    repo = "Catch2";
    rev = "v${version}";
-    sha256="1p2y6fhxfmb48nl03xdg62nfrwssaaiw10vzr194z6srcj90n2r7";
+    sha256="05j01v4hmw0vv5vcj11pbngl200b3j2yvawk08fw9a249jzx6v1a";
  };

  nativeBuildInputs = [ cmake ];