b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

python3Packages.jq: 1.1.2 -> 1.1.3

Browse source
This commit is contained in:
Robert T. McGibbon 2021-05-07 19:16:04 -04:00 committed by Jonathan Ringer
parent b76bf3c624
commit 088da8735f
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/python-modules/jq/default.nix
View file

@ -2,14 +2,17 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "jq"; pname = "jq";
version = "1.1.2"; version = "1.1.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "77e747c6ad10ce65479f5f9064ab036483bf307bf71fdd7d6235ef895fcc506e"; sha256 = "1ryxcll7601ki9rwlnryhhxpmwwnxs2qxq7kjm2b0xcqgzx1vv7r";
}; };
patches = [ ./jq-py-setup.patch ]; patches = [
# Removes vendoring
./jq-py-setup.patch
];
buildInputs = [ jq ]; buildInputs = [ jq ];

33
pkgs/development/python-modules/jq/jq-py-setup.patch
View file

@ -1,17 +1,17 @@
From 968ddf2bd773e800e46737fced743bd00af9aa0d Mon Sep 17 00:00:00 2001 From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001
From: William Kral <william.kral@gmail.com> From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
Date: Tue, 8 Sep 2020 22:04:24 -0700 Date: Fri, 7 May 2021 19:14:20 -0400
Subject: [PATCH] Vastly simplify setup.py for distro compatibility Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility
--- ---
setup.py | 101 ++----------------------------------------------------- setup.py | 98 +-------------------------------------------------------
1 file changed, 2 insertions(+), 99 deletions(-) 1 file changed, 1 insertion(+), 97 deletions(-)
diff --git a/setup.py b/setup.py diff --git a/setup.py b/setup.py
index cb63f60..87380ed 100644 index 663792c..3ebcabe 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -1,114 +1,19 @@ @@ -1,113 +1,19 @@
#!/usr/bin/env python #!/usr/bin/env python
import os import os
@ -79,8 +79,7 @@ index cb63f60..87380ed 100644
- tarball_path=jq_lib_tarball_path, - tarball_path=jq_lib_tarball_path,
- lib_dir=jq_lib_dir, - lib_dir=jq_lib_dir,
- commands=[ - commands=[
- ["autoreconf", "-i"], - ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
- ["./configure", "CFLAGS=-fPIC", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
- ["make"], - ["make"],
- ]) - ])
- -
@ -93,7 +92,7 @@ index cb63f60..87380ed 100644
- -
- macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET") - macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")
- if macosx_deployment_target: - if macosx_deployment_target:
- os.environ['MACOSX_DEPLOYMENT_TARGET'] = macosx_deployment_target - os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target)
- -
- def run_command(args): - def run_command(args):
- print("Executing: %s" % ' '.join(args)) - print("Executing: %s" % ' '.join(args))
@ -127,21 +126,19 @@ index cb63f60..87380ed 100644
) )
setup( setup(
@@ -120,8 +25,7 @@ setup( @@ -120,7 +26,6 @@ setup(
url='http://github.com/mwilliamson/jq.py',
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
license='BSD 2-Clause', license='BSD 2-Clause',
- ext_modules = [jq_extension], ext_modules = [jq_extension],
- cmdclass={"build_ext": jq_build_ext}, - cmdclass={"build_ext": jq_build_ext},
+ ext_modules=[jq_extension],
classifiers=[ classifiers=[
'Development Status :: 5 - Production/Stable', 'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers', 'Intended Audience :: Developers',
@@ -137,4 +41,3 @@ setup( @@ -137,4 +42,3 @@ setup(
'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9',
], ],
) )
- -
-- --
2.28.0 2.29.3