Merge pull request #171879 from SuperSandro2000/python-magic
python310Packages.python-magic: normalise attr
This commit is contained in:
commit
77b0530b3c
@ -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 = ''
|
||||
|
@ -18,7 +18,7 @@ let
|
||||
scriptPython = python.withPackages (ps: with ps; [
|
||||
aiohttp
|
||||
requests
|
||||
python_magic
|
||||
python-magic
|
||||
]);
|
||||
|
||||
version = "0.3.0";
|
||||
|
@ -40,7 +40,7 @@ with python3.pkgs; buildPythonApplication rec {
|
||||
file
|
||||
gpgme
|
||||
notmuch2
|
||||
python_magic
|
||||
python-magic
|
||||
service-identity
|
||||
twisted
|
||||
urwid
|
||||
|
@ -106,7 +106,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
|
||||
python-dotenv
|
||||
python-gnupg
|
||||
python-Levenshtein
|
||||
python_magic
|
||||
python-magic
|
||||
pytz
|
||||
pyyaml
|
||||
redis
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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
|
||||
|
@ -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 ];
|
||||
|
||||
|
@ -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 = ''
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
];
|
||||
|
||||
|
@ -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=""
|
||||
|
@ -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
|
||||
];
|
||||
|
@ -36,6 +36,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; [ ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
@ -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 = {
|
||||
|
@ -26,7 +26,7 @@ python3.pkgs.buildPythonPackage rec {
|
||||
prometheus-client
|
||||
pycryptodome
|
||||
python-olm
|
||||
python_magic
|
||||
python-magic
|
||||
ruamel-yaml
|
||||
unpaddedbase64
|
||||
yarl
|
||||
|
@ -22,7 +22,7 @@ python3.pkgs.buildPythonPackage rec {
|
||||
prometheus-client
|
||||
pycryptodome
|
||||
python-olm
|
||||
python_magic
|
||||
python-magic
|
||||
qrcode
|
||||
ruamel-yaml
|
||||
unpaddedbase64
|
||||
|
@ -44,7 +44,7 @@ in python.pkgs.buildPythonPackage rec {
|
||||
sqlalchemy
|
||||
CommonMark
|
||||
ruamel-yaml
|
||||
python_magic
|
||||
python-magic
|
||||
tulir-telethon
|
||||
telethon-session-sqlalchemy
|
||||
pillow
|
||||
|
@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
|
||||
pkgs.git
|
||||
appdirs
|
||||
click
|
||||
python_magic
|
||||
python-magic
|
||||
requests
|
||||
termcolor
|
||||
toml
|
||||
|
@ -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 ([
|
||||
|
@ -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;
|
||||
|
||||
|
@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
fnvhash
|
||||
python_magic
|
||||
python-magic
|
||||
] ++ [
|
||||
wireshark-cli
|
||||
];
|
||||
|
@ -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
|
||||
];
|
||||
|
||||
|
@ -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
|
||||
|
@ -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 { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user