diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-02-15 06:02:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-15 06:02:12 +0000 |
| commit | e471b6ed4b644146e16ef345b48081af5f6cf368 (patch) | |
| tree | 668883aff16c479c8e8e0b4a7a9f53b34c253935 /pkgs/development/python-modules/python-magic | |
| parent | 998cac7284ee335729094e6fb2f8d681d21e6872 (diff) | |
| parent | 3a641defd170a4ef25ce8c7c64cb13f91f867fca (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/python-modules/python-magic')
| -rw-r--r-- | pkgs/development/python-modules/python-magic/default.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index d8a0f638d968..381ea6713848 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -3,7 +3,6 @@ , python , buildPythonPackage , fetchFromGitHub -, fetchpatch , substituteAll , file , glibcLocales @@ -11,23 +10,16 @@ buildPythonPackage rec { pname = "python-magic"; - version = "0.4.24"; + version = "0.4.25"; src = fetchFromGitHub { owner = "ahupp"; repo = "python-magic"; rev = version; - sha256 = "17jalhjbfd600lzfz296m0nvgp6c7vx1mgz82jbzn8hgdzknf4w0"; + sha256 = "sha256-h7YQVH5Z7zunT6AdLPBh3TWpxLpZ5unSHDhkVDFOWDI="; }; patches = [ - # pull upstream patch to support file-5.41 - (fetchpatch { - name = "file-5.41-compat.patch"; - url = "https://github.com/ahupp/python-magic/commit/0ae7e7ceac0e80e03adc75c858bb378c0427331a.patch"; - sha256 = "0vclaamb56nza1mcy88wjbkh81hnish2gzvl8visa2cknhgdmk50"; - }) - (substituteAll { src = ./libmagic-path.patch; libmagic = "${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}"; |