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

gajim: 1.0.3 -> 1.1.2

Browse Source 
The list of upstream changes is huge, so I'm not pasting it here in the
commit message, but here is the upstream URL:

  https://dev.gajim.org/gajim/gajim/blob/gajim-1.1.2/ChangeLog

One of the most visible updates are the design changes for various
dialogs and the Emoji overhauls.

On our end, we now need three more dependencies, namely cssutils,
precis-i18n and keyring, which I added accordingly.

In addition, the test runner is now integrated into setup.py, which we
now use.

I also cleaned up the package expression a bit, eg. it's no longer
wrapped in a big "with lib;", so that "nix-instantiate --parse" is able
to detect attribute errors (which is very useful if you have editor
integration).

Signed-off-by: aszlig <aszlig@nix.build>
This commit is contained in:
aszlig 2019-01-28 16:09:52 +01:00 committed by Robert Schütz
parent 120238bcba
commit 32b3615f60
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,27 +1,30 @@
{ buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook { lib, fetchurl, gettext, wrapGAppsHook
, python, gtk3, gobject-introspection
, nbxmpp, pyasn1, pygobject3, gnome3, dbus-python, pillow # Native dependencies
, python3, gtk3, gobject-introspection, defaultIconTheme
# Test dependencies
, xvfb_run, dbus , xvfb_run, dbus
# Optional dependencies
, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly , enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly
, enableE2E ? true, pycrypto, python-gnupg , enableE2E ? true
, enableSecrets ? true, libsecret , enableSecrets ? true, libsecret
, enableRST ? true, docutils , enableRST ? true, docutils
, enableSpelling ? true, gspell , enableSpelling ? true, gspell
, enableUPnP ? true, gupnp-igd , enableUPnP ? true, gupnp-igd
, enableOmemoPluginDependencies ? true, python-axolotl, qrcode , enableOmemoPluginDependencies ? true
, extraPythonPackages ? pkgs: [], pythonPackages , extraPythonPackages ? ps: []
}: }:
with lib; python3.pkgs.buildPythonApplication rec {
pname = "gajim";
buildPythonApplication rec { majorVersion = "1.1";
name = "gajim-${version}"; version = "${majorVersion}.2";
majorVersion = "1.0";
version = "${majorVersion}.3";
src = fetchurl { src = fetchurl {
url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2"; url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2";
sha256 = "0ds4rqwfrpj89a489w6yih8gx5zi7qa4ffgld950fk7s0qxvcfnb"; sha256 = "1lx03cgi58z54xb7mhs6bc715lc00w5mpysf9n3q8zgn759fm0rj";
}; };
postPatch = '' postPatch = ''
@ -30,38 +33,38 @@ buildPythonApplication rec {
''; '';
buildInputs = [ buildInputs = [
gobject-introspection gtk3 gnome3.defaultIconTheme gobject-introspection gtk3 defaultIconTheme
] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ] ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
++ optional enableSecrets libsecret ++ lib.optional enableSecrets libsecret
++ optional enableSpelling gspell ++ lib.optional enableSpelling gspell
++ optional enableUPnP gupnp-igd; ++ lib.optional enableUPnP gupnp-igd;
nativeBuildInputs = [ nativeBuildInputs = [
gettext wrapGAppsHook gettext wrapGAppsHook
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = with python3.pkgs; [
nbxmpp pyasn1 pygobject3 dbus-python pillow nbxmpp pyasn1 pygobject3 dbus-python pillow cssutils precis-i18n keyring
] ++ optionals enableE2E [ pycrypto python-gnupg ] ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ]
++ optional enableRST docutils ++ lib.optional enableRST docutils
++ optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
++ extraPythonPackages pythonPackages; ++ extraPythonPackages python3.pkgs;
checkInputs = [ xvfb_run dbus.daemon ]; checkInputs = [ xvfb_run dbus.daemon ];
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 \
${python.interpreter} test/runtests.py ${python3.interpreter} setup.py test
''; '';
meta = { meta = {
homepage = http://gajim.org/; homepage = http://gajim.org/;
description = "Jabber client written in PyGTK"; description = "Jabber client written in PyGTK";
license = licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
maintainers = with maintainers; [ raskin aszlig abbradar ]; maintainers = with lib.maintainers; [ raskin aszlig abbradar ];
downloadPage = "http://gajim.org/downloads.php"; downloadPage = "http://gajim.org/downloads.php";
updateWalker = true; updateWalker = true;
platforms = platforms.linux; platforms = lib.platforms.linux;
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -22299,9 +22299,9 @@ in
foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; foomatic-filters = callPackage ../misc/drivers/foomatic-filters {};
gajim = python3.pkgs.callPackage ../applications/networking/instant-messengers/gajim { 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-ugly;
inherit (gnome3) gspell; inherit (gnome3) gspell defaultIconTheme;
}; };
gammu = callPackage ../applications/misc/gammu { }; gammu = callPackage ../applications/misc/gammu { };