diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/development/python-modules/python-magic | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/development/python-modules/python-magic')
-rw-r--r-- | pkgs/development/python-modules/python-magic/default.nix | 38 | ||||
-rw-r--r-- | pkgs/development/python-modules/python-magic/libmagic-path.patch | 17 |
2 files changed, 42 insertions, 13 deletions
diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 61a7dd315df..6737f126073 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -1,24 +1,36 @@ -{ buildPythonPackage, lib, fetchPypi, file, stdenv }: +{ lib +, stdenv +, python +, buildPythonPackage +, fetchFromGitHub +, substituteAll +, file +, glibcLocales +}: buildPythonPackage rec { pname = "python-magic"; - version = "0.4.18"; + version = "0.4.22"; - src = fetchPypi { - inherit pname version; - sha256 = "b757db2a5289ea3f1ced9e60f072965243ea43a2221430048fd8cacab17be0ce"; + src = fetchFromGitHub { + owner = "ahupp"; + repo = "python-magic"; + rev = version; + sha256 = "0zbdjr5shijs0jayz7gycpx0kn6v2bh83dpanyajk2vmy47jvbd6"; }; - postPatch = '' - substituteInPlace magic.py --replace "ctypes.util.find_library('magic')" "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; + patches = [ + (substituteAll { + src = ./libmagic-path.patch; + libmagic = "${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; - doCheck = false; + checkInputs = [ glibcLocales ]; - # TODO: tests are failing - #checkPhase = '' - # ${python}/bin/${python.executable} ./test.py - #''; + checkPhase = '' + LC_ALL="en_US.UTF-8" ${python.interpreter} test/test.py + ''; meta = { description = "A python interface to the libmagic file type identification library"; diff --git a/pkgs/development/python-modules/python-magic/libmagic-path.patch b/pkgs/development/python-modules/python-magic/libmagic-path.patch new file mode 100644 index 00000000000..5a1dbec7d51 --- /dev/null +++ b/pkgs/development/python-modules/python-magic/libmagic-path.patch @@ -0,0 +1,17 @@ +diff --git a/magic/loader.py b/magic/loader.py +index 6b2bfcb..69778af 100644 +--- a/magic/loader.py ++++ b/magic/loader.py +@@ -5,11 +5,7 @@ import glob + def load_lib(): + libmagic = None + # Let's try to find magic or magic1 +- dll = ctypes.util.find_library('magic') \ +- or ctypes.util.find_library('magic1') \ +- or ctypes.util.find_library('cygmagic-1') \ +- or ctypes.util.find_library('libmagic-1') \ +- or ctypes.util.find_library('msys-magic-1') # for MSYS2 ++ dll = '@libmagic@' + + # necessary because find_library returns None if it doesn't find the library + if dll: |