Merge pull request #157707 from nixbitcoin/btcpayserver-1.4.2

btcpayserver: 1.3.7 -> 1.4.3
main
Pavol Rusnak 2 years ago committed by GitHub
commit 51c7e272d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 16
      pkgs/applications/blockchains/btcpayserver/default.nix
  2. 557
      pkgs/applications/blockchains/btcpayserver/deps.nix
  3. 8
      pkgs/applications/blockchains/nbxplorer/default.nix
  4. 12
      pkgs/applications/blockchains/nbxplorer/deps.nix

@ -3,28 +3,22 @@
buildDotnetModule rec {
pname = "btcpayserver";
version = "1.3.7";
version = "1.4.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-W8WRw42hMNUaQZlfrl73REGIvLcj6Vso9Axx53ENkx0=";
sha256 = "sha256-CMa0+Djx07q77W/ezMhU+JP5EPXz4nfZ35TN8O6R/nc=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";
nugetDeps = ./deps.nix;
dotnet-sdk = dotnetCorePackages.sdk_3_1;
dotnet-runtime = dotnetCorePackages.aspnetcore_3_1;
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;
dotnetFlags = lib.optionals altcoinSupport [ "/p:Configuration=Altcoins-Release" ];
# btcpayserver requires the publish directory as its working dir
# https://github.com/btcpayserver/btcpayserver/issues/1894
preInstall = ''
makeWrapperArgs+=(--run "cd $out/lib/btcpayserver")
'';
buildType = if altcoinSupport then "Altcoins-Release" else "Release";
postFixup = ''
mv $out/bin/{BTCPayServer,btcpayserver}

File diff suppressed because it is too large Load Diff

@ -2,20 +2,20 @@
buildDotnetModule rec {
pname = "nbxplorer";
version = "2.2.18";
version = "2.2.20";
src = fetchFromGitHub {
owner = "dgarage";
repo = "NBXplorer";
rev = "v${version}";
sha256 = "sha256-zjSHgMdK417bm1Z/B2kvloDnPTqzM9jEVkZvoKeBkzM=";
sha256 = "sha256-C3REnfecNwf3dtk6aLYAEsedHRlIrQZAokXtf6KI8U0=";
};
projectFile = "NBXplorer/NBXplorer.csproj";
nugetDeps = ./deps.nix;
dotnet-sdk = dotnetCorePackages.sdk_3_1;
dotnet-runtime = dotnetCorePackages.aspnetcore_3_1;
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;
postFixup = ''
mv $out/bin/{NBXplorer,nbxplorer}

@ -6,13 +6,13 @@
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.JsonPatch";
version = "3.1.19";
sha256 = "1fh3k85k988jw35sf5hvm6jwmvzmslzpfvf3jk3sn3f3s6gyk0an";
version = "6.0.1";
sha256 = "0rsqng2b8a3zaha9c2x1195das5wwvmnz31xf14ancgha4lxq68r";
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson";
version = "3.1.19";
sha256 = "1nh08kjdc152m85ycwxn1q8r69f0l02p6cac6q57nzlyy5gyj2rs";
version = "6.0.1";
sha256 = "179b2774s68im71r32lv4nydcp586x86zggs8ml6jcfjrd9fs5b1";
})
(fetchNuGet {
pname = "Microsoft.Azure.Amqp";
@ -226,8 +226,8 @@
})
(fetchNuGet {
pname = "Newtonsoft.Json";
version = "12.0.2";
sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5";
version = "13.0.1";
sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb";
})
(fetchNuGet {
pname = "Newtonsoft.Json";

Loading…
Cancel
Save