From a81473988db5102a414680b1ecbb554e10131a73 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 20 Aug 2023 15:18:08 +0100 Subject: [PATCH] python3Packages.python-magic: backport fix for file-5.45 Without the change ther build fails on `staging` as: [ 12s] test/python_magic_test.py:53: in assert_values [ 12s] self.assertIn(value, expected_value) [ 12s] E AssertionError: 'PDF document, version 1.2, 2 page(s)' not found in ('PDF document, version 1.2', 'PDF document, version 1.2, 2 pages') --- pkgs/development/python-modules/python-magic/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 056b466216bf..890cfb50c2cc 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -29,6 +29,14 @@ buildPythonPackage rec { url = "https://github.com/ahupp/python-magic/commit/4ffcd59113fa26d7c2e9d5897b1eef919fd4b457.patch"; hash = "sha256-67GpjlGiR4/os/iZ69V+ZziVLpjmid+7t+gQ2aQy9I0="; }) + + # Upstream patch to amend test suite for-5.45: + # https://github.com/ahupp/python-magic/pull/290 + (fetchpatch { + name = "file-5.45.patch"; + url = "https://github.com/ahupp/python-magic/commit/3d2405ca80cd39b2a91decd26af81dcf181390a4.patch"; + hash = "sha256-HRsnO9MGfMD9BkJdC4SrEFQ1OZEaXpwakXFLoaCPK94="; + }) ]; preCheck = ''