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] 86a3d95855
This commit is contained in:
parent
97bdf4893d
commit
46c025be15
|
@ -2,14 +2,14 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "olm";
|
pname = "olm";
|
||||||
version = "3.2.11";
|
version = "3.2.12";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.matrix.org";
|
domain = "gitlab.matrix.org";
|
||||||
owner = "matrix-org";
|
owner = "matrix-org";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-/ozMvcHDhYruhzp8xfskKOYCbe/vS4pEOPn1+1Pb+Q0=";
|
sha256 = "sha256-EvqQvg7khsJ2OrcoHBImd9fTgjA65pVRqbJuMV5MG80=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -5,6 +5,8 @@ buildPythonPackage {
|
||||||
pname = "python-olm";
|
pname = "python-olm";
|
||||||
inherit (olm) src version;
|
inherit (olm) src version;
|
||||||
|
|
||||||
|
disabled = !isPy3k;
|
||||||
|
|
||||||
sourceRoot = "source/python";
|
sourceRoot = "source/python";
|
||||||
buildInputs = [ olm ];
|
buildInputs = [ olm ];
|
||||||
|
|
||||||
|
@ -15,7 +17,8 @@ buildPythonPackage {
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
cffi
|
cffi
|
||||||
future
|
future
|
||||||
] ++ lib.optionals (!isPy3k) [ typing ];
|
typing
|
||||||
|
];
|
||||||
|
|
||||||
propagatedNativeBuildInputs = [
|
propagatedNativeBuildInputs = [
|
||||||
cffi
|
cffi
|
||||||
|
|
Loading…
Reference in a new issue