gajim: 1.0.3 -> 1.1.2 #54817
gajim: 1.0.3 -> 1.1.2 #54817
Conversation
|
@GrahamcOfBorg build python37Packages.precis-i18n python37Packages.nbxmpp python27Packages.nbxmpp gajim python27Packages.precis-i18n |
| @@ -12,16 +21,14 @@ | |||
| , extraPythonPackages ? pkgs: [], pythonPackages | |||
| }: | |||
|
|
|||
| with lib; | |||
|
|
|||
| buildPythonApplication rec { | |||
| name = "gajim-${version}"; | |||
There was a problem hiding this comment.
| name = "gajim-${version}"; | |
| pname = "gajim"; |
|
|
||
| # Python dependencies | ||
| , nbxmpp, pyasn1, pygobject3, gnome3, dbus-python, pillow, cssutils | ||
| , precis-i18n, keyring |
There was a problem hiding this comment.
Would you mind getting rid of python3Packages.callPackage in all-packages.nix and specifying python3 as argument instead?
| @@ -12,16 +21,14 @@ | |||
| , extraPythonPackages ? pkgs: [], pythonPackages | |||
There was a problem hiding this comment.
| , extraPythonPackages ? pkgs: [], pythonPackages | |
| , extraPythonPackages ? pkgs: [] |
| @@ -1,7 +1,16 @@ | |||
| { buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook | |||
|
|
|||
| # Native dependencies | |||
| , python, gtk3, gobject-introspection | |||
There was a problem hiding this comment.
| , python, gtk3, gobject-introspection | |
| , python3, gtk3, gobject-introspection |
| ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ] | ||
| ++ lib.optional enableSecrets libsecret | ||
| ++ lib.optional enableSpelling gspell | ||
| ++ lib.optional enableUPnP gupnp-igd; | ||
|
|
||
| nativeBuildInputs = [ | ||
| gettext wrapGAppsHook | ||
| ]; | ||
|
|
||
| propagatedBuildInputs = [ |
There was a problem hiding this comment.
| propagatedBuildInputs = [ | |
| propagatedBuildInputs = with python3.pkgs; [ |
| nbxmpp pyasn1 pygobject3 dbus-python pillow cssutils precis-i18n keyring | ||
| ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ] | ||
| ++ lib.optional enableRST docutils | ||
| ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] | ||
| ++ extraPythonPackages pythonPackages; |
There was a problem hiding this comment.
| ++ extraPythonPackages pythonPackages; | |
| ++ extraPythonPackages python3.pkgs; |
|
A |
I think that's only really useful if Gajim would be part of Nevertheless, the module needs a bit of cleanup anyway, for example right now it uses both Python 2.x and Python 3.x dependencies (eg. due to that Jingle support has been broken since ages). I'm time-constrained right now however, so I only did minor cleanups with this PR. |
|
I meant for precis-i18n: https://github.com/byllyfish/precis_i18n/blob/v1.0/setup.py#L55 |
|
Also, you should add the |
Just a small bugfix release, but required for Gajim 1.1.2. Upstream fixes: * Always bind after SM failed * Dont try and guess system language Signed-off-by: aszlig <aszlig@nix.build> Closes: NixOS#54081
This package is required since Gajim version 1.1.0 and I intentionally didn't set meta.maintainers because I'm not going to be able to maintain this package, except if Gajim requires a newer version. Signed-off-by: aszlig <aszlig@nix.build>
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>
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-i18nandkeyring, 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 thatnix-instantiate --parseis able to detect attribute errors (which is very useful if you have editor integration).