diff options
| author | Yang, Bo <pop.atry@gmail.com> | 2023-08-12 14:19:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-12 14:19:01 -0700 |
| commit | 1b8ca87a835453b57f2d3ebdc227b75d658c22ef (patch) | |
| tree | 1801aafb80480479bf0f1ec0394f00b70aeabdab /pkgs/development/python-modules/python-magic | |
| parent | b51302ed47ad40536050c41f4bf021a0076fe3d0 (diff) | |
| parent | fe53548a11b9dc28f605364ace485f37524027c7 (diff) | |
Merge branch 'master' into stdenv.cc.libcxx
Diffstat (limited to 'pkgs/development/python-modules/python-magic')
| -rw-r--r-- | pkgs/development/python-modules/python-magic/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 3338fb6fa7d0..056b466216bf 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , substituteAll , file , pytestCheckHook @@ -15,7 +16,7 @@ buildPythonPackage rec { owner = "ahupp"; repo = "python-magic"; rev = version; - sha256 = "sha256-fZ+5xJ3P0EYK+6rQ8VzXv2zckKfEH5VUdISIR6ybIfQ="; + hash = "sha256-fZ+5xJ3P0EYK+6rQ8VzXv2zckKfEH5VUdISIR6ybIfQ="; }; patches = [ @@ -23,13 +24,18 @@ buildPythonPackage rec { src = ./libmagic-path.patch; libmagic = "${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}"; }) + (fetchpatch { + name = "update-test-for-upstream-added-gzip-extensions.patch"; + url = "https://github.com/ahupp/python-magic/commit/4ffcd59113fa26d7c2e9d5897b1eef919fd4b457.patch"; + hash = "sha256-67GpjlGiR4/os/iZ69V+ZziVLpjmid+7t+gQ2aQy9I0="; + }) ]; preCheck = '' export LC_ALL=en_US.UTF-8 ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -37,6 +43,6 @@ buildPythonPackage rec { description = "A python interface to the libmagic file type identification library"; homepage = "https://github.com/ahupp/python-magic"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } |