Merge release-21.05 into staging-next-21.05

2021-07-01 00:02:42 +00:00
parent bb60ebee93 beb05a45aa
commit 5052d11c95
17 changed files with 531 additions and 453 deletions
@@ -2,14 +2,14 @@

 stdenv.mkDerivation rec {
  pname = "olm";
-  version = "3.2.2";
+  version = "3.2.4";

  src = fetchFromGitLab {
    domain = "gitlab.matrix.org";
    owner = "matrix-org";
    repo = pname;
    rev = version;
-    sha256 = "0qji25wiwmkxyfpraxj96c54hyayqmjkvwh0gsy5gb5pz5bp4mcy";
+    sha256 = "1rl7j26li1irb1lqnnkzan7jrj38kvmdn69rlwbbp390v3z15lvh";
  };

  nativeBuildInputs = [ cmake ];