From 46c025be1514723c8d477db8e45c7f3403500603 Mon Sep 17 00:00:00 2001
From: Alvar Penning <post@0x21.biz>
Date: Wed, 8 Jun 2022 21:16:43 +0200
Subject: [PATCH] olm: 3.2.11 -> 3.2.12

https://gitlab.matrix.org/matrix-org/olm/-/releases/3.2.12

This version bump introduces Python code which is no longer compatible
with Python 2 in [0]. Thus, python-olm was limited to Python 3.

[0] https://gitlab.matrix.org/matrix-org/olm/-/commit/86a3d958551ff4d170cf70c7dd85db1b2d6ebd01
---
 pkgs/development/libraries/olm/default.nix             | 4 ++--
 pkgs/development/python-modules/python-olm/default.nix | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index 21f5a83073f..47a26568712 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "olm";
-  version = "3.2.11";
+  version = "3.2.12";
 
   src = fetchFromGitLab {
     domain = "gitlab.matrix.org";
     owner = "matrix-org";
     repo = pname;
     rev = version;
-    sha256 = "sha256-/ozMvcHDhYruhzp8xfskKOYCbe/vS4pEOPn1+1Pb+Q0=";
+    sha256 = "sha256-EvqQvg7khsJ2OrcoHBImd9fTgjA65pVRqbJuMV5MG80=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/python-modules/python-olm/default.nix b/pkgs/development/python-modules/python-olm/default.nix
index d38c33df8c8..f430517be75 100644
--- a/pkgs/development/python-modules/python-olm/default.nix
+++ b/pkgs/development/python-modules/python-olm/default.nix
@@ -5,6 +5,8 @@ buildPythonPackage {
   pname = "python-olm";
   inherit (olm) src version;
 
+  disabled = !isPy3k;
+
   sourceRoot = "source/python";
   buildInputs = [ olm ];
 
@@ -15,7 +17,8 @@ buildPythonPackage {
   propagatedBuildInputs = [
     cffi
     future
-  ] ++ lib.optionals (!isPy3k) [ typing ];
+    typing
+  ];
 
   propagatedNativeBuildInputs = [
     cffi