From 417101172d118da24deb027aad999be8013f2e7d Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sat, 8 Jan 2022 16:41:10 +0100 Subject: [PATCH 1/2] tautulli: add some missing files and update licence --- pkgs/servers/tautulli/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 96f8dca234fe..2dea927fca91 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -16,8 +16,13 @@ buildPythonApplication rec { }; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/libexec/tautulli - cp -R contrib data lib plexpy Tautulli.py $out/libexec/tautulli + 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 # Can't just symlink to the main script, since it uses __file__ to # import bundled packages and manage the service @@ -26,6 +31,8 @@ buildPythonApplication rec { # Creat backwards compatibility symlink to bin/plexpy ln -s $out/bin/tautulli $out/bin/plexpy + + runHook postInstall ''; checkPhase = '' @@ -39,7 +46,7 @@ buildPythonApplication rec { meta = with lib; { description = "A Python based monitoring and tracking tool for Plex Media Server"; homepage = "https://tautulli.com/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ csingley ]; }; From 72af5962468ca956cf6f9778545aa4a11e05b78e Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sat, 8 Jan 2022 17:00:28 +0100 Subject: [PATCH 2/2] tautulli: 2.8.0 -> 2.8.1 --- pkgs/servers/tautulli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 2dea927fca91..ac29b20a10d9 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.8.0"; + version = "2.8.1"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "0y4ijjr0sxq72gy22i0q810h64m11vbrz6fk44fpcnj5yab6hv8i"; + sha256 = "sha256-vaH8PdWsWwBE2eW0i1QsjfOZdG5luME12gAY2uykyng="; }; installPhase = ''