Merge pull request #240066 from vbgl/gajim-1.8.0

gajim: 1.7.3 → 1.8.0

pkgs/applications/networking/instant-messengers/gajim/default.nix

@@ -15,18 +15,17 @@
 , enableRST ? true, docutils
 , enableSpelling ? true, gspell
 , enableUPnP ? true, gupnp-igd
-, enableOmemoPluginDependencies ? true
 , enableAppIndicator ? true, libappindicator-gtk3
 , extraPythonPackages ? ps: []
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gajim";
-  version = "1.7.3";
+  version = "1.8.0";
 
   src = fetchurl {
     url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
-    hash = "sha256-t8yzWfdsY8pXye7Dn5hME0bOHgf+MzuyVY3hweXc0xg=";
+    hash = "sha256-EgH8mt0am2l9z4csGHH6rpLqTzFiBRzOPB4NCEP8TUM=";
   };
 
   format = "pyproject";
@@ -53,9 +52,9 @@ python3.pkgs.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3.pkgs; [
     nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging gssapi
+    omemo-dr qrcode
   ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ]
     ++ lib.optional enableRST docutils
-    ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
     ++ extraPythonPackages python3.pkgs;
 
   nativeCheckInputs = [ xvfb-run dbus ];
@@ -75,7 +74,7 @@ python3.pkgs.buildPythonApplication rec {
     ${python3.interpreter} -m unittest discover -s test/common -v
   '';
 
-  # test are broken in 1.7.3
+  # test are broken in 1.7.3, 1.8.0
   doCheck = false;
 
   # necessary for wrapGAppsHook

pkgs/development/python-modules/nbxmpp/default.nix

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "nbxmpp";
-  version = "4.2.2";
+  version = "4.3.1";
 
   disabled = pythonOlder "3.10";
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "gajim";
     repo = "python-nbxmpp";
     rev = version;
-    hash = "sha256-ZTX8plcsO4zE7ruLtWIvsagQUvwPHuKdPKRwCrFwvgc=";
+    hash = "sha256-8Fh4sgQps6zUEN8o5ljrDIbRlbSZIMncbqh/qAnyOkw=";
   };
 
   format = "pyproject";

pkgs/development/python-modules/omemo-dr/default.nix

@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, cryptography, protobuf }:
+
+buildPythonPackage rec {
+  pname = "omemo-dr";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-sP5QI+lHoXt0D7ftSqJGEg1vIdgZtYEulN/JVwUgvmE=";
+  };
+
+  propagatedBuildInputs = [
+    cryptography
+    protobuf
+  ];
+
+  meta = {
+    description = "OMEMO Double Ratchet";
+    license = lib.licenses.lgpl3;
+    homepage = "https://dev.gajim.org/gajim/omemo-dr/";
+  };
+}

pkgs/top-level/python-packages.nix

@@ -7061,6 +7061,8 @@ self: super: with self; {
 
   omegaconf = callPackage ../development/python-modules/omegaconf { };
 
+  omemo-dr = callPackage ../development/python-modules/omemo-dr { };
+
   ome-zarr = callPackage ../development/python-modules/ome-zarr { };
 
   omnikinverter = callPackage ../development/python-modules/omnikinverter { };