From fa347347f3cc7791512021175475e7e18a0216fd Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Sat, 9 Mar 2024 13:52:36 +0100 Subject: [PATCH] fritz-exporter: 2.3.1 -> 2.4.3 https://github.com/pdreker/fritz_exporter/releases/tag/fritzexporter-v2.4.3 --- .../by-name/fr/fritz-exporter/console-script.patch | 14 -------------- pkgs/by-name/fr/fritz-exporter/package.nix | 10 +++------- 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 pkgs/by-name/fr/fritz-exporter/console-script.patch diff --git a/pkgs/by-name/fr/fritz-exporter/console-script.patch b/pkgs/by-name/fr/fritz-exporter/console-script.patch deleted file mode 100644 index e13e78f2d184..000000000000 --- a/pkgs/by-name/fr/fritz-exporter/console-script.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index ffad1a4..e7551da 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -44,6 +44,9 @@ coverage = ">=6.4.4,<8.0.0" - pytest-cov = ">=3,<5" - ruff = "^0.1.7" - -+[tool.poetry.scripts] -+fritzexporter = "fritzexporter.__main__:main" -+ - [build-system] - requires = ["poetry-core"] - build-backend = "poetry.core.masonry.api" diff --git a/pkgs/by-name/fr/fritz-exporter/package.nix b/pkgs/by-name/fr/fritz-exporter/package.nix index 3306802b840f..f9b779f0eec5 100644 --- a/pkgs/by-name/fr/fritz-exporter/package.nix +++ b/pkgs/by-name/fr/fritz-exporter/package.nix @@ -5,21 +5,16 @@ python3.pkgs.buildPythonApplication rec { pname = "fritz-exporter"; - version = "2.3.1"; + version = "2.4.3"; pyproject = true; src = fetchFromGitHub { owner = "pdreker"; repo = "fritz_exporter"; rev = "fritzexporter-v${version}"; - hash = "sha256-Dv/2Og1OJV7canZ8Y5Pai5gPRUvcRDYmSGoD2pnAkSs="; + hash = "sha256-2A8hw2XkdxkauG+lMlKfObEvLHUQk79xWmlp0hlrXYM="; }; - patches = [ - # https://github.com/pdreker/fritz_exporter/pull/282 - ./console-script.patch - ]; - postPatch = '' # don't test coverage sed -i "/^addopts/d" pyproject.toml @@ -31,6 +26,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ attrs + defusedxml fritzconnection prometheus-client pyyaml