python.nbxmpp: 0.6.10 → 1.0.2; gajim: 1.1.3 → 1.2.2

This commit is contained in:
Vincent Laporte 2020-08-19 07:49:04 +02:00 committed by Jon
parent f99b529dd7
commit f04daaa23a
3 changed files with 24 additions and 25 deletions

View file

@ -2,12 +2,13 @@
# Native dependencies
, python3, gtk3, gobject-introspection, gnome3
, glib-networking
# Test dependencies
, xvfb_run, dbus
# Optional dependencies
, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly, libnice
, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-good, libnice
, enableE2E ? true
, enableSecrets ? true, libsecret
, enableRST ? true, docutils
@ -19,32 +20,33 @@
python3.pkgs.buildPythonApplication rec {
pname = "gajim";
majorVersion = "1.1";
version = "${majorVersion}.3";
version = "1.2.2";
src = fetchurl {
url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2";
sha256 = "0bzxwcpdd4ydh6d6mzpr0gxwhcb0x9ympk55fpvm1hcw9d28a716";
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
sha256 = "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx";
};
postPatch = ''
# This test requires network access
echo "" > test/integration/test_resolver.py
'';
buildInputs = [
gobject-introspection gtk3 gnome3.adwaita-icon-theme wrapGAppsHook
] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly libnice ]
gobject-introspection gtk3 gnome3.adwaita-icon-theme
glib-networking
] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ]
++ lib.optional enableSecrets libsecret
++ lib.optional enableSpelling gspell
++ lib.optional enableUPnP gupnp-igd;
nativeBuildInputs = [
gettext
gettext wrapGAppsHook
];
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
propagatedBuildInputs = with python3.pkgs; [
nbxmpp pyasn1 pygobject3 dbus-python pillow cssutils precis-i18n keyring setuptools
nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools
] ++ lib.optionals enableE2E [ pycrypto python-gnupg ]
++ lib.optional enableRST docutils
++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]

View file

@ -1,8 +1,8 @@
{ stdenv, buildPythonPackage, fetchzip, pyopenssl, python }:
{ stdenv, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }:
let
pname = "nbxmpp";
version = "0.6.10";
version = "1.0.2";
name = "${pname}-${version}";
in buildPythonPackage {
inherit pname version;
@ -11,16 +11,12 @@ in buildPythonPackage {
name = "${name}.tar.bz2";
url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?"
+ "ref=${name}";
sha256 = "1w31a747mj9rvlp3n20z0fnvyvihphkgkyr22sk2kap3migw8vai";
sha256 = "1rhzsakqrybzq5j5b9400wjd14pncph47c1ggn5a6f3di03lk4az";
};
propagatedBuildInputs = [ pyopenssl ];
checkPhase = ''
# Disable tests requiring networking
echo "" > test/unit/test_xmpp_transports_nb2.py
${python.executable} test/runtests.py
'';
buildInputs = [ precis-i18n ];
checkInputs = [ gobject-introspection libsoup pygobject3 ];
propagatedBuildInputs = [ idna pyopenssl ];
meta = with stdenv.lib; {
homepage = "https://dev.gajim.org/gajim/python-nbxmpp";

View file

@ -26316,7 +26316,8 @@ in
fuse-emulator = callPackage ../misc/emulators/fuse-emulator {};
gajim = callPackage ../applications/networking/instant-messengers/gajim {
inherit (gst_all_1) gstreamer gst-plugins-base gst-libav gst-plugins-ugly;
inherit (gst_all_1) gstreamer gst-plugins-base gst-libav;
gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
};
gammu = callPackage ../applications/misc/gammu { };