Merge branch 'master' into staging-next

zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.
2021-01-08 02:07:34 +01:00
parent 5c072a088d 9414948a5a
commit e6c0c98940
64 changed files with 1092 additions and 930 deletions
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "doctest";
-  version = "2.4.1";
+  version = "2.4.4";

  src = fetchFromGitHub {
    owner = "onqtam";
    repo = "doctest";
    rev = version;
-    sha256 = "17g7n6rjs90i0b231x5s934qnr8m80ga2yg1z344bnsdiqcjd63w";
+    hash = "sha256-NqXC5948prTCi4gsaR8bJPBTrmH+rJbHsGvwkJlpjXY=";
  };

  nativeBuildInputs = [ cmake ];