From a56b0af5ff980f795b223bac9a03dcf8460ca5aa Mon Sep 17 00:00:00 2001 From: Maurice Zhou Date: Fri, 31 Mar 2023 08:04:22 +0200 Subject: [PATCH 1/2] maintainers: add ne9z Signed-off-by: Maurice Zhou --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4eefe3bea0f..c940532cf3f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10678,6 +10678,12 @@ githubId = 137805; name = "Alexander Tsvyashchenko"; }; + ne9z = { + email = "yuchen@apvc.uk"; + github = "ne9z"; + githubId = 77314501; + name = "Maurice Zhou"; + }; nebulka = { email = "arapun@proton.me"; github = "nebulka1"; From 7432b75233b05597124dc5d04e5d787bdd1711f9 Mon Sep 17 00:00:00 2001 From: Maurice Zhou Date: Fri, 31 Mar 2023 08:03:58 +0200 Subject: [PATCH 2/2] pyrosimple: init at 2.7.0 Signed-off-by: Maurice Zhou --- .../networking/p2p/pyrosimple/default.nix | 72 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/applications/networking/p2p/pyrosimple/default.nix diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix new file mode 100644 index 00000000000..15a9ce266e0 --- /dev/null +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, python3Packages +, nix-update-script +, pyrosimple +, testers +, fetchPypi +, buildPythonPackage +, bencode-py +, apscheduler +, jinja2 +, python-daemon +, importlib-resources +, parsimonious +, prometheus-client +, prompt-toolkit +, requests +, shtab +, inotify +, withInotify ? stdenv.isLinux +, python-box +, tomli +, tomli-w +}: + +let + pname = "pyrosimple"; + version = "2.7.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-SMqzvTbWFHwnbMQ+6K0m1v+PybceQK5EHEuN8FB6SaU="; + }; + + propagatedBuildInputs = [ + bencode-py + apscheduler + jinja2 + python-daemon + importlib-resources + parsimonious + prometheus-client + prompt-toolkit + requests + shtab + python-box + tomli + tomli-w + ] ++ lib.optional withInotify inotify; + +in buildPythonPackage { + inherit pname version src propagatedBuildInputs; + + passthru = { + updateScript = nix-update-script { }; + tests = testers.testVersion { + package = pyrosimple; + command = "pyroadmin --version"; + }; + }; + + meta = let inherit (lib) licenses platforms maintainers; + in { + homepage = "https://kannibalox.github.io/pyrosimple/"; + description = "A rTorrent client and Python 3 fork of the pyrocore tools"; + license = licenses.gpl3Plus; + changelog = "https://github.com/kannibalox/pyrosimple/blob/v${version}/CHANGELOG.md"; + platforms = platforms.all; + maintainers = builtins.attrValues { inherit (maintainers) ne9z; }; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 496faefd0c9..035c84f7301 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32898,6 +32898,8 @@ with pkgs; pwdsafety = callPackage ../tools/security/pwdsafety { }; + pyrosimple = python3Packages.callPackage ../applications/networking/p2p/pyrosimple { }; + qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { }; qbittorrent-nox = qbittorrent.override { guiSupport = false;