diff options
| author | Fabian Affolter <fabian@affolter-engineering.ch> | 2024-05-18 21:10:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-18 21:10:12 +0200 |
| commit | f15be70b710a8acf451f3e11ac812b62c75bc7ac (patch) | |
| tree | 6d1f7cc566c6b35cdc30a4eaa56420591fd7630c | |
| parent | 238386438e8ff49aea23e7beb734bbf095a94fec (diff) | |
| parent | b9c7eb096dd43ae936d55a170c2f2d8244d06488 (diff) | |
Merge pull request #312676 from fabaff/pynetdicom-fix
python312Packages.pynetdicom: add patches to use setup_method
| -rw-r--r-- | pkgs/development/python-modules/pynetdicom/default.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index 6f0407aacdff3..c8e11897c7272 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -29,10 +29,22 @@ buildPythonPackage rec { patches = [ (fetchpatch { - name = "fix-python-3.11-test-attribute-errors"; + name = "fix-python-3.11-test-attribute-errors.patch"; url = "https://github.com/pydicom/pynetdicom/pull/754/commits/2126bd932d6dfb3f07045eb9400acb7eaa1b3069.patch"; hash = "sha256-t6Lg0sTZSWIE5q5pkBvEoHDQ+cklDn8SgNBcFk1myp4="; }) + (fetchpatch { + # https://github.com/pydicom/pynetdicom/pull/848 + name = "replace-setup-with-setup_method1.patch"; + url = "https://github.com/pydicom/pynetdicom/commit/09b4e0901445d46868668bc69a7b4f7f00cf6cbb.patch"; + hash = "sha256-1ea1A/LU6qY+hd23b6H4OkKHQ0hI2/MYgBgZUZE0kRU="; + }) + (fetchpatch { + # https://github.com/pydicom/pynetdicom/pull/848 + name = "replace-setup-with-setup_method2.patch"; + url = "https://github.com/pydicom/pynetdicom/commit/3966c2d749eeda718caccf9a88a0495d1823825d.patch"; + hash = "sha256-C4MSfwwxDgr5T0XQMlR5j2wElPu83TqPhjyNDvfBjJs="; + }) ]; build-system = [ setuptools ]; @@ -86,7 +98,7 @@ buildPythonPackage rec { pytestFlagsArray = [ # https://github.com/pydicom/pynetdicom/issues/923 "-W" - "ignore::pytest.PytestRemovedIn8Warning" + "ignore::pytest.PytestRemovedIn9Warning" ]; meta = with lib; { |