From d93d34d009493601f8a68078fb899ce2d7467721 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Mon, 2 Feb 2026 03:53:52 +0100 Subject: [PATCH] tautulli: refactor and move to pkgs/by-name this shouldn't create any rebuilds --- .../ta/tautulli/package.nix} | 16 +++++++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 11 deletions(-) rename pkgs/{servers/tautulli/default.nix => by-name/ta/tautulli/package.nix} (83%) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/by-name/ta/tautulli/package.nix similarity index 83% rename from pkgs/servers/tautulli/default.nix rename to pkgs/by-name/ta/tautulli/package.nix index 4154d066d06a..55785b012d11 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/by-name/ta/tautulli/package.nix @@ -1,27 +1,25 @@ { lib, fetchFromGitHub, - buildPythonApplication, - setuptools, - wrapPython, + python3Packages, makeWrapper, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "Tautulli"; version = "2.16.1"; pyproject = false; - pythonPath = [ setuptools ]; + pythonPath = [ python3Packages.setuptools ]; nativeBuildInputs = [ - wrapPython + python3Packages.wrapPython makeWrapper ]; src = fetchFromGitHub { owner = "Tautulli"; repo = "Tautulli"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-Zct7EhnU5LROO23Joz6OxQTtC9uGZhtceSG+aX6MI2c="; }; @@ -32,7 +30,7 @@ buildPythonApplication rec { cp -R contrib data lib plexpy Tautulli.py CHANGELOG.md $out/libexec/tautulli echo "master" > $out/libexec/tautulli/branch.txt - echo "v${version}" > $out/libexec/tautulli/version.txt + echo "v${finalAttrs.version}" > $out/libexec/tautulli/version.txt # Can't just symlink to the main script, since it uses __file__ to # import bundled packages and manage the service @@ -60,4 +58,4 @@ buildPythonApplication rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ rhoriguchi ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e157ea943269..d02d132978f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3289,8 +3289,6 @@ with pkgs; tabview = with python3Packages; toPythonApplication tabview; - tautulli = python3Packages.callPackage ../servers/tautulli { }; - inherit (callPackage ../development/tools/pnpm { }) pnpm_8 pnpm_9