From a73ba752d28eba5a8e26380e5b8cfe7bdf14c9cb Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Tue, 7 Jan 2025 19:52:48 +0200 Subject: [PATCH 1/2] rutorrent: modernize Also remove accidental `;` from `runHook postInstall` --- pkgs/by-name/ru/rutorrent/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ru/rutorrent/package.nix b/pkgs/by-name/ru/rutorrent/package.nix index 774cd0bc3961..6d9b3a0bca61 100644 --- a/pkgs/by-name/ru/rutorrent/package.nix +++ b/pkgs/by-name/ru/rutorrent/package.nix @@ -4,28 +4,28 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rutorrent"; version = "5.1.5"; src = fetchFromGitHub { owner = "Novik"; repo = "ruTorrent"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-si/6iZMipfm18lrwjJvuL+vQco0l+HresUEv2gj1uRw="; }; installPhase = '' runHook preInstall - mkdir -p $out/ - cp -r . $out/ - runHook postInstall; + mkdir -p "$out" + cp -r . "$out" + runHook postInstall ''; - meta = with lib; { + meta = { description = "Yet another web front-end for rTorrent"; homepage = "https://github.com/Novik/ruTorrent"; - license = licenses.gpl3Plus; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; }; -} +}) From 2372fb0cba3c4162fcc7dbd4b8ef6ccb306390bc Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Tue, 7 Jan 2025 19:55:22 +0200 Subject: [PATCH 2/2] rutorrent: add `meta.changelog` --- pkgs/by-name/ru/rutorrent/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ru/rutorrent/package.nix b/pkgs/by-name/ru/rutorrent/package.nix index 6d9b3a0bca61..a587eebdd670 100644 --- a/pkgs/by-name/ru/rutorrent/package.nix +++ b/pkgs/by-name/ru/rutorrent/package.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { + changelog = "https://github.com/Novik/ruTorrent/releases/tag/v${finalAttrs.version}"; description = "Yet another web front-end for rTorrent"; homepage = "https://github.com/Novik/ruTorrent"; license = lib.licenses.gpl3Plus;