BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #176943 from oxzi/olm-3.2.12

Browse source 
olm: 3.2.11 -> 3.2.12
This commit is contained in:
Martin Weinelt 2022-06-26 01:23:53 +02:00 committed by GitHub
commit 60801d4489
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/olm/default.nix
View file

@ -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
pkgs/development/python-modules/python-olm/default.nix
View file

@ -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