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

Merge pull request #121718 from oxzi/gajim-1.3.2

Browse Source 
gajim: 1.2.2 -> 1.3.2, pythonPackages.nbxmpp: 1.0.2 -> 2.0.2
This commit is contained in:
Michael Raskin 2021-05-05 07:28:22 +00:00 committed by GitHub
commit 48023b598f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/instant-messengers/gajim/default.nix
View File

@ -20,11 +20,11 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "gajim"; pname = "gajim";
version = "1.2.2"; version = "1.3.2";
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 = "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"; sha256 = "1vjzv8zg9s393xw81klcgbkn4h6j2blzla9iil5kqfrw7wmldskh";
}; };
buildInputs = [ buildInputs = [
@ -55,6 +55,9 @@ python3.pkgs.buildPythonApplication rec {
checkInputs = [ xvfb_run dbus.daemon ]; checkInputs = [ xvfb_run dbus.daemon ];
checkPhase = '' checkPhase = ''
# https://dev.gajim.org/gajim/gajim/-/issues/10478
rm test/lib/gajim_mocks.py test/unit/test_gui_interface.py
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} setup.py test ${python3.interpreter} setup.py test

29
pkgs/development/python-modules/nbxmpp/default.nix
View File

@ -1,26 +1,31 @@
{ lib, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }: { lib, buildPythonPackage, pythonOlder, fetchFromGitLab
, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl
}:
let buildPythonPackage rec {
pname = "nbxmpp"; pname = "nbxmpp";
version = "1.0.2"; version = "2.0.2";
name = "${pname}-${version}";
in buildPythonPackage { disabled = pythonOlder "3.7";
inherit pname version;
# Tests aren't included in PyPI tarball. # Tests aren't included in PyPI tarball.
src = fetchzip { src = fetchFromGitLab {
name = "${name}.tar.bz2"; domain = "dev.gajim.org";
url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?" owner = "gajim";
+ "ref=${name}"; repo = "python-nbxmpp";
sha256 = "1rhzsakqrybzq5j5b9400wjd14pncph47c1ggn5a6f3di03lk4az"; rev = "nbxmpp-${version}";
sha256 = "0z27mxgfk7hvpx0xdrd8g9441rywv74yk7s83zjnc2mc7xvpwhf4";
}; };
buildInputs = [ precis-i18n ]; buildInputs = [ precis-i18n ];
propagatedBuildInputs = [ gobject-introspection idna libsoup pygobject3 pyopenssl ]; propagatedBuildInputs = [ gobject-introspection idna libsoup pygobject3 pyopenssl ];
pythonImportsCheck = [ "nbxmpp" ];
meta = with lib; { meta = with lib; {
homepage = "https://dev.gajim.org/gajim/python-nbxmpp"; homepage = "https://dev.gajim.org/gajim/python-nbxmpp";
description = "Non-blocking Jabber/XMPP module"; description = "Non-blocking Jabber/XMPP module";
license = licenses.gpl3; license = licenses.gpl3Plus;
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar ];
}; };
} }