Merge pull request #235848 from fabaff/prometheus-client-bump

python310Packages.prometheus-client: 0.16.0 -> 0.17.0

pkgs/applications/networking/p2p/pyrosimple/default.nix

@@ -1,53 +1,36 @@
 { lib
 , stdenv
-, python3Packages
+, fetchFromGitHub
 , nix-update-script
 , pyrosimple
+, python3
 , testers
-, fetchPypi
-, buildPythonPackage
-, pythonRelaxDepsHook
-, poetry-core
-, 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.8.0";
-in buildPythonPackage {
-  inherit pname version;
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-K0QjEcGzROlSWuUHWqUbcOdKccrHex2SlwPAmsmIbaQ=";
-  };
-
+python3.pkgs.buildPythonApplication rec {
+  pname = "pyrosimple";
+  version = "2.9.0";
   format = "pyproject";
 
-  nativeBuildInputs = [
+  src = fetchFromGitHub {
+    owner = "kannibalox";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-KDQUSsotTpmnYq7kCRGIRWCZKxr2bxPKCvKy+OmoOm8=";
+  };
+
+  pythonRelaxDeps = [
+    "prometheus-client"
+    "python-daemon"
+  ];
+
+  nativeBuildInputs = with python3.pkgs; [
     poetry-core
     pythonRelaxDepsHook
   ];
 
-  pythonRelaxDeps = [
-    "python-daemon"
-  ];
-
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3.pkgs; [
     bencode-py
     apscheduler
     jinja2
@@ -59,10 +42,15 @@ in buildPythonPackage {
     requests
     shtab
     python-box
-    tomli
     tomli-w
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    tomli
   ] ++ lib.optional withInotify inotify;
 
+  nativeCheckInputs = with python3.pkgs; [
+    pytestCheckHook
+  ];
+
   passthru = {
     updateScript = nix-update-script { };
     tests = testers.testVersion {
@@ -72,12 +60,10 @@ in buildPythonPackage {
   };
 
   meta = with lib; {
+    description = "A rTorrent client";
     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;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ ne9z vamega ];
   };
-
 }

pkgs/development/python-modules/prometheus-client/default.nix

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "prometheus-client";
-  version = "0.16.0";
+  version = "0.17.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "prometheus";
     repo = "client_python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FYQE0toy5VFKNVadSsxG/5NCRANYJOcVR4bGPrCAxvc=";
+    hash = "sha256-0qh6OorIIs3WfneZavzwTTZFwIRXCJzezks/qihu8xo=";
   };
 
   nativeCheckInputs = [

pkgs/top-level/all-packages.nix

@@ -34213,7 +34213,7 @@ with pkgs;
 
   pwdsafety = callPackage ../tools/security/pwdsafety { };
 
-  pyrosimple = python3Packages.callPackage ../applications/networking/p2p/pyrosimple { };
+  pyrosimple = callPackage ../applications/networking/p2p/pyrosimple { };
 
   qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { };
   qbittorrent-nox = qbittorrent.override {