diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2019-03-08 16:52:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-08 16:52:40 +0100 |
commit | a540993d62cd7546fabb605f5983ebf3d3dd6db3 (patch) | |
tree | 59e031076eb8dcc5fa91b02312e5bdccc92c81d9 /pkgs | |
parent | 21c6592a421507ae0ecaf0b1df28b7f6f7b80515 (diff) | |
parent | 8b3ffebcdcaf169854b953541a12d0fc075102ea (diff) | |
download | nixlib-a540993d62cd7546fabb605f5983ebf3d3dd6db3.tar nixlib-a540993d62cd7546fabb605f5983ebf3d3dd6db3.tar.gz nixlib-a540993d62cd7546fabb605f5983ebf3d3dd6db3.tar.bz2 nixlib-a540993d62cd7546fabb605f5983ebf3d3dd6db3.tar.lz nixlib-a540993d62cd7546fabb605f5983ebf3d3dd6db3.tar.xz nixlib-a540993d62cd7546fabb605f5983ebf3d3dd6db3.tar.zst nixlib-a540993d62cd7546fabb605f5983ebf3d3dd6db3.zip |
Merge pull request #56171 from bachp/tautulli
tautulli/plexpy: 1.4.25 -> 2.1.26 (renamed)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/plexpy/default.nix | 41 | ||||
-rw-r--r-- | pkgs/servers/tautulli/default.nix | 55 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 57 insertions, 42 deletions
diff --git a/pkgs/servers/plexpy/default.nix b/pkgs/servers/plexpy/default.nix deleted file mode 100644 index 2875ecc52404..000000000000 --- a/pkgs/servers/plexpy/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{stdenv, fetchFromGitHub, python}: - -stdenv.mkDerivation rec { - version = "1.4.25"; - pname = "plexpy"; - name = "${pname}-${version}"; - - src = fetchFromGitHub { - owner = "JonnyWong16"; - repo = pname; - rev = "v${version}"; - sha256 = "0a4ynrfamlwkgqil4n61v47p21czxpjdzg0mias4kdjam2nnwnjx"; - }; - - buildPhase = ":"; - - installPhase = '' - mkdir -p $out - cp -R * $out/ - - # Remove superfluous Python checks from main script; - # prepend shebang - echo "#!${python.interpreter}" > $out/PlexPy.py - tail -n +7 PlexPy.py >> $out/PlexPy.py - - mkdir $out/bin - # Can't just symlink to the main script, since it uses __file__ to - # import bundled packages and manage the service - echo "#!/bin/bash" > $out/bin/plexpy - echo "$out/PlexPy.py \$*" >> $out/bin/plexpy - chmod +x $out/bin/plexpy - ''; - - meta = with stdenv.lib; { - description = "A Python based monitoring and tracking tool for Plex Media Server."; - homepage = http://jonnywong16.github.io/plexpy/; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ csingley ]; - }; -} diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix new file mode 100644 index 000000000000..5dcd958b799f --- /dev/null +++ b/pkgs/servers/tautulli/default.nix @@ -0,0 +1,55 @@ +{stdenv, fetchFromGitHub, python }: + +stdenv.mkDerivation rec { + version = "2.1.26"; + pname = "Tautulli"; + name = "${pname}-${version}"; + + pythonPath = [ python.pkgs.setuptools ]; + buildInputs = [ python.pkgs.setuptools ]; + nativeBuildInputs = [ python.pkgs.wrapPython ]; + + src = fetchFromGitHub { + owner = "Tautulli"; + repo = pname; + rev = "v${version}"; + sha256 = "1gq13dazbqbzdb0wfw87maprr9nva357zdj8x0lfrbasi3h5522q"; + }; + + buildPhase = ":"; + + installPhase = '' + mkdir -p $out + cp -R * $out/ + + # Remove the PlexPy.py compatibility file as it won't work after wrapping. + # We still have the plexpy executable in bin for compatibility. + rm $out/PlexPy.py + + # Remove superfluous Python checks from main script; + # prepend shebang + echo "#!${python.interpreter}" > $out/Tautulli.py + tail -n +7 Tautulli.py >> $out/Tautulli.py + + + mkdir $out/bin + # Can't just symlink to the main script, since it uses __file__ to + # import bundled packages and manage the service + echo "#!/bin/bash" > $out/bin/tautulli + echo "$out/Tautulli.py \$*" >> $out/bin/tautulli + chmod +x $out/bin/tautulli + + # Creat backwards compatibility symlink to bin/plexpy + ln -s $out/bin/tautulli $out/bin/plexpy + + wrapPythonProgramsIn "$out" "$out $pythonPath" + ''; + + meta = with stdenv.lib; { + description = "A Python based monitoring and tracking tool for Plex Media Server."; + homepage = https://tautulli.com/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ csingley ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 59eb707c8af5..96396acb9e62 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -234,6 +234,7 @@ mapAliases ({ pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 piwik = matomo; # added 2018-01-16 pltScheme = racket; # just to be sure + plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22 pmtools = acpica-tools; # added 2018-11-01 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 postgresql94 = postgresql_9_4; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f25783a71d7..6414f0023224 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4928,7 +4928,7 @@ in plex = callPackage ../servers/plex { }; - plexpy = callPackage ../servers/plexpy { python = python2; }; + tautulli = callPackage ../servers/tautulli { python = python2; }; ploticus = callPackage ../tools/graphics/ploticus { libpng = libpng12; |