From 45e7f2e2126470cb09df17742580910be9dec3c2 Mon Sep 17 00:00:00 2001 From: ToasterUwU Date: Wed, 29 Jan 2025 23:50:39 +0100 Subject: [PATCH] rqbit: 7.0.1 -> 8.0.0 --- pkgs/by-name/rq/rqbit/package.nix | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix index f57afe0a066f..f5205818e20a 100644 --- a/pkgs/by-name/rq/rqbit/package.nix +++ b/pkgs/by-name/rq/rqbit/package.nix @@ -5,20 +5,20 @@ fetchFromGitHub, pkg-config, openssl, - darwin, buildNpmPackage, nodejs_20, + nix-update-script, }: let pname = "rqbit"; - version = "7.0.1"; + version = "8.0.0"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - hash = "sha256-Lt3HxK8fB1Xn2422wGkJ90muJjZ7r9ZHngGD/2tkaMM="; + hash = "sha256-Meztr/UxLgnbd3YwkSW0vy+D2N4mFg2v+T4nBnYiQBI="; }; rqbit-webui = buildNpmPackage { @@ -30,7 +30,7 @@ let sourceRoot = "${src.name}/crates/librqbit/webui"; - npmDepsHash = "sha256-VYPZXZx9rKLKZm5+d2wSVkoPLCQCffaeZVSi7mKRH/M="; + npmDepsHash = "sha256-vib8jpf7Jn1qv0m/dWJ4TbisByczNbtEd8hIM5ll2Q8="; installPhase = '' runHook preInstall @@ -45,15 +45,12 @@ in rustPlatform.buildRustPackage { inherit pname version src; - cargoHash = "sha256-esDUzzVm5J8fKftBfk5StJzN1YzLa1p0t7BsoxzrowI="; + useFetchCargoVendor = true; + cargoHash = "sha256-FGcws80cX0I74bVaSV6OLntPFPNanGAFm6CVHDAGbOU="; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - pkg-config - ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; preConfigure = '' mkdir -p crates/librqbit/webui/dist @@ -70,6 +67,13 @@ rustPlatform.buildRustPackage { passthru.webui = rqbit-webui; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "webui" + ]; + }; + meta = with lib; { description = "Bittorrent client in Rust"; homepage = "https://github.com/ikatson/rqbit";