diff options
author | Robert Schütz <rschuetz17@gmail.com> | 2019-01-31 11:40:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-31 11:40:01 +0100 |
commit | f94e0252f387c644bd28d62401b7d7470fb45eca (patch) | |
tree | d016a54b4db5c7672c487d04279e2d03dfbd019b /pkgs | |
parent | e27e11480323db005ab62ef477eb1fd28b6b62f5 (diff) | |
parent | 32b3615f6001b898b7298157560e46bfcca642e1 (diff) |
Merge pull request #54817 from aszlig/gajim-1.1
gajim: 1.0.3 -> 1.1.2
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/gajim/default.nix | 59 | ||||
-rw-r--r-- | pkgs/development/python-modules/nbxmpp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/precis-i18n/default.nix | 20 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
5 files changed, 57 insertions, 32 deletions
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 83591722568b..cf4e6358dff3 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,27 +1,30 @@ -{ buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook -, python, gtk3, gobject-introspection -, nbxmpp, pyasn1, pygobject3, gnome3, dbus-python, pillow +{ lib, fetchurl, gettext, wrapGAppsHook + +# Native dependencies +, python3, gtk3, gobject-introspection, defaultIconTheme + +# Test dependencies , xvfb_run, dbus + +# Optional dependencies , enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly -, enableE2E ? true, pycrypto, python-gnupg +, enableE2E ? true , enableSecrets ? true, libsecret , enableRST ? true, docutils , enableSpelling ? true, gspell , enableUPnP ? true, gupnp-igd -, enableOmemoPluginDependencies ? true, python-axolotl, qrcode -, extraPythonPackages ? pkgs: [], pythonPackages +, enableOmemoPluginDependencies ? true +, extraPythonPackages ? ps: [] }: -with lib; - -buildPythonApplication rec { - name = "gajim-${version}"; - majorVersion = "1.0"; - version = "${majorVersion}.3"; +python3.pkgs.buildPythonApplication rec { + pname = "gajim"; + majorVersion = "1.1"; + version = "${majorVersion}.2"; src = fetchurl { url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2"; - sha256 = "0ds4rqwfrpj89a489w6yih8gx5zi7qa4ffgld950fk7s0qxvcfnb"; + sha256 = "1lx03cgi58z54xb7mhs6bc715lc00w5mpysf9n3q8zgn759fm0rj"; }; postPatch = '' @@ -30,38 +33,38 @@ buildPythonApplication rec { ''; buildInputs = [ - gobject-introspection gtk3 gnome3.defaultIconTheme - ] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ] - ++ optional enableSecrets libsecret - ++ optional enableSpelling gspell - ++ optional enableUPnP gupnp-igd; + gobject-introspection gtk3 defaultIconTheme + ] ++ 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 = [ - nbxmpp pyasn1 pygobject3 dbus-python pillow - ] ++ optionals enableE2E [ pycrypto python-gnupg ] - ++ optional enableRST docutils - ++ optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] - ++ extraPythonPackages pythonPackages; + 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 python3.pkgs; checkInputs = [ xvfb_run dbus.daemon ]; checkPhase = '' xvfb-run dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - ${python.interpreter} test/runtests.py + ${python3.interpreter} setup.py test ''; meta = { homepage = http://gajim.org/; description = "Jabber client written in PyGTK"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ raskin aszlig abbradar ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ raskin aszlig abbradar ]; downloadPage = "http://gajim.org/downloads.php"; updateWalker = true; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 888e1de6aa57..5da8257ac81e 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -2,7 +2,7 @@ let pname = "nbxmpp"; - version = "0.6.8"; + version = "0.6.9"; name = "${pname}-${version}"; in buildPythonPackage rec { inherit pname version; @@ -11,7 +11,7 @@ in buildPythonPackage rec { name = "${name}.tar.bz2"; url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?" + "ref=${name}"; - sha256 = "09zrqz01j45kvayfscd66avkrnn237lbjg9li5hjhyw92h6hkkc4"; + sha256 = "14xrq0r5k1dk7rwj4cxyxfapi6gbnqg70mz94g6hn9ij06284mi7"; }; propagatedBuildInputs = [ pyopenssl ]; diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix new file mode 100644 index 000000000000..4c50aaee706a --- /dev/null +++ b/pkgs/development/python-modules/precis-i18n/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "precis-i18n"; + version = "1.0.0"; + + disabled = !isPy3k; + + src = fetchPypi { + pname = "precis_i18n"; + inherit version; + sha256 = "0gjhvwd8aifx94rl1ag08vlmndyx2q3fkyqb0c4i46x3p2bc2yi2"; + }; + + meta = { + homepage = https://github.com/byllyfish/precis_i18n; + description = "Internationalized usernames and passwords"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8822197c049..b398e4f51e70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22334,9 +22334,9 @@ in 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 (gnome3) gspell; + inherit (gnome3) gspell defaultIconTheme; }; gammu = callPackage ../applications/misc/gammu { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba6931ad10c2..94253962ba15 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3469,6 +3469,8 @@ in { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; }); + precis-i18n = callPackage ../development/python-modules/precis-i18n { }; + pvlib = callPackage ../development/python-modules/pvlib { }; pybase64 = callPackage ../development/python-modules/pybase64 { }; |