JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

olm: 3.2.1 -> 3.2.2 (#114245)

Browse Source 
Next to the version bump, some little refactoring was performed.
This commit is contained in:
Alvar 2021-02-24 19:01:39 +01:00 committed by GitHub
parent 7b9c874d67
commit ca16e7dc52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/olm/default.nix
View File

@ -1,22 +1,25 @@
{ lib, stdenv, fetchurl, cmake }: { lib, stdenv, fetchFromGitLab, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "olm"; pname = "olm";
version = "3.2.1"; version = "3.2.2";
src = fetchurl { src = fetchFromGitLab {
url = "https://matrix.org/git/olm/-/archive/${version}/${pname}-${version}.tar.gz"; domain = "gitlab.matrix.org";
sha256 = "0iacbi9iibhzifh1bk6bi5xin557lvqmbf4ccsb8drj50dbxjiyr"; owner = "matrix-org";
repo = pname;
rev = version;
sha256 = "0qji25wiwmkxyfpraxj96c54hyayqmjkvwh0gsy5gb5pz5bp4mcy";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
doCheck = true; doCheck = true;
meta = { meta = with lib; {
description = "Implements double cryptographic ratchet and Megolm ratchet"; description = "Implements double cryptographic ratchet and Megolm ratchet";
license = lib.licenses.asl20;
homepage = "https://gitlab.matrix.org/matrix-org/olm"; homepage = "https://gitlab.matrix.org/matrix-org/olm";
platforms = with lib.platforms; darwin ++ linux; license = licenses.asl20;
maintainers = with maintainers; [ tilpner oxzi ];
}; };
} }

13
pkgs/development/python-modules/python-olm/default.nix
View File

@ -1,11 +1,11 @@
{ lib, buildPythonPackage, olm, { lib, buildPythonPackage, isPy3k, olm
cffi, future, isPy3k, typing }: , cffi, future, typing }:
buildPythonPackage { buildPythonPackage {
pname = "python-olm"; pname = "python-olm";
inherit (olm) src version; inherit (olm) src version;
sourceRoot = "${olm.name}/python"; sourceRoot = "source/python";
buildInputs = [ olm ]; buildInputs = [ olm ];
preBuild = '' preBuild = ''
@ -17,12 +17,13 @@ buildPythonPackage {
future future
] ++ lib.optionals (!isPy3k) [ typing ]; ] ++ lib.optionals (!isPy3k) [ typing ];
# Some required libraries for testing are not packaged yet.
doCheck = false; doCheck = false;
pythonImportsCheck = [ "olm" ];
meta = with lib; { meta = {
inherit (olm.meta) license maintainers;
description = "Python bindings for Olm"; description = "Python bindings for Olm";
homepage = "https://gitlab.matrix.org/matrix-org/olm/tree/master/python"; homepage = "https://gitlab.matrix.org/matrix-org/olm/tree/master/python";
license = olm.meta.license;
maintainers = [ maintainers.tilpner ];
}; };
} }