mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-02 21:10:08 +00:00
python311Packages.jq: 1.5.0 -> 1.6.0, clean up, skip failing test (#285321)
(cherry picked from commit 27a1884313)
Co-authored-by: K900 <me@0upti.me>
This commit is contained in:
@@ -2,15 +2,15 @@
|
||||
, buildPythonPackage
|
||||
, cython
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, jq
|
||||
, oniguruma
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jq";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -19,18 +19,10 @@ buildPythonPackage rec {
|
||||
owner = "mwilliamson";
|
||||
repo = "jq.py";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mITk5y2AdUc9kZ/WrsnHxS1GRRmO4FDbPRgTtV2gIXI=";
|
||||
hash = "sha256-c6tJI/mPlBGIYTk5ObIQ1CUTq73HouQ2quMZVWG8FFg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Removes vendoring
|
||||
./jq-py-setup.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mwilliamson/jq.py/commit/805705dde4beb9db9a1743663d415198fb02eb1a.patch";
|
||||
includes = [ "tests/*" ];
|
||||
hash = "sha256-AgdpwmtOTeJ4nSbM6IknKaIVqqtWkpxTTtblXjlbWeA=";
|
||||
})
|
||||
];
|
||||
env.JQPY_USE_SYSTEM_LIBS = 1;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
@@ -38,6 +30,7 @@ buildPythonPackage rec {
|
||||
|
||||
buildInputs = [
|
||||
jq
|
||||
oniguruma
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
@@ -48,6 +41,11 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# intentional behavior change in jq 1.7.1 not reflected upstream
|
||||
"test_given_json_text_then_strings_containing_null_characters_are_preserved"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"jq"
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user