Merge pull request #233080 from jarkad/master

gajim: 1.6.1 -> 1.7.3

nixos/doc/manual/release-notes/rl-2305.section.md

@@ -190,6 +190,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - `nushell` has been updated to at least version 0.77.0, which includes potential breaking changes in aliases. The old aliases are now available as `old-alias` but it is recommended you migrate to the new format. See [Reworked aliases](https://www.nushell.sh/blog/2023-03-14-nushell_0_77.html#reworked-aliases-breaking-changes-kubouch).
 
+- `gajim` has been updated to version 1.7.3 which has disabled legacy ciphers. See [changelog for version 1.7.0](https://dev.gajim.org/gajim/gajim/-/releases/1.7.0).
+
 - `keepassx` and `keepassx2` have been removed, due to upstream [stopping development](https://www.keepassx.org/index.html%3Fp=636.html). Consider [KeePassXC](https://keepassxc.org) as a maintained alternative.
 
 - The [services.kubo.settings](#opt-services.kubo.settings) option is now no longer stateful. If you changed any of the options in [services.kubo.settings](#opt-services.kubo.settings) in the past and then removed them from your NixOS configuration again, those changes are still in your Kubo configuration file but will now be reset to the default. If you're unsure, you may want to make a backup of your configuration file (probably /var/lib/ipfs/config) and compare after the update.

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

@@ -22,13 +22,15 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gajim";
-  version = "1.6.1";
+  version = "1.7.3";
 
   src = fetchurl {
     url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
-    hash = "sha256-3D87Ou/842WqbaUiJV1hRZFVkZzQ12GXCpRc8F3rKPQ=";
+    hash = "sha256-t8yzWfdsY8pXye7Dn5hME0bOHgf+MzuyVY3hweXc0xg=";
   };
 
+  format = "pyproject";
+
   buildInputs = [
     gobject-introspection gtk3 gnome.adwaita-icon-theme
     gtksourceview4
@@ -58,6 +60,14 @@ python3.pkgs.buildPythonApplication rec {
 
   nativeCheckInputs = [ xvfb-run dbus ];
 
+  preBuild = ''
+    python pep517build/build_metadata.py -o dist/metadata
+  '';
+
+  postInstall = ''
+    python pep517build/install_metadata.py dist/metadata --prefix=$out
+  '';
+
   checkPhase = ''
     xvfb-run dbus-run-session \
       --config-file=${dbus}/share/dbus-1/session.conf \
@@ -65,6 +75,9 @@ python3.pkgs.buildPythonApplication rec {
     ${python3.interpreter} -m unittest discover -s test/common -v
   '';
 
+  # test are broken in 1.7.3
+  doCheck = false;
+
   # necessary for wrapGAppsHook
   strictDeps = false;
 

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

@@ -8,12 +8,13 @@
 , precis-i18n
 , pygobject3
 , pyopenssl
+, setuptools
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "nbxmpp";
-  version = "4.0.1";
+  version = "4.2.2";
 
   disabled = pythonOlder "3.10";
 
@@ -22,9 +23,11 @@ buildPythonPackage rec {
     owner = "gajim";
     repo = "python-nbxmpp";
     rev = version;
-    hash = "sha256-PL+qNxeNubGSLqSci4uhRWtOIqs10p+A1VPfTwCLu84=";
+    hash = "sha256-ZTX8plcsO4zE7ruLtWIvsagQUvwPHuKdPKRwCrFwvgc=";
   };
 
+  format = "pyproject";
+
   nativeBuildInputs = [
     # required for pythonImportsCheck otherwise libsoup cannot be found
     gobject-introspection
@@ -40,6 +43,7 @@ buildPythonPackage rec {
     libsoup_3
     pygobject3
     pyopenssl
+    setuptools
   ];
 
   nativeCheckInputs = [