From a492a6d15f417301840d85e23086ff87191d0b6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 14:51:34 +0000 Subject: [PATCH 1/8] i2pd: 2.41.0 -> 2.42.1 (cherry picked from commit df94e3fdce2479ca4760b68a88b889efa9cc6c2e) --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 01328f66a4d8..ab245540c9b6 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -10,13 +10,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.41.0"; + version = "2.42.1"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-fQqbZYb0brGmGf7Yc/2Zd5BZ+YOkGYC3o9uhShYdAE4="; + sha256 = "sha256-q44r+PVGxeoElVfthUh++X8EhxbzqJwjC/r5TD+89WA="; }; buildInputs = with lib; [ boost zlib openssl ] From 9233a24a782ff7c7c2ce93cbb905be17a2a2735f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Aug 2022 12:03:21 +0000 Subject: [PATCH 2/8] i2pd: 2.42.1 -> 2.43.0 (cherry picked from commit a5923a71395c4d418db8b4524db451f984adbe9b) --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index ab245540c9b6..f99d10deed84 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -10,13 +10,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.42.1"; + version = "2.43.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-q44r+PVGxeoElVfthUh++X8EhxbzqJwjC/r5TD+89WA="; + sha256 = "sha256-JIO1Zm7me/SX0W7sVHOesERnqvC7jy0Fu1vfKFePFd0="; }; buildInputs = with lib; [ boost zlib openssl ] From 8046afc4eaeda57f710ce2eee2124a1eba1002fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Sep 2022 11:37:29 +0200 Subject: [PATCH 3/8] i2pd: remove unecessary ? null from inputs (cherry picked from commit 64abd830b4b7e807ab9aced7d6e7669e539e43f3) --- pkgs/tools/networking/i2pd/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index f99d10deed84..941d60eb9270 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,13 +1,11 @@ { lib, stdenv, fetchFromGitHub , installShellFiles , boost, zlib, openssl -, upnpSupport ? true, miniupnpc ? null +, upnpSupport ? true, miniupnpc , aesniSupport ? stdenv.hostPlatform.aesSupport , avxSupport ? stdenv.hostPlatform.avxSupport }: -assert upnpSupport -> miniupnpc != null; - stdenv.mkDerivation rec { pname = "i2pd"; version = "2.43.0"; @@ -19,8 +17,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-JIO1Zm7me/SX0W7sVHOesERnqvC7jy0Fu1vfKFePFd0="; }; - buildInputs = with lib; [ boost zlib openssl ] - ++ optional upnpSupport miniupnpc; + buildInputs = [ boost zlib openssl ] + ++ lib.optional upnpSupport miniupnpc; nativeBuildInputs = [ installShellFiles From 85d4ebd525fd630c65d450e46173d0693879a0cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Nov 2022 05:40:51 +0000 Subject: [PATCH 4/8] i2pd: 2.43.0 -> 2.44.0 (cherry picked from commit 57f2bb494d81f4d43441cbadc78fc8747225478d) --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 941d60eb9270..353aea94a894 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.43.0"; + version = "2.44.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-JIO1Zm7me/SX0W7sVHOesERnqvC7jy0Fu1vfKFePFd0="; + sha256 = "sha256-9LnT0613z2I9bA0FhcTgINBnXG17ulz6flA13B1Vijs="; }; buildInputs = [ boost zlib openssl ] From 27a01b3470c43fd7bbe9a6fe8eb8ed3f4ecd2451 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 22 Nov 2022 08:17:58 -0700 Subject: [PATCH 5/8] matrix-synapse: 1.71.0 -> 1.72.0 Signed-off-by: Sumner Evans (cherry picked from commit 6ac16c2697031fab70705c0bab3a2bed67014fa0) --- pkgs/servers/matrix-synapse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 8d9c6343f6da..27c2fe3069b8 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,20 +11,20 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.71.0"; + version = "1.72.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-fmEQ1YsIB9xZOQZBojmYkFWPDdOLbNXqfn0szgZmtKg="; + hash = "sha256-LkzUrEXC+jonkEpAGIEDQhAKisrKNQB8/elchN/4YMU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-700LPWyhY95sVjB3chbdmr7AmE1Y55vN6Llszv/APL4="; + hash = "sha256-AuQURcVaIoOYG9jh6QhPpXB0akASVWMYe4fA/376cwo="; }; postPatch = '' From 707b07a439777f1ea2b59222c521ea1e3017c547 Mon Sep 17 00:00:00 2001 From: gp2112 Date: Wed, 23 Nov 2022 00:07:18 -0300 Subject: [PATCH 6/8] python3Packages.monero: 1.0.1 -> 1.1.1 (cherry picked from commit 443f5eb97f63017b37cf19916240c5f42ba5971b) --- pkgs/development/python-modules/monero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/monero/default.nix b/pkgs/development/python-modules/monero/default.nix index 907e54417d6d..82e04542b664 100644 --- a/pkgs/development/python-modules/monero/default.nix +++ b/pkgs/development/python-modules/monero/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "monero"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "monero-ecosystem"; repo = "monero-python"; rev = "v${version}"; - sha256 = "sha256-ZjAShIeGVVIKlwgSNPVSN7eaqhKu3wEpDP9wgBMOyZU="; + sha256 = "sha256-WIF3pFBOLgozYTrQHLzIRgSlT3dTZTe+7sF/dVjVdTo="; }; postPatch = '' From c60ec520ae3a9c4e2e5905c5196cd0db1b3e8d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Wed, 23 Nov 2022 11:01:04 +0100 Subject: [PATCH 7/8] nixosTests/prosody: add timeout The xmpp-sendmessage the slixmpp-powered python script tend to timeout and block the nixos channels. Adding a signal-based timeout making sure that whatever happens, the script won't run for more than 2 minutes. That should be pleinty enough time to finish regardless of the runner specs. As a data point, it runs in about 10 secs on my desktop machine. (cherry picked from commit 501d684de8fb70cac2e72eaaff0dcc94aa2af459) --- nixos/tests/xmpp/xmpp-sendmessage.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/tests/xmpp/xmpp-sendmessage.nix b/nixos/tests/xmpp/xmpp-sendmessage.nix index 80dfcff2d0eb..366759b935b1 100644 --- a/nixos/tests/xmpp/xmpp-sendmessage.nix +++ b/nixos/tests/xmpp/xmpp-sendmessage.nix @@ -12,6 +12,7 @@ in writeScriptBin "send-message" '' #!${(python3.withPackages (ps: [ ps.slixmpp ])).interpreter} import logging import sys +import signal from types import MethodType from slixmpp import ClientXMPP @@ -64,8 +65,13 @@ class CthonTest(ClientXMPP): log.info('MUC join success!') log.info('XMPP SCRIPT TEST SUCCESS') +def timeout_handler(signalnum, stackframe): + print('ERROR: xmpp-sendmessage timed out') + sys.exit(1) if __name__ == '__main__': + signal.signal(signal.SIGALRM, timeout_handler) + signal.alarm(120) logging.basicConfig(level=logging.DEBUG, format='%(levelname)-8s %(message)s') From 647ebf83e688f4828935d8552db567e03038ac45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Wed, 23 Nov 2022 11:05:12 +0100 Subject: [PATCH 8/8] nixosTests/prosody[-mysql]: fix tests TLS setup The tests TLS setup was bogus: the xmpp-send-message script was trying to connect to the server through a bogus domain name. Injecting the right one. I'm a bit confused about that one. I know for sure this NixOS test succeeded last time I checked it, but the TLS conf is bogus for sure. I assume the slixmpp SNI validation was a bit too loose and was tightened at some point. (cherry picked from commit 8040c468ed9188c33fb851921327d9d9d6850f2c) --- nixos/tests/xmpp/prosody.nix | 3 ++- nixos/tests/xmpp/xmpp-sendmessage.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/xmpp/prosody.nix b/nixos/tests/xmpp/prosody.nix index 14eab56fb821..045ae6430fd4 100644 --- a/nixos/tests/xmpp/prosody.nix +++ b/nixos/tests/xmpp/prosody.nix @@ -42,7 +42,7 @@ in import ../make-test-python.nix { ${nodes.server.config.networking.primaryIPAddress} uploads.example.com ''; environment.systemPackages = [ - (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) + (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = "example.com"; }) ]; }; server = { config, pkgs, ... }: { @@ -82,6 +82,7 @@ in import ../make-test-python.nix { testScript = { nodes, ... }: '' # Check with sqlite storage + start_all() server.wait_for_unit("prosody.service") server.succeed('prosodyctl status | grep "Prosody is running"') diff --git a/nixos/tests/xmpp/xmpp-sendmessage.nix b/nixos/tests/xmpp/xmpp-sendmessage.nix index 366759b935b1..87a058e85112 100644 --- a/nixos/tests/xmpp/xmpp-sendmessage.nix +++ b/nixos/tests/xmpp/xmpp-sendmessage.nix @@ -82,7 +82,7 @@ if __name__ == '__main__': ct.register_plugin('xep_0363') # MUC ct.register_plugin('xep_0045') - ct.connect(("server", 5222)) + ct.connect(("${connectTo}", 5222)) ct.process(forever=False) if not ct.test_succeeded: