Merge pull request #173964 from vbgl/gajim-1.4.1

gajim: 1.3.3 → 1.4.1; pythonPackages.nbxmpp: 2.0.6 → 3.0.2
main
Fabian Affolter 2 years ago committed by GitHub
commit e8ed9b5550
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      pkgs/applications/networking/instant-messengers/gajim/default.nix
  2. 4
      pkgs/development/python-modules/nbxmpp/default.nix

@ -2,6 +2,7 @@
# Native dependencies # Native dependencies
, python3, gtk3, gobject-introspection, gnome , python3, gtk3, gobject-introspection, gnome
, gtksourceview4
, glib-networking , glib-networking
# Test dependencies # Test dependencies
@ -21,15 +22,16 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "gajim"; pname = "gajim";
version = "1.3.3"; version = "1.4.1";
src = fetchurl { src = fetchurl {
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
sha256 = "1337qkpcv7j0fgws9scnk82mn2l7s17060vmrbh3ihinmxmbxg6x"; sha256 = "sha256:0mbx7s1d2xgk7bkhwqcdss6ynshkqdiwh3qgv7d45frb4c3k33l2";
}; };
buildInputs = [ buildInputs = [
gobject-introspection gtk3 gnome.adwaita-icon-theme gobject-introspection gtk3 gnome.adwaita-icon-theme
gtksourceview4
glib-networking glib-networking
] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ] ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ]
++ lib.optional enableSecrets libsecret ++ lib.optional enableSecrets libsecret
@ -74,7 +76,7 @@ python3.pkgs.buildPythonApplication rec {
checkPhase = '' checkPhase = ''
xvfb-run dbus-run-session \ xvfb-run dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
${python3.interpreter} -m unittest discover -s test/unit -v ${python3.interpreter} -m unittest discover -s test/gtk -v
${python3.interpreter} -m unittest discover -s test/no_gui -v ${python3.interpreter} -m unittest discover -s test/no_gui -v
''; '';

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "nbxmpp"; pname = "nbxmpp";
version = "2.0.6"; version = "3.0.2";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "gajim"; owner = "gajim";
repo = "python-nbxmpp"; repo = "python-nbxmpp";
rev = "nbxmpp-${version}"; rev = "nbxmpp-${version}";
sha256 = "sha256:03iydz0r9m8559srawwnhaqzqm9liwrnc8v6abj4w3m1lil32bid"; sha256 = "sha256:0wvganymqw90y9mz5a5mh531r2s9z0vrkbfspx5akk98syaq6f5p";
}; };
buildInputs = [ buildInputs = [

Loading…
Cancel
Save