diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index e48065e6d9a0..58946f227ee2 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -31,7 +31,7 @@ , pyyaml , requests , keyring -, python_magic +, python-magic # commands that lutris needs , xrandr @@ -104,7 +104,7 @@ buildPythonApplication rec { libnotify pango webkitgtk - python_magic + python-magic ] ++ gstDeps; propagatedBuildInputs = [ @@ -117,7 +117,7 @@ buildPythonApplication rec { pillow dbus-python keyring - python_magic + python-magic ]; postPatch = '' diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index a900a469e031..2dc167012221 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -18,7 +18,7 @@ let scriptPython = python.withPackages (ps: with ps; [ aiohttp requests - python_magic + python-magic ]); version = "0.3.0"; diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index cb49829dce07..d8a4d1066ecb 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -40,7 +40,7 @@ with python3.pkgs; buildPythonApplication rec { file gpgme notmuch2 - python_magic + python-magic service-identity twisted urwid diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index ec83da852aba..dce6869f36e4 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -106,7 +106,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { python-dotenv python-gnupg python-Levenshtein - python_magic + python-magic pytz pyyaml redis diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index 42f37e130994..5584f2bd6719 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -17,7 +17,7 @@ , nose , nose-timer , mock -, python_magic +, python-magic , codecov , coverage , qt5 @@ -70,7 +70,7 @@ buildPythonPackage rec { nose-timer pyperclip pyqt5 - python_magic + python-magic ]; inherit doCheck; diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index d4ced793f830..6ba700cc6e24 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -12,7 +12,7 @@ , oauth2client , ply , pytest -, python_magic +, python-magic , requests }: @@ -40,7 +40,7 @@ buildPythonPackage rec { lxml oauth2client ply - python_magic + python-magic requests # pytest really is a runtime dependency # https://github.com/beancount/beancount/blob/v2/setup.py#L81-L82 diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index eefda80f18e4..01c1b8353ba8 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -3,7 +3,7 @@ , fetchPypi , django , pillow -, python_magic +, python-magic }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "6569d5c3e13c69ab8912ba5100084aa5abcdcffb8d1f5abc085b226e7bbd65b3"; }; - propagatedBuildInputs = [ pillow python_magic ]; + propagatedBuildInputs = [ pillow python-magic ]; checkInputs = [ django ]; diff --git a/pkgs/development/python-modules/karton-classifier/default.nix b/pkgs/development/python-modules/karton-classifier/default.nix index ca2703389b30..8195632bdfd4 100644 --- a/pkgs/development/python-modules/karton-classifier/default.nix +++ b/pkgs/development/python-modules/karton-classifier/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , karton-core , pytestCheckHook -, python_magic +, python-magic , pythonOlder }: @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ chardet karton-core - python_magic + python-magic ]; postPatch = '' diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix index c1a7c8985b78..178ed4b8fc06 100644 --- a/pkgs/development/python-modules/mastodon-py/default.nix +++ b/pkgs/development/python-modules/mastodon-py/default.nix @@ -6,7 +6,7 @@ , decorator , http-ece , python-dateutil -, python_magic +, python-magic , pytz , requests , six @@ -37,7 +37,7 @@ buildPythonPackage rec { decorator http-ece python-dateutil - python_magic + python-magic pytz requests six diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index d5fe44b37e74..bba7b1884176 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -5,7 +5,7 @@ , isPy3k , decorator , http-parser -, python_magic +, python-magic , urllib3 , pytestCheckHook , pytest-mock @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator http-parser - python_magic + python-magic urllib3 ]; diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix index 92338d92531b..e697683b9b84 100644 --- a/pkgs/development/python-modules/pushbullet/default.nix +++ b/pkgs/development/python-modules/pushbullet/default.nix @@ -3,7 +3,7 @@ , fetchPypi , requests , websocket-client -, python_magic +, python-magic , cryptography , pytestCheckHook }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64"; }; - propagatedBuildInputs = [ cryptography requests websocket-client python_magic ]; + propagatedBuildInputs = [ cryptography requests websocket-client python-magic ]; preCheck = '' export PUSHBULLET_API_KEY="" diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix index 5baa9e903215..36e45d9d8695 100644 --- a/pkgs/development/python-modules/pysnow/default.nix +++ b/pkgs/development/python-modules/pysnow/default.nix @@ -6,7 +6,7 @@ , httpretty , ijson , poetry-core -, python_magic +, python-magic , pytz , pytestCheckHook , requests-oauthlib @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ brotli ijson - python_magic + python-magic pytz requests-oauthlib ]; diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 597eb37c7560..3185213123c2 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, genshi, lxml, python_magic }: +{ lib, fetchPypi, buildPythonPackage, genshi, lxml, python-magic }: buildPythonPackage rec { pname = "relatorio"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ genshi lxml - python_magic + python-magic ]; meta = { diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index 08d7f1046c72..81d80c8411de 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonPackage rec { prometheus-client pycryptodome python-olm - python_magic + python-magic ruamel-yaml unpaddedbase64 yarl diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 8c5310f6801b..5d7550fe3cd6 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -22,7 +22,7 @@ python3.pkgs.buildPythonPackage rec { prometheus-client pycryptodome python-olm - python_magic + python-magic qrcode ruamel-yaml unpaddedbase64 diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index bb52507dbaa7..2d0ab908cb84 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -44,7 +44,7 @@ in python.pkgs.buildPythonPackage rec { sqlalchemy CommonMark ruamel-yaml - python_magic + python-magic tulir-telethon telethon-session-sqlalchemy pillow diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/servers/pinnwand/steck.nix index 52efdc148abb..de6f28f30907 100644 --- a/pkgs/servers/pinnwand/steck.nix +++ b/pkgs/servers/pinnwand/steck.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { pkgs.git appdirs click - python_magic + python-magic requests termcolor toml diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 92fc69be7b5d..a3f5c44781a8 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { ] ++ (with python3Packages; [ argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c - python_magic progressbar33 pypdf2 rpm tlsh + python-magic progressbar33 pypdf2 rpm tlsh ]) ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ] ++ lib.optionals enableBloat ([ diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 88af5a136251..a73d39b5126a 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, python_magic, python-dateutil }: +{ lib, buildPythonApplication, fetchFromGitHub, python-magic, python-dateutil }: buildPythonApplication rec { pname = "s3cmd"; @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "0w4abif05mp52qybh4hjg6jbbj2caljq5xdhfiha3g0s5zsq46ri"; }; - propagatedBuildInputs = [ python_magic python-dateutil ]; + propagatedBuildInputs = [ python-magic python-dateutil ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/tools/security/hfinger/default.nix b/pkgs/tools/security/hfinger/default.nix index 8116c222d077..2c584f35ff4f 100644 --- a/pkgs/tools/security/hfinger/default.nix +++ b/pkgs/tools/security/hfinger/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ fnvhash - python_magic + python-magic ] ++ [ wireshark-cli ]; diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index 60775be180c8..fdfab9bc1954 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { defusedxml pyaml pykeepass - python_magic # similar API to "file-magic", but already in nixpkgs. + python-magic # similar API to "file-magic", but already in nixpkgs. secretstorage ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0dcb33f79658..eb0062fa17cf 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -108,6 +108,7 @@ mapAliases ({ pytestrunner = pytest-runner; # added 2021-01-04 python-igraph = igraph; # added 2021-11-11 python-lz4 = lz4; # added 2018-06-01 + python-magic = python-magic; # added 2022-05-07 python_mimeparse = python-mimeparse; # added 2021-10-31 python-subunit = subunit; # added 2021-09-10 pytest_xdist = pytest-xdist; # added 2021-01-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 50ed104cbe80..3986a82fa89f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8360,7 +8360,7 @@ in { inherit (pkgs) lzo; }; - python_magic = callPackage ../development/python-modules/python-magic { }; + python-magic = callPackage ../development/python-modules/python-magic { }; python-manilaclient = callPackage ../development/python-modules/python-manilaclient { };