diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index eec39e691a8..3958a44cdaf 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -15,19 +15,17 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.0.5.5"; + version = "1.0.5.9"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "11h1nrmb7f44msbhhiz9ddqh5ss2kz6d8ysnvd070x3xj5krgnxz"; + sha256 = "011pp94i49fx587ng16m6ml63vwiysjvpkijihrk6xamz78zddgx"; }; - nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget ]; + nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; - # Due to a bug in btcpayserver, we can't just `dotnet publish` to create a binary. - # Build with `dotnet build` instead and add a custom `dotnet run` script. buildPhase = '' export HOME=$TMP/home export DOTNET_CLI_TELEMETRY_OPTOUT=1 @@ -37,21 +35,15 @@ stdenv.mkDerivation rec { nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget dotnet restore --source $TMP/nuget BTCPayServer/BTCPayServer.csproj - dotnet build -c Release BTCPayServer/BTCPayServer.csproj - ''; - - runScript = '' - #!${bash}/bin/bash - DOTNET_CLI_TELEMETRY_OPTOUT=1 exec ${dotnetSdk}/bin/dotnet run --no-launch-profile --no-build \ - -c Release -p @@SHARE@@/BTCPayServer/BTCPayServer.csproj -- "$@" + dotnet publish --no-restore --output $out/share/$pname -c Release BTCPayServer/BTCPayServer.csproj ''; + # btcpayserver requires the publish directory as its working dir + # https://github.com/btcpayserver/btcpayserver/issues/1894 installPhase = '' - cd .. - share=$out/share/$pname - mkdir -p $share - mv -T source $share - install -D -m500 <(echo "$runScript" | sed "s|@@SHARE@@|$share|") $out/bin/$pname + makeWrapper $out/share/$pname/BTCPayServer $out/bin/$pname \ + --set DOTNET_ROOT "${dotnetSdk}" \ + --run "cd $out/share/$pname" ''; dontStrip = true; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index cb0641b8c85..5ee5e261211 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -21,8 +21,8 @@ }) (fetchNuGet { name = "BTCPayServer.Lightning.All"; - version = "1.2.3"; - sha256 = "1vx47rb505904pz30n5jzc9x42pcfln695l31q4dv5p4fbf10g4q"; + version = "1.2.4"; + sha256 = "1f4wgs8ijk1wmppz5lmas7l6m83szz57jyk6ak0dxhccdld9rdaj"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Charge"; @@ -31,8 +31,8 @@ }) (fetchNuGet { name = "BTCPayServer.Lightning.CLightning"; - version = "1.2.0"; - sha256 = "0a47fz20ngcz90h2y01isi2h940jljcmnfy6wyknj029sii7i1zs"; + version = "1.2.1"; + sha256 = "14km69jzmnyqg19w27g6znml4z0xkm8l4j7rj0x36bw67cjmgahv"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Common"; @@ -706,8 +706,8 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.16"; - sha256 = "0fsdb96k5lwyq4d7h7yg91qghima08yk0bsw5cvr4h2jsfphk423"; + version = "2.0.21"; + sha256 = "0xmygiwjlia7fbxy63893jb15g6fxggxxr9bbm8znd9bs3jzp2g1"; }) (fetchNuGet { name = "NBitcoin"; @@ -726,13 +726,8 @@ }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.45"; - sha256 = "102vwxwkg367yxv26hycnc7hjxlv2zvsgr8g6adw8dmzsxck5fwk"; - }) - (fetchNuGet { - name = "NBitcoin"; - version = "5.0.51"; - sha256 = "0rg014sl7rqscnranwyfk41xfr5ccjqyx7aidfl5mh0znz44db2g"; + version = "5.0.60"; + sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v"; }) (fetchNuGet { name = "NBitpayClient"; @@ -741,8 +736,8 @@ }) (fetchNuGet { name = "NBXplorer.Client"; - version = "3.0.17"; - sha256 = "0xx2xshgpci9l9883zpqnmgchpizygy0hcq2wp2ch6yf3hbrj9qq"; + version = "3.0.19"; + sha256 = "0nahfxdsryf5snjy87770m51v2jcry02lmb10ilsg4h2ig4pjdk4"; }) (fetchNuGet { name = "NETStandard.Library"; @@ -956,8 +951,8 @@ }) (fetchNuGet { name = "Selenium.WebDriver.ChromeDriver"; - version = "83.0.4103.3900"; - sha256 = "17j9b637209nm5cs5sgr3vflphkhaxpm8bcjizhgj65r52gn17as"; + version = "85.0.4183.8700"; + sha256 = "0klyqmwa6yc0ibbmci51mzb2vl6n13qlk06chc9w78i0a43fs382"; }) (fetchNuGet { name = "Selenium.WebDriver";