[Backport release-26.05] btcpayserver: 2.3.4 -> 2.4.2 (#550239)

This commit is contained in:
Pavol Rusnak
2026-08-07 17:11:55 +00:00
committed by GitHub
5 changed files with 263 additions and 1243 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -8,20 +8,20 @@
buildDotnetModule rec {
pname = "btcpayserver";
version = "2.3.4";
version = "2.4.2";
src = fetchFromGitHub {
owner = "btcpayserver";
repo = "btcpayserver";
tag = "v${version}";
hash = "sha256-u4VNDKLOb6bEkdhRTmnGxyM+2a6mcdWwV1T4+HFK/14=";
hash = "sha256-UeWiJv6LvKZx4LYy8LBvPTXVNKAIZI1n3qb6sIU5Dd0=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";
nugetDeps = ./deps.json;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
dotnet-sdk = dotnetCorePackages.sdk_10_0;
dotnet-runtime = dotnetCorePackages.aspnetcore_10_0;
buildType = if altcoinSupport then "Altcoins-Release" else "Release";

View File

@@ -1,99 +1,39 @@
[
{
"pname": "Dapper",
"version": "2.1.66",
"hash": "sha256-e5n/wnAFGPDSe30oQQ0fanXrvFZYYa+qCDSTHtfQmPw="
"version": "2.1.79",
"hash": "sha256-QIGZ+vlnwhSl+nnVZ//s3uwFh/vKJ5kDpgGkmpMjhmw="
},
{
"pname": "Microsoft.AspNetCore.JsonPatch",
"version": "10.0.1",
"hash": "sha256-bbX3CGoxG5E8RPUBeEvG9Us8l8WxBHRcjxPR3mJLnbg="
"version": "10.0.10",
"hash": "sha256-NIFI6z2X1blS3ab3G/CgY42WuJULni5wTa4X8AMx1c0="
},
{
"pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson",
"version": "10.0.1",
"hash": "sha256-E1ciFt7uy39aKRDfmXrHJ6e4SsaWm+C3inQqTzQEC2U="
},
{
"pname": "Microsoft.Azure.Amqp",
"version": "2.4.11",
"hash": "sha256-Nd2crPn0GUSgCzicuNhm0fYKiXtpQ3aduBjcjTMMF/4="
},
{
"pname": "Microsoft.Azure.ServiceBus",
"version": "5.2.0",
"hash": "sha256-YgxtiQzmlKj6KHyZppnDoWgoeO3wUlyVZimF2dNt1tA="
},
{
"pname": "Microsoft.Azure.Services.AppAuthentication",
"version": "1.0.3",
"hash": "sha256-KaGL7asV10S+fGp9dt1i6frelho8ns73epxGzZ4iRis="
"version": "10.0.10",
"hash": "sha256-QlXe8Il3kcDQZTSZg3tCvW7c8ERix7lIWvYGSrrleNE="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "1.0.0",
"hash": "sha256-asIXVFsAK7ELd/f+vLwhxYDdazqRTmf+fGJ4WFtcCeo="
},
{
"pname": "Microsoft.IdentityModel.Clients.ActiveDirectory",
"version": "3.14.2",
"hash": "sha256-mFlsKSQ6DsKttWuFkv6eMs0uSFHgwocxDad1icMXKj0="
},
{
"pname": "Microsoft.IdentityModel.JsonWebTokens",
"version": "5.4.0",
"hash": "sha256-yKITMgW2JEXhPlQgdmofAyt0eEcCr72P4rM2EC6wrig="
},
{
"pname": "Microsoft.IdentityModel.Logging",
"version": "5.4.0",
"hash": "sha256-YKdSKQDO5+ssC5mqLGtBhuJ4lLbLUadMVV4PPJ6/tMU="
},
{
"pname": "Microsoft.IdentityModel.Tokens",
"version": "5.4.0",
"hash": "sha256-gCJ+4QwhuBPSkDN+HcMCpTE2LFIQ3htI/SddoHOB7T4="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.1.0",
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
},
{
"pname": "NBitcoin",
"version": "9.0.4",
"hash": "sha256-UuzpFfVggaz2dV60kGqjnCYtkLyhOrd9dlzzgmTA+4Q="
"version": "10.0.8",
"hash": "sha256-SnJ60lhDv94oD0370ZyrvFG2LDJ0wkixNP1pIvcq8AA="
},
{
"pname": "NBitcoin.Altcoins",
"version": "5.0.2",
"hash": "sha256-uXjJoS965jLXeeZav0fIndM0TdZ92ODOgCV1duVQAzk="
},
{
"pname": "NETStandard.Library",
"version": "1.6.0",
"hash": "sha256-ExWI1EKDCRishcfAeHVS/RoJphqSqohmJIC/wz3ZtVo="
},
{
"pname": "NETStandard.Library",
"version": "1.6.1",
"hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="
"version": "6.0.4",
"hash": "sha256-BpXLxjmFf1JUud0Mwz/Zph0jPVqrEfa6KiMMnsOeIU8="
},
{
"pname": "NETStandard.Library.Ref",
"version": "2.1.0",
"hash": "sha256-Ruovy9EKgXaFuFr3zgw5fRKUS9yBIJ4nLeHgXv0zx4o="
},
{
"pname": "Newtonsoft.Json",
"version": "10.0.1",
"hash": "sha256-Gw7dQIsmYfmcR5ASTuMsB8cqaI4g3osw0j+LO1jEzJY="
},
{
"pname": "Newtonsoft.Json",
"version": "10.0.3",
"hash": "sha256-WEHCjp+OMr5axXQjFsh7TMDE/ttE35nMv5RBPdcxfhs="
},
{
"pname": "Newtonsoft.Json",
"version": "12.0.1",
@@ -131,17 +71,7 @@
},
{
"pname": "Npgsql",
"version": "10.0.1",
"hash": "sha256-cb4z+WH9qynS6n4I43FzSiifWLzgH26HAP/DnZvsjak="
},
{
"pname": "RabbitMQ.Client",
"version": "7.2.0",
"hash": "sha256-NkEb2ey0jo/OAeaVOUwIeSbeplqkOsgv1+ys8ZQgemQ="
},
{
"pname": "System.IdentityModel.Tokens.Jwt",
"version": "5.4.0",
"hash": "sha256-zLtoejPBG8yeFEPIcXZAkdAb0WDnrVXh5YsUYKULyRU="
"version": "10.0.3",
"hash": "sha256-ddCXCSOoyfy7035OvnL+4LEDYqHjZyPoZ3ffG2coMW0="
}
]

View File

@@ -7,13 +7,13 @@
buildDotnetModule rec {
pname = "nbxplorer";
version = "2.6.0";
version = "2.6.10";
src = fetchFromGitHub {
owner = "dgarage";
repo = "NBXplorer";
tag = "v${version}";
hash = "sha256-X1+UdsKVOC3QpES22p0MG1Rz1oresilBM+b/4I1nCyI=";
hash = "sha256-bAAEB1wIaWgDygk79bCuvkNDiPvgsUhVDqIrR3LMp7Q=";
};
projectFile = "NBXplorer/NBXplorer.csproj";

View File

@@ -50,10 +50,15 @@ repo=$tmpdir/repo
trap "rm -rf $tmpdir" EXIT
git clone --depth 1 --branch v${newVersion} -c advice.detachedHead=false https://github.com/$(getRepo) $repo
export GNUPGHOME=$tmpdir
importKey() {
curl --fail --location --silent --show-error --retry 3 --retry-all-errors \
"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x$1" \
| gpg --batch --import
}
# Fetch Nicolas Dorier's key (64-bit key ID: 6618763EF09186FE)
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys AB4CFA9895ACA0DBE27F6B346618763EF09186FE 2> /dev/null
importKey AB4CFA9895ACA0DBE27F6B346618763EF09186FE
# Fetch Andrew Camilleri's key (64-bit key ID: 8E5530D9D1C93097)
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 836C08CF3F523BB7A8CB8ECF8E5530D9D1C93097 2> /dev/null
importKey 836C08CF3F523BB7A8CB8ECF8E5530D9D1C93097
echo
echo "Verifying commit"
git -C $repo verify-commit HEAD
@@ -64,12 +69,7 @@ echo
# Update pkg version and hash
echo "Updating $pkgName: $oldVersion -> $newVersion"
if [[ $newVersion == $oldVersion ]]; then
# Temporarily set a source version that doesn't equal $newVersion so that $newHash
# is always updated in the next call to update-source-version.
(cd "$nixpkgs" && update-source-version "$pkgName" "0" "0000000000000000000000000000000000000000000000000000")
fi
(cd "$nixpkgs" && update-source-version "$pkgName" "$newVersion" "$newHash")
(cd "$nixpkgs" && update-source-version "$pkgName" "$newVersion" "$newHash" --ignore-same-version)
echo
# Create deps file