Merge release-25.11 into staging-next-25.11

This commit is contained in:
nixpkgs-ci[bot]
2026-05-20 00:48:48 +00:00
committed by GitHub
15 changed files with 422 additions and 346 deletions

View File

@@ -117,47 +117,55 @@ in
environment.systemPackages =
let
replyToEmail = pkgs.writeScriptBin "reply-to-email" ''
#!${pkgs.python3.interpreter}
import imaplib
import smtplib
import ssl
import email.header
from email import message_from_bytes
from email.message import EmailMessage
replyToEmail =
pkgs.writeScriptBin "reply-to-email"
# python
''
#!${pkgs.python3.interpreter}
import imaplib
import smtplib
import ssl
import email.header
import sys
from email import message_from_bytes
from email.message import EmailMessage
with imaplib.IMAP4('localhost') as imap:
imap.login('alice', 'foobar')
imap.select()
status, data = imap.search(None, 'ALL')
assert status == 'OK'
with imaplib.IMAP4('localhost') as imap:
imap.login('alice', 'foobar')
imap.select()
status, data = imap.search(None, 'ALL')
assert status == 'OK'
nums = data[0].split()
assert len(nums) == 1
nums = data[0].split()
try:
assert len(nums) == 1
except AssertionError:
print("No mail in IMAP mailbox yet...", file=sys.stderr)
sys.exit(1)
status, msg_data = imap.fetch(nums[0], '(RFC822)')
assert status == 'OK'
status, msg_data = imap.fetch(nums[0], '(RFC822)')
assert status == 'OK'
msg = email.message_from_bytes(msg_data[0][1])
subject = str(email.header.make_header(email.header.decode_header(msg['Subject'])))
reply_to = email.header.decode_header(msg['Reply-To'])[0][0]
message_id = email.header.decode_header(msg['Message-ID'])[0][0]
date = email.header.decode_header(msg['Date'])[0][0]
msg = email.message_from_bytes(msg_data[0][1])
subject = str(email.header.make_header(email.header.decode_header(msg['Subject'])))
reply_to = email.header.decode_header(msg['Reply-To'])[0][0]
message_id = email.header.decode_header(msg['Message-ID'])[0][0]
date = email.header.decode_header(msg['Date'])[0][0]
ctx = ssl.create_default_context()
with smtplib.SMTP_SSL(host='${discourseDomain}', context=ctx) as smtp:
reply = EmailMessage()
reply['Subject'] = 'Re: ' + subject
reply['To'] = reply_to
reply['From'] = 'alice@${clientDomain}'
reply['In-Reply-To'] = message_id
reply['References'] = message_id
reply['Date'] = date
reply.set_content("Test reply.")
ctx = ssl.create_default_context()
with smtplib.SMTP_SSL(host='${discourseDomain}', context=ctx) as smtp:
reply = EmailMessage()
reply['Subject'] = 'Re: ' + subject
reply['To'] = reply_to
reply['From'] = 'alice@${clientDomain}'
reply['In-Reply-To'] = message_id
reply['References'] = message_id
reply['Date'] = date
reply.set_content("Test reply.")
smtp.send_message(reply)
smtp.quit()
'';
smtp.send_message(reply)
smtp.quit()
'';
in
[ replyToEmail ];

View File

@@ -43,14 +43,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "gajim";
version = "2.4.5";
version = "2.4.6";
src = fetchFromGitLab {
domain = "dev.gajim.org";
owner = "gajim";
repo = "gajim";
tag = version;
hash = "sha256-5daPMlC2Ejfi5UXsRLaLWwEZHHEC0szbfkqavIisoUQ=";
hash = "sha256-QHfJ52uMDlE/rqqy7y2JIQLMOPaTp7eh4DEsPLBx6p8=";
};
format = "pyproject";

View File

@@ -4,7 +4,7 @@
fetchFromGitHub,
ruby,
makeWrapper,
replace,
sd,
}:
stdenv.mkDerivation rec {
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
replace
makeWrapper
sd
];
buildInputs = [ ruby ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
replace-literal -f -r -e /etc/postfix /run/discourse-mail-receiver .
find . -type f -exec sd '/etc/postfix' '/run/discourse-mail-receiver' {} +
cp -r receive-mail discourse-smtp-fast-rejection $out/bin/
cp -r lib $out/

View File

@@ -24,6 +24,11 @@
"version": "6.0.0",
"hash": "sha256-lNL5C4W7/p8homWooO/3ZKDZQ2M0FUTDixJwqWBPVbo="
},
{
"pname": "Microsoft.AspNetCore.WebUtilities",
"version": "8.0.25",
"hash": "sha256-jECs5Bnog26hhNXElS69wFzMkaVf9D6AwWrH6+qbfqI="
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
"version": "8.0.0",
@@ -31,14 +36,39 @@
},
{
"pname": "Microsoft.Bcl.Cryptography",
"version": "10.0.2",
"hash": "sha256-+OYtcWsd1qZcEXadYeA4t6+pyADg1APQCxpKUtP002M="
"version": "10.0.6",
"hash": "sha256-6VaDedxTljDNE+a4ao4xSG3rzZ6lbmCShtgMgHe9aH4="
},
{
"pname": "Microsoft.CodeCoverage",
"version": "17.14.1",
"hash": "sha256-f8QytG8GvRoP47rO2KEmnDLxIpyesaq26TFjDdW40Gs="
},
{
"pname": "Microsoft.DevTunnels.Connections",
"version": "1.3.39",
"hash": "sha256-aJBUNv1n7b64EBrAa04+Gw1MLYC315xANCRdK3RnWlA="
},
{
"pname": "Microsoft.DevTunnels.Contracts",
"version": "1.3.39",
"hash": "sha256-lREgEhQhgQJyLoMYS/N5w+i6iX0s3Ppnl0T71KhG2u8="
},
{
"pname": "Microsoft.DevTunnels.Management",
"version": "1.3.39",
"hash": "sha256-twyduZ89fY69k5onUihezBwdiu3BxdOMBLIXq4aQvY0="
},
{
"pname": "Microsoft.DevTunnels.Ssh",
"version": "3.12.24",
"hash": "sha256-+GFTJiVQ5NZy3HeCiFIm4DggKAKPlEb90P/ZBB/rRxc="
},
{
"pname": "Microsoft.DevTunnels.Ssh.Tcp",
"version": "3.12.24",
"hash": "sha256-NCNAGmQ9ugp5ezJ8adujvP0HRtYkIn4Ly0AWq2nDH9M="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "8.0.2",
@@ -49,6 +79,16 @@
"version": "8.0.3",
"hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
},
{
"pname": "Microsoft.Extensions.Primitives",
"version": "8.0.0",
"hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
},
{
"pname": "Microsoft.Net.Http.Headers",
"version": "8.0.25",
"hash": "sha256-nNRfKgfqUQTQHTV+rahK/Uo21XiGW1pTs5J6AYg3RrQ="
},
{
"pname": "Microsoft.NET.Test.Sdk",
"version": "17.14.1",
@@ -119,6 +159,11 @@
"version": "17.14.1",
"hash": "sha256-1cxHWcvHRD7orQ3EEEPPxVGEkTpxom1/zoICC9SInJs="
},
{
"pname": "Microsoft.VisualStudio.Validation",
"version": "17.13.22",
"hash": "sha256-ArINoBy7Q8bTCVPM9/y8MH0pe8TkhaYrH9PjrZijnY0="
},
{
"pname": "Microsoft.Win32.Primitives",
"version": "4.0.1-rc2-24027",
@@ -486,13 +531,18 @@
},
{
"pname": "System.Diagnostics.EventLog",
"version": "6.0.0",
"hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="
"version": "10.0.3",
"hash": "sha256-yT3XjTyXEsmn4ptBShNAPUpKIvCEj0H9Gopd5H6MkrQ="
},
{
"pname": "System.Diagnostics.EventLog",
"version": "8.0.1",
"hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA="
"version": "10.0.6",
"hash": "sha256-MpXUz1TiiFkD1ngApC7HKqW+i37zi5V2ApOmqZwDqiI="
},
{
"pname": "System.Diagnostics.EventLog",
"version": "6.0.0",
"hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="
},
{
"pname": "System.Diagnostics.Tools",
@@ -511,8 +561,8 @@
},
{
"pname": "System.Formats.Asn1",
"version": "10.0.2",
"hash": "sha256-PY875Po9vWaGTNbyZaxo9AbKFc8pg1eKf9akGQnJ5cc="
"version": "10.0.6",
"hash": "sha256-h5f9iYBUHgG9kOV7jlVQ8HqBQ0DQJt+wy3R/FbB1kaQ="
},
{
"pname": "System.Globalization",
@@ -589,6 +639,11 @@
"version": "10.0.1",
"hash": "sha256-k8EHcxnLitXo0CxoDZAxFmUlJJdKZVsZJ2+9zDMYB94="
},
{
"pname": "System.IO.Pipelines",
"version": "8.0.0",
"hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
},
{
"pname": "System.Linq",
"version": "4.1.0-rc2-24027",
@@ -801,8 +856,8 @@
},
{
"pname": "System.Security.Cryptography.Pkcs",
"version": "10.0.2",
"hash": "sha256-B33jrdvy1mvc8CnZJvnGp438K8wBI/d9x2IGxijefuU="
"version": "10.0.6",
"hash": "sha256-7T34t/DoxxMWUGRPSnLV1l5ScAxcDnK9iYKstRvLJuA="
},
{
"pname": "System.Security.Cryptography.Primitives",
@@ -811,8 +866,8 @@
},
{
"pname": "System.Security.Cryptography.ProtectedData",
"version": "8.0.0",
"hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="
"version": "10.0.3",
"hash": "sha256-JF/WTKv00v/C4ml4g/VL3j4JMPpZa1HBmVMvUnphHr4="
},
{
"pname": "System.Security.Cryptography.X509Certificates",
@@ -836,8 +891,13 @@
},
{
"pname": "System.ServiceProcess.ServiceController",
"version": "8.0.1",
"hash": "sha256-2cXTzNOyXqJinFPzdVJ9Gu6qrFtycfivu7RHDzBJic8="
"version": "10.0.3",
"hash": "sha256-3QQOhe001OZv58OeH51TfQ2Kch9T0SnhjyKSRioGj84="
},
{
"pname": "System.ServiceProcess.ServiceController",
"version": "10.0.6",
"hash": "sha256-Lvkb2mzQT/tcJ2yxkQDmKKFpEyaUbQ75qU51FwD1dzY="
},
{
"pname": "System.Text.Encoding",
@@ -851,8 +911,8 @@
},
{
"pname": "System.Text.Encoding.CodePages",
"version": "8.0.0",
"hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="
"version": "10.0.3",
"hash": "sha256-tDbCCtsmw1O8G9QvH2wyJtF7txxt6lpBy35w5rVZ800="
},
{
"pname": "System.Text.Encoding.Extensions",
@@ -881,8 +941,8 @@
},
{
"pname": "System.Threading.Channels",
"version": "8.0.0",
"hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg="
"version": "10.0.3",
"hash": "sha256-JuimR9Phq1bx34EQzFxWINDyANQV8ZCP2zN2cBydGVI="
},
{
"pname": "System.Threading.Tasks",

View File

@@ -35,13 +35,13 @@ assert builtins.all (
buildDotnetModule (finalAttrs: {
pname = "github-runner";
version = "2.333.1";
version = "2.334.0";
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
tag = "v${finalAttrs.version}";
hash = "sha256-5hSnveIebRQhvIHZc8sN9/8e9W1rlfITIB2uNMsQM6k=";
hash = "sha256-KSfzWwIf8Vpc8H0XM1tIqdZhdY/noZCeYLBvdWjqmLA=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse --short HEAD > $out/.git-revision
@@ -182,13 +182,21 @@ buildDotnetModule (finalAttrs: {
"TestSelfUpdateAsync_ValidateHash"
"TestSelfUpdateAsync"
]
# Includes an `ActionDownloadInfo` that fails with sandboxed networking
++ map (x: "GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") [
"BatchesResolutionAcrossCompositeActions"
"CompositeActionWithActionfile_CompositeContainerNested"
"CompositeActionWithActionfile_CompositePrestepNested"
"CompositeActionWithActionfile_MaxLimit"
"CompositeActionWithActionfile_Node"
"DeduplicatesResolutionAcrossDepthLevels"
"DownloadActionFromGraph"
"DownloadsNextLevelActionsBeforeRecursing"
"MultipleTopLevelActions_BatchesResolution"
"NestedCompositeContainers_BatchedResolution"
"NotPullOrBuildImagesMultipleTimes"
"ParallelDownloadsAtSameDepth"
"ParallelDownloads_MultipleUniqueActions"
"RepositoryActionWithActionYamlFile_DockerHubImage"
"RepositoryActionWithActionfileAndDockerfile"
"RepositoryActionWithActionfile_DockerHubImage"

View File

@@ -178,11 +178,11 @@ let
linux = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "148.0.7778.167";
version = "148.0.7778.178";
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-1k9PrK1mpUJFJ6RbC3ZEN0CqOLX4JbGpmpXQrDpZTVU=";
hash = "sha256-3iuKxcuwt/+BIcUqC715hbeRLhUjepNU1GbB3daIokI=";
};
# With strictDeps on, some shebangs were not being patched correctly
@@ -292,11 +292,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "148.0.7778.168";
version = "148.0.7778.179";
src = fetchurl {
url = "http://dl.google.com/release2/chrome/l7nnht2cublegpab37bdleb52y_148.0.7778.168/GoogleChrome-148.0.7778.168.dmg";
hash = "sha256-HaextZ70Os3EN5mguSmKp0GD0LAy1kE4dWUYwOA+JOs=";
url = "http://dl.google.com/release2/chrome/adxxii2zvsza6zjfnjbfh6fn4tqq_148.0.7778.179/GoogleChrome-148.0.7778.179.dmg";
hash = "sha256-QBHyF222wnaEmI79CQFOXQl5WkRNwneCYd/JFNMEEWU=";
};
dontPatch = true;

View File

@@ -12,13 +12,13 @@
buildDotnetModule (finalAttrs: {
pname = "jackett";
version = "0.24.1831";
version = "0.24.1879";
src = fetchFromGitHub {
owner = "jackett";
repo = "jackett";
tag = "v${finalAttrs.version}";
hash = "sha256-ipOlkUz1DK0U01OUI2Kd3gQTF2/MULkk5CVu4EfELmI=";
hash = "sha256-gtDN77TB1AKLfqtvFPoQ3tatXB63Ajax2j1gokgHX4s=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

View File

@@ -23,13 +23,13 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "linux-firmware";
version = "20260410";
version = "20260519";
src = fetchFromGitLab {
owner = "kernel-firmware";
repo = "linux-firmware";
tag = version;
hash = "sha256-nceQEGm6+Cj6KCeUNwmYsUdArRULfLXysXjzOXdCBQw=";
hash = "sha256-vyrnHNnyNko7m/fZ3fXgLvvasYyJ/pzs5be/Ele+6vY=";
};
postUnpack = ''

View File

@@ -24,13 +24,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "openimageio";
version = "3.1.11.0";
version = "3.1.13.1";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "OpenImageIO";
tag = "v${finalAttrs.version}";
hash = "sha256-7VP/XSYti8YbFQwofAXAolsHc0rEHw14oqN0359LYJg=";
hash = "sha256-GlQ4e0YGHqQxlwcyC8SVf4y0mKZiEyaT4jtxw0Pva4U=";
};
outputs = [

View File

@@ -133,7 +133,7 @@ python3Packages.buildPythonApplication rec {
meta = {
description = "Photo and video importer for cameras, phones, and memory cards";
mainProgram = "rapid-photo-downloader";
homepage = "https://www.damonlynch.net/rapid/";
homepage = "https://damonlynch.net/rapid/";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ philipdb ];

View File

@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "nbxmpp";
version = "7.1.0";
version = "7.2.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -26,8 +26,8 @@ buildPythonPackage rec {
domain = "dev.gajim.org";
owner = "gajim";
repo = "python-nbxmpp";
rev = "refs/tags/${version}";
hash = "sha256-eQYGOLV9P7zrqXB8dW8/CatBUT3xpl5h1TChKbY369g=";
tag = version;
hash = "sha256-OtJzCcaqcy2a46iNRcpknORgdTbzMtILocs5c6Akzrc=";
};
nativeBuildInputs = [

View File

@@ -53,13 +53,13 @@
}:
let
version = "2026.1.3";
version = "2026.1.4";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse";
rev = "v${version}";
sha256 = "sha256-0jbO1rJQ0AISo7h+SZfovubReCjR2zT6KWX9LxBeFtE=";
sha256 = "sha256-kQYDKZIMsWByuCZQfUlwhoIew5QykVylRMh6xvrHIBY=";
};
ruby = ruby_3_3;

View File

@@ -304,7 +304,7 @@ GEM
mini_sql (1.6.0)
mini_suffix (0.3.3)
ffi (~> 1.9)
minio_runner (1.0.0)
minio_runner (1.0.1)
minitest (5.26.2)
mocha (2.8.2)
ruby2_keywords (>= 0.0.5)
@@ -1082,7 +1082,7 @@ CHECKSUMS
mini_scheduler (0.18.0) sha256=d2f084f38da8d76c5844a92f0d6bd01fc9982a8b5e6c7679b6cf44c82da33503
mini_sql (1.6.0) sha256=5296637f6a4af5bb43e06788037e9a2968ff9c8eb65928befcba8cb41f42d6ee
mini_suffix (0.3.3) sha256=8d1d33f92f69a2247c9b7d27173235da90479d955cdb863b63a7f53843b722e7
minio_runner (1.0.0) sha256=ca0fc56a90c63b65a26cda632938c9075046835d41f4b9d1e165b0550eae0538
minio_runner (1.0.1) sha256=3675ad7abd79177b3fdd9f37e20fe46f7d4dcbb41f3f30a53db2207277241795
minitest (5.26.2) sha256=f021118a6185b9ba9f5af71f2ba103ad770c75afde9f2ab8da512677c550cde3
mocha (2.8.2) sha256=1f77e729db47e72b4ef776461ce20caeec2572ffdf23365b0a03608fee8f4eee
msgpack (1.8.0) sha256=e64ce0212000d016809f5048b48eb3a65ffb169db22238fb4b72472fecb2d732

View File

@@ -1781,10 +1781,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0f05mq75bc35w78vkx21bn1lcl07r4w2jqysdji6afy6j1mca3ya";
sha256 = "158p4ivp485j7njk0gqznk5lszbgwh7y4dwzvlzpn5vrpmxasx9n";
type = "gem";
};
version = "1.0.0";
version = "1.0.1";
};
minitest = {
groups = [