commit bf6cac3e7a94de1a5dc0da81899ec489780210a7

+3 -3

pkgs/applications/blockchains/btcpayserver/default.nix

··· 1 { lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, 2 - dotnetPackages, dotnetCorePackages 3 }: 4 5 let ··· 34 nuget sources Add -Name tmpsrc -Source $TMP/nuget 35 nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget 36 37 - dotnet restore --source $TMP/nuget BTCPayServer/BTCPayServer.csproj 38 - dotnet publish --no-restore --output $out/share/$pname -c Release BTCPayServer/BTCPayServer.csproj 39 ''; 40 41 # btcpayserver requires the publish directory as its working dir

··· 1 { lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, 2 + dotnetPackages, dotnetCorePackages, altcoinSupport ? false 3 }: 4 5 let ··· 34 nuget sources Add -Name tmpsrc -Source $TMP/nuget 35 nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget 36 37 + dotnet restore --source $TMP/nuget ${lib.optionalString altcoinSupport ''/p:Configuration="Altcoins-Release"''} BTCPayServer/BTCPayServer.csproj 38 + dotnet publish --no-restore --output $out/share/$pname ${lib.optionalString altcoinSupport "-c Altcoins-Release"} BTCPayServer/BTCPayServer.csproj 39 ''; 40 41 # btcpayserver requires the publish directory as its working dir

+95

pkgs/applications/blockchains/btcpayserver/deps.nix

··· 85 sha256 = "0ksmby0lzgsxkv0xfzr840262kcqra9vds91mcx0rf20blksfvsk"; 86 }) 87 (fetchNuGet { 88 name = "CsvHelper"; 89 version = "15.0.5"; 90 sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; ··· 761 }) 762 (fetchNuGet { 763 name = "NBitcoin"; 764 version = "5.0.4"; 765 sha256 = "04iafda61izzxb691brk72qs01m5dadqb4970nw5ayck6275s71i"; 766 }) ··· 795 sha256 = "1asri2wsjq3ljf2p4r4x52ba9cirh8ccc5ysxpnv4cvladkdazbi"; 796 }) 797 (fetchNuGet { 798 name = "NETStandard.Library"; 799 version = "1.6.1"; 800 sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; ··· 913 name = "Pomelo.JsonObject"; 914 version = "2.2.1"; 915 sha256 = "1w6s9wjbsyvq8cnqknkdzm9chnv0g5gcsrq5i94zp6br9vg7c627"; 916 }) 917 (fetchNuGet { 918 name = "QRCoder";

··· 85 sha256 = "0ksmby0lzgsxkv0xfzr840262kcqra9vds91mcx0rf20blksfvsk"; 86 }) 87 (fetchNuGet { 88 + name = "Common.Logging.Core"; 89 + version = "3.4.1"; 90 + sha256 = "06h80c7l12nh6gnkzskcs4w8741xhprv72vf88f33ilzfy37h5jy"; 91 + }) 92 + (fetchNuGet { 93 name = "CsvHelper"; 94 version = "15.0.5"; 95 sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; ··· 766 }) 767 (fetchNuGet { 768 name = "NBitcoin"; 769 + version = "5.0.33"; 770 + sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a"; 771 + }) 772 + (fetchNuGet { 773 + name = "NBitcoin"; 774 version = "5.0.4"; 775 sha256 = "04iafda61izzxb691brk72qs01m5dadqb4970nw5ayck6275s71i"; 776 }) ··· 805 sha256 = "1asri2wsjq3ljf2p4r4x52ba9cirh8ccc5ysxpnv4cvladkdazbi"; 806 }) 807 (fetchNuGet { 808 + name = "Nethereum.ABI"; 809 + version = "3.8.0"; 810 + sha256 = "10saq2qsqqgsf9d5cjji4lay74ydwkvkqgnns6gxikqicci8yx5c"; 811 + }) 812 + (fetchNuGet { 813 + name = "Nethereum.Accounts"; 814 + version = "3.8.0"; 815 + sha256 = "03dq4l1gsd6r2hah5flas8d8pfys7hh5srd279kiidaaxrp8fv2m"; 816 + }) 817 + (fetchNuGet { 818 + name = "Nethereum.BlockchainProcessing"; 819 + version = "3.8.0"; 820 + sha256 = "0sz6710a3rvzbj1ghx8dx9adfpsaydw8129c5nj2bqvvh6shi4ax"; 821 + }) 822 + (fetchNuGet { 823 + name = "Nethereum.Contracts"; 824 + version = "3.8.0"; 825 + sha256 = "0989as81dqz4j0h8b5a9f5hnd4lrjdj851cfc4j5h6hd633a13f8"; 826 + }) 827 + (fetchNuGet { 828 + name = "Nethereum.HdWallet"; 829 + version = "3.8.0"; 830 + sha256 = "0dy1bcm0gsp137286q3bx5q9gyd8lymrdmnh1ip3sszs5j31l9k2"; 831 + }) 832 + (fetchNuGet { 833 + name = "Nethereum.Hex"; 834 + version = "3.8.0"; 835 + sha256 = "0sbi982jnfs39sp7w85wf8lb51mijpwr9mpsmws08zrm90n93kb6"; 836 + }) 837 + (fetchNuGet { 838 + name = "Nethereum.JsonRpc.Client"; 839 + version = "3.8.0"; 840 + sha256 = "0gmdvsxhs398cj14f16r3dl8yv52iaxr9c9214k2ra28r14gfd1l"; 841 + }) 842 + (fetchNuGet { 843 + name = "Nethereum.JsonRpc.RpcClient"; 844 + version = "3.8.0"; 845 + sha256 = "05k5f0dfcx4afbkc1w7cfnz514i7840j2haxyzsxkp8818yvfg0a"; 846 + }) 847 + (fetchNuGet { 848 + name = "Nethereum.KeyStore"; 849 + version = "3.8.0"; 850 + sha256 = "05pj95vcfznlk4saq9dw19377gd1sqgmjcg5h92b5rzpgm9v811s"; 851 + }) 852 + (fetchNuGet { 853 + name = "Nethereum.Model"; 854 + version = "3.8.0"; 855 + sha256 = "1qfhzqirj9bi49zb6rdcy7w5bm9jyv3a79q7crmgpq3qx4lmz5yh"; 856 + }) 857 + (fetchNuGet { 858 + name = "Nethereum.RLP"; 859 + version = "3.8.0"; 860 + sha256 = "16142ag09h95394ip0ffkci09hchxh2i5xaw2rq46qcr8xd3kiym"; 861 + }) 862 + (fetchNuGet { 863 + name = "Nethereum.RPC"; 864 + version = "3.8.0"; 865 + sha256 = "1m2p10dds1k0r3gci25lh6cxl9z7ciw18g6wwa4yqi1hsw7n59vb"; 866 + }) 867 + (fetchNuGet { 868 + name = "Nethereum.Signer"; 869 + version = "3.8.0"; 870 + sha256 = "175acfqjqacc5zwh2kmrfnwd15jm3fjpv0xlgpyqry52mqxd9khf"; 871 + }) 872 + (fetchNuGet { 873 + name = "Nethereum.StandardTokenEIP20"; 874 + version = "3.8.0"; 875 + sha256 = "0xqb32x5b9y9r380frhj52i1lxsfs92nfgcpmys3shjxz6fnwf6g"; 876 + }) 877 + (fetchNuGet { 878 + name = "Nethereum.Util"; 879 + version = "3.8.0"; 880 + sha256 = "1ig1zkzpglq2q465n4c0ckv8w9gca9cfxz1qnrdhap0f1z90jyg8"; 881 + }) 882 + (fetchNuGet { 883 + name = "Nethereum.Web3"; 884 + version = "3.8.0"; 885 + sha256 = "0n18chc9h1cxqp01kncik9lqfgiqrzl2zr8jgzbb05drlf6k0f3i"; 886 + }) 887 + (fetchNuGet { 888 name = "NETStandard.Library"; 889 version = "1.6.1"; 890 sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; ··· 1003 name = "Pomelo.JsonObject"; 1004 version = "2.2.1"; 1005 sha256 = "1w6s9wjbsyvq8cnqknkdzm9chnv0g5gcsrq5i94zp6br9vg7c627"; 1006 + }) 1007 + (fetchNuGet { 1008 + name = "Portable.BouncyCastle"; 1009 + version = "1.8.2"; 1010 + sha256 = "0xqc8q40lr4r7ahsmzpa1q0jagp12abb6rsj80p37q34hsv5284q"; 1011 }) 1012 (fetchNuGet { 1013 name = "QRCoder";

+2 -1

pkgs/applications/blockchains/btcpayserver/update.sh

··· 8 ../nbxplorer/update.sh 9 echo 10 echo "Updating btcpayserver" 11 - ../nbxplorer/util/update-common.sh btcpayserver deps.nix

··· 8 ../nbxplorer/update.sh 9 echo 10 echo "Updating btcpayserver" 11 + # Include Razor SDK packages in deps.nix 12 + ../nbxplorer/util/update-common.sh btcpayserver deps.nix '"/p:Configuration="Altcoins-Release" /p:RazorCompileOnBuild=false'

+1 -1

pkgs/applications/blockchains/nbxplorer/update.sh

··· 3 4 scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) 5 6 - getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix

··· 3 4 scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) 5 6 + getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix ''

+2 -1

pkgs/applications/blockchains/nbxplorer/util/create-deps.sh

··· 7 8 pkgSrc=$1 9 depsFile=$(realpath "$2") 10 11 sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1) 12 [[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; } ··· 20 mkdir home 21 echo "Running dotnet restore for $sln" 22 HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \ 23 - dotnet restore -v normal --no-cache "$sln" > restore_log 24 25 echo "{ fetchNuGet }: [" > "$depsFile" 26 while read pkgSpec; do

··· 7 8 pkgSrc=$1 9 depsFile=$(realpath "$2") 10 + customFlags=$3 11 12 sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1) 13 [[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; } ··· 21 mkdir home 22 echo "Running dotnet restore for $sln" 23 HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \ 24 + dotnet restore $customFlags -v normal --no-cache "$sln" > restore_log 25 26 echo "{ fetchNuGet }: [" > "$depsFile" 27 while read pkgSpec; do

+2 -1

pkgs/applications/blockchains/nbxplorer/util/update-common.sh

··· 8 9 pkgName=$1 10 depsFile=$2 11 12 : ${getVersionFromTags:=} 13 : ${refetch:=} ··· 71 72 # Create deps file 73 storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)" 74 - . "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile"

··· 8 9 pkgName=$1 10 depsFile=$2 11 + customFlags=$3 12 13 : ${getVersionFromTags:=} 14 : ${refetch:=} ··· 72 73 # Create deps file 74 storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)" 75 + . "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" "$customFlags"