From af01368b758a9f85aa225307aa25d973387a2ae8 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 7 Jun 2022 01:27:49 +0200 Subject: [PATCH 1/8] perlPackages.Future: 0.47 -> 0.48 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e77b28d1364b..725192d3ee0d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9248,10 +9248,10 @@ let Future = buildPerlModule { pname = "Future"; - version = "0.47"; + version = "0.48"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.47.tar.gz"; - sha256 = "1pmhkhrmvaf8c3jbrfqqhmxjrzcsxdn2q7apj033gwxggland88h"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.48.tar.gz"; + sha256 = "sha256-D+ixXBQvKjBKMXGKIKEFA6m0TMASw69eN7i34koHUqM="; }; buildInputs = [ TestFatal TestIdentity TestRefcount ]; meta = { From b43e6d672efe47c667067a3e6531300c3875ea12 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 7 Jun 2022 01:27:54 +0200 Subject: [PATCH 2/8] perlPackages.FutureAsyncAwait: 0.52 -> 0.58 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 725192d3ee0d..4ac092d7e185 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9262,10 +9262,10 @@ let FutureAsyncAwait = buildPerlModule rec { pname = "Future-AsyncAwait"; - version = "0.52"; + version = "0.58"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz"; - sha256 = "0dwij2r51vij91hx808zc2l5q38h55jahzrh73h4rn816jv597yx"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.58.tar.gz"; + sha256 = "sha256-OLtJ9jabBUrAUuaNomR/4i0Io605rgNuJ6KRELtOQi4="; }; buildInputs = [ TestRefcount ]; propagatedBuildInputs = [ Future XSParseKeyword XSParseSublike ]; From 8e10e4018042c4c432c20d13af6f375ac3bfaf5b Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 7 Jun 2022 01:28:54 +0200 Subject: [PATCH 3/8] perlPackages.XSParseSublike: 0.12 -> 0.16 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4ac092d7e185..8c87bb14f98a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -25791,10 +25791,10 @@ let XSParseSublike = buildPerlModule { pname = "XS-Parse-Sublike"; - version = "0.12"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.12.tar.gz"; - sha256 = "08kpia48f1rqc44rvbns97h3jyy2y5c8qlkh4a95v1m0yr5cb22s"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.16.tar.gz"; + sha256 = "sha256-IV5AmzmFgdJfDv8DeFBjvCUTu4YbrL6Z/m1VNTRvZt8="; }; buildInputs = [ TestFatal ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; From 6c1c59cc2ed7d87d2ef579a9a3aca0ed1dfe6367 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 7 Jun 2022 01:34:32 +0200 Subject: [PATCH 4/8] perlPackages.SyntaxKeywordTry: 0.25 -> 0.27 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8c87bb14f98a..bcb636853969 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21082,10 +21082,10 @@ let SyntaxKeywordTry = buildPerlModule { pname = "Syntax-Keyword-Try"; - version = "0.25"; + version = "0.27"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.25.tar.gz"; - sha256 = "0xd82gcpcrnmwxsbk7x0ainmyybdc087g6j69hrpy80j0asnq2f5"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.27.tar.gz"; + sha256 = "sha256-JG4bAz4/8i/VQgVQ1Lbg1WtDjNy7nTXL6LG1uhV03iM="; }; propagatedBuildInputs = [ XSParseKeyword ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; From 6bbb68c7bc7ee34ed1918c2b1490cac1c4e3516e Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 7 Jun 2022 01:36:54 +0200 Subject: [PATCH 5/8] perlPackages.XSParseKeyword: 0.12 -> 0.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bcb636853969..6f5c49272cdf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -25775,10 +25775,10 @@ let XSParseKeyword = buildPerlModule { pname = "XS-Parse-Keyword"; - version = "0.12"; + version = "0.25"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.12.tar.gz"; - sha256 = "0crwhcw9ciqndvwvhycd93m6jgyhi77yyj4vi9xfyglpv84p3y68"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.25.tar.gz"; + sha256 = "sha256-9e2zDPfH8iDQxsMdwetVQDKECpnHwpgxT1zD/vZscsc="; }; buildInputs = [ ExtUtilsCChecker ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; From 10d61fb56dbd017412dd72d408a919965a7f4829 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 7 Jun 2022 01:39:42 +0200 Subject: [PATCH 6/8] perlPackages.MojoliciousPluginSyslog: 0.05 -> 0.06 --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6f5c49272cdf..999cd29901fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9267,7 +9267,7 @@ let url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.58.tar.gz"; sha256 = "sha256-OLtJ9jabBUrAUuaNomR/4i0Io605rgNuJ6KRELtOQi4="; }; - buildInputs = [ TestRefcount ]; + buildInputs = [ TestRefcount TestFatal ]; propagatedBuildInputs = [ Future XSParseKeyword XSParseSublike ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { From 011f472b2990dfd7a875c9408e27393861870e91 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 7 Jun 2022 01:46:07 +0200 Subject: [PATCH 7/8] convos: 6.42 -> 7.02 --- pkgs/applications/networking/irc/convos/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index 275cf4c726e7..7b2a8c3f2470 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -6,13 +6,13 @@ with lib; perlPackages.buildPerlPackage rec { pname = "convos"; - version = "6.42"; + version = "7.02"; src = fetchFromGitHub { owner = "convos-chat"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W7ZVZUCNllpFIQpNz2m/8VFOXDZfuppB+g3qibY6wt8="; + sha256 = "sha256-i8lDK5/Whi5uo2/Qqh5jgJGLuuHn7kdrfvr+9Ktzp/8="; }; nativeBuildInputs = [ makeWrapper ] @@ -20,7 +20,7 @@ perlPackages.buildPerlPackage rec { buildInputs = with perlPackages; [ CryptPassphrase CryptPassphraseArgon2 CryptPassphraseBcrypt - FileHomeDir FileReadBackwards HTTPAcceptLanguage + FileHomeDir FileReadBackwards HTTPAcceptLanguage SyntaxKeywordTry FutureAsyncAwait IOSocketSSL IRCUtils JSONValidator LinkEmbedder ModuleInstall Mojolicious MojoliciousPluginOpenAPI MojoliciousPluginSyslog MojoliciousPluginWebpack ParseIRC TextMarkdownHoedown TimePiece UnicodeUTF8 @@ -36,6 +36,10 @@ perlPackages.buildPerlPackage rec { ''; preCheck = '' + # Remove unstable test (PR #176640) + # + rm t/plugin-auth-header.t + # Remove online test # rm t/web-pwa.t From 8532168fd7c975b7e492bbfae7f9448c60323938 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Wed, 8 Jun 2022 17:37:14 +0200 Subject: [PATCH 8/8] nixos/tests/convos: fix tests - Fix journal grep test --- nixos/tests/convos.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/convos.nix b/nixos/tests/convos.nix index cc0c2e75893c..a5dafed8f6f0 100644 --- a/nixos/tests/convos.nix +++ b/nixos/tests/convos.nix @@ -24,7 +24,7 @@ in testScript = '' machine.wait_for_unit("convos") machine.wait_for_open_port(${toString port}) - machine.succeed("journalctl -u convos | grep -q 'Listening at.*${toString port}'") + machine.succeed("journalctl -u convos | grep -q 'application available at.*${toString port}'") machine.succeed("curl -f http://localhost:${toString port}/") ''; })