Merge pull request #280298 from dotlambda/xsdata-24.1

python311Packages.xsdata: 23.8 -> 24.1

authored by Maximilian Bosch and committed by GitHub a5e8d84c 4c2565b8

+35 -14
+19 -10
pkgs/development/python-modules/xsdata/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , pythonOlder 4 - , fetchPypi 4 + , fetchFromGitHub 5 + , substituteAll 6 + , ruff 5 7 , click 6 8 , click-default-group 7 9 , docformatter ··· 12 14 , requests 13 15 , pytestCheckHook 14 16 , setuptools 15 - , wheel 16 17 }: 17 18 18 19 buildPythonPackage rec { 19 20 pname = "xsdata"; 20 - version = "23.8"; 21 - format = "pyproject"; 21 + version = "24.1"; 22 + pyproject = true; 22 23 23 24 disabled = pythonOlder "3.8"; 24 25 25 - src = fetchPypi { 26 - inherit pname version; 27 - hash = "sha256-VfA9TIgjbwRyZq/+VQug3RlHat/OagHz4K76x8gHjlY="; 26 + src = fetchFromGitHub { 27 + owner = "tefra"; 28 + repo = "xsdata"; 29 + rev = "v${version}"; 30 + hash = "sha256-vdcCTJqvaRehGWfTd9GR/DypF9ftY4ite7SDMPc2Ups="; 28 31 }; 29 32 33 + patches = [ 34 + (substituteAll { 35 + src = ./paths.patch; 36 + ruff = lib.getExe ruff; 37 + }) 38 + ]; 39 + 30 40 postPatch = '' 31 41 substituteInPlace pyproject.toml \ 32 42 --replace "--benchmark-skip" "" ··· 34 44 35 45 nativeBuildInputs = [ 36 46 setuptools 37 - wheel 38 47 ]; 39 48 40 49 propagatedBuildInputs = [ ··· 83 92 ]; 84 93 85 94 meta = { 86 - description = "Python XML Binding"; 95 + description = "Naive XML & JSON bindings for Python"; 87 96 homepage = "https://github.com/tefra/xsdata"; 88 - changelog = "https://github.com/tefra/xsdata/blob/v${version}/CHANGES.rst"; 97 + changelog = "https://github.com/tefra/xsdata/blob/${src.rev}/CHANGES.rst"; 89 98 license = lib.licenses.mit; 90 99 maintainers = with lib.maintainers; [ dotlambda ]; 91 100 };
+13
pkgs/development/python-modules/xsdata/paths.patch
··· 1 + diff --git a/xsdata/codegen/writer.py b/xsdata/codegen/writer.py 2 + index 0301631f..3185c526 100644 3 + --- a/xsdata/codegen/writer.py 4 + +++ b/xsdata/codegen/writer.py 5 + @@ -73,7 +73,7 @@ class CodeWriter: 6 + """Run ruff format on the src code.""" 7 + commands = [ 8 + [ 9 + - "ruff", 10 + + "@ruff@", 11 + "format", 12 + "--stdin-filename", 13 + str(file_path),
+3 -4
pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix
··· 5 5 6 6 python3.pkgs.buildPythonApplication rec { 7 7 pname = "dmarc-metrics-exporter"; 8 - version = "0.9.4"; 8 + version = "0.10.1"; 9 9 10 10 disabled = python3.pythonOlder "3.8"; 11 11 12 - format = "pyproject"; 12 + pyproject = true; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "jgosmann"; 16 16 repo = "dmarc-metrics-exporter"; 17 17 rev = "refs/tags/v${version}"; 18 - hash = "sha256-doKG191rQvUpjOb3HvkzZP9XbtQXYGFtDJIdDSFRLSU="; 18 + hash = "sha256-gur0+2yHqxySXECMboW7dAyyf0ckSdS0FEy7HvA5Y5w="; 19 19 }; 20 20 21 21 pythonRelaxDeps = true; ··· 29 29 bite-parser 30 30 dataclasses-serialization 31 31 prometheus-client 32 - typing-extensions 33 32 uvicorn 34 33 xsdata 35 34 ]