From 564acb6f6cdc50a6ba4f98bea6ca1c4d45096615 Mon Sep 17 00:00:00 2001 From: nayeko <196556004+nayeko@users.noreply.github.com> Date: Sat, 15 Feb 2025 18:10:18 +0000 Subject: [PATCH 1/2] bililiverecorder: format --- pkgs/by-name/bi/bililiverecorder/package.nix | 29 +++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/bi/bililiverecorder/package.nix b/pkgs/by-name/bi/bililiverecorder/package.nix index af7b1b432a36..244d54640f35 100644 --- a/pkgs/by-name/bi/bililiverecorder/package.nix +++ b/pkgs/by-name/bi/bililiverecorder/package.nix @@ -1,17 +1,20 @@ -{ lib -, stdenv -, fetchzip -, makeWrapper -, dotnetCorePackages +{ + lib, + stdenv, + fetchzip, + makeWrapper, + dotnetCorePackages, }: let pname = "bililiverecorder"; - dotnet = with dotnetCorePackages; combinePackages [ - runtime_6_0-bin - aspnetcore_6_0-bin - ]; + dotnet = + with dotnetCorePackages; + combinePackages [ + runtime_6_0-bin + aspnetcore_6_0-bin + ]; version = "2.13.0"; hash = "sha256-4OQ2gut/eLk4CXRN5E3Z8XobXsT3bSmtmJEcHzHcz/0="; @@ -40,13 +43,13 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "Convenient free open source bilibili live recording tool"; homepage = "https://rec.danmuji.org/"; changelog = "https://github.com/BililiveRecorder/BililiveRecorder/releases/tag/${version}"; mainProgram = "BililiveRecorder"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ zaldnoay ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ zaldnoay ]; + platforms = lib.platforms.unix; }; } From 0f72ce72b4ed1014718d58bcb94e66d7c1148a01 Mon Sep 17 00:00:00 2001 From: nayeko <196556004+nayeko@users.noreply.github.com> Date: Sat, 15 Feb 2025 18:10:49 +0000 Subject: [PATCH 2/2] bililiverecorder:2.13.0 -> 2.15.1 --- pkgs/by-name/bi/bililiverecorder/package.nix | 26 ++++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/bi/bililiverecorder/package.nix b/pkgs/by-name/bi/bililiverecorder/package.nix index 244d54640f35..a48c7a45ec4b 100644 --- a/pkgs/by-name/bi/bililiverecorder/package.nix +++ b/pkgs/by-name/bi/bililiverecorder/package.nix @@ -7,26 +7,21 @@ }: let - pname = "bililiverecorder"; - dotnet = with dotnetCorePackages; combinePackages [ - runtime_6_0-bin - aspnetcore_6_0-bin + runtime_8_0-bin + aspnetcore_8_0-bin ]; - - version = "2.13.0"; - hash = "sha256-4OQ2gut/eLk4CXRN5E3Z8XobXsT3bSmtmJEcHzHcz/0="; - in -stdenv.mkDerivation { - inherit pname version; +stdenv.mkDerivation rec { + pname = "bililiverecorder"; + version = "2.15.1"; src = fetchzip { url = "https://github.com/BililiveRecorder/BililiveRecorder/releases/download/v${version}/BililiveRecorder-CLI-any.zip"; + hash = "sha256-ugzFiuLe+Al3aRvEM3D4kqnaFrFR4Pr95UlEg0VGvvU="; stripRoot = false; - inherit hash; }; nativeBuildInputs = [ makeWrapper ]; @@ -34,11 +29,10 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - mkdir -p $out/{bin,share/${pname}-${version}} - cp -r * $out/share/${pname}-${version}/. - - makeWrapper "${dotnet}/bin/dotnet" $out/bin/BililiveRecorder \ - --add-flags "$out/share/${pname}-${version}/BililiveRecorder.Cli.dll" + mkdir -p $out/{bin,lib} + cp -r . $out/lib/bililiverecorder + makeWrapper ${dotnet}/bin/dotnet $out/bin/BililiveRecorder \ + --add-flags $out/lib/bililiverecorder/BililiveRecorder.Cli.dll runHook postInstall '';