commit 088da8735f6620b60d724aa7db742607ea216087 · pyrox.dev/nixpkgs

+6 -3

pkgs/development/python-modules/jq/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "jq";

     

       5
       5
       -
         version = "1.1.2";

     

       5
       5
       +
         version = "1.1.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "77e747c6ad10ce65479f5f9064ab036483bf307bf71fdd7d6235ef895fcc506e";

     

       9
       9
       +
           sha256 = "1ryxcll7601ki9rwlnryhhxpmwwnxs2qxq7kjm2b0xcqgzx1vv7r";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         patches = [ ./jq-py-setup.patch ];

     

       12
       12
       +
         patches = [

     

       13
       13
       +
           # Removes vendoring

     

       14
       14
       +
           ./jq-py-setup.patch

     

       15
       15
       +
         ];

     

       13
       16
        
       

     

       14
       17
        
         buildInputs = [ jq ];

     

       15
       18

+15 -18

pkgs/development/python-modules/jq/jq-py-setup.patch

···

       1
       1
       -
       From 968ddf2bd773e800e46737fced743bd00af9aa0d Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: William Kral <william.kral@gmail.com>

     

       3
       3
       -
       Date: Tue, 8 Sep 2020 22:04:24 -0700

     

       4
       4
       -
       Subject: [PATCH] Vastly simplify setup.py for distro compatibility

     

       1
       1
       +
       From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: "Robert T. McGibbon" <rmcgibbo@gmail.com>

     

       3
       3
       +
       Date: Fri, 7 May 2021 19:14:20 -0400

     

       4
       4
       +
       Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility

     

       5
       5
        
       

     

       6
       6
        
       ---

     

       7
       7
       -
        setup.py | 101 ++-----------------------------------------------------

     

       8
       8
       -
        1 file changed, 2 insertions(+), 99 deletions(-)

     

       7
       7
       +
        setup.py | 98 +-------------------------------------------------------

     

       8
       8
       +
        1 file changed, 1 insertion(+), 97 deletions(-)

     

       9
       9
        
       

     

       10
       10
        
       diff --git a/setup.py b/setup.py

     

       11
       11
       -
       index cb63f60..87380ed 100644

     

       11
       11
       +
       index 663792c..3ebcabe 100644

     

       12
       12
        
       --- a/setup.py

     

       13
       13
        
       +++ b/setup.py

     

       14
       14
       -
       @@ -1,114 +1,19 @@

     

       14
       14
       +
       @@ -1,113 +1,19 @@

     

       15
       15
        
        #!/usr/bin/env python

     

       16
       16
        
        

     

       17
       17
        
        import os

     
···

       79
       79
        
       -            tarball_path=jq_lib_tarball_path,

     

       80
       80
        
       -            lib_dir=jq_lib_dir,

     

       81
       81
        
       -            commands=[

     

       82
       82
       -
       -                ["autoreconf", "-i"],

     

       83
       83
       -
       -                ["./configure", "CFLAGS=-fPIC", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],

     

       82
       82
       +
       -                ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],

     

       84
       83
        
       -                ["make"],

     

       85
       84
        
       -            ])

     

       86
       85
        
       -

     
···

       93
       92
        
       -

     

       94
       93
        
       -        macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")

     

       95
       94
        
       -        if macosx_deployment_target:

     

       96
       96
       -
       -            os.environ['MACOSX_DEPLOYMENT_TARGET'] = macosx_deployment_target

     

       95
       95
       +
       -            os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target)

     

       97
       96
        
       -

     

       98
       97
        
       -        def run_command(args):

     

       99
       98
        
       -            print("Executing: %s" % ' '.join(args))

     
···

       127
       126
        
        )

     

       128
       127
        
        

     

       129
       128
        
        setup(

     

       130
       130
       -
       @@ -120,8 +25,7 @@ setup(

     

       131
       131
       -
            url='http://github.com/mwilliamson/jq.py',

     

       129
       129
       +
       @@ -120,7 +26,6 @@ setup(

     

       132
       130
        
            python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',

     

       133
       131
        
            license='BSD 2-Clause',

     

       134
       134
       -
       -    ext_modules = [jq_extension],

     

       132
       132
       +
            ext_modules = [jq_extension],

     

       135
       133
        
       -    cmdclass={"build_ext": jq_build_ext},

     

       136
       136
       -
       +    ext_modules=[jq_extension],

     

       137
       134
        
            classifiers=[

     

       138
       135
        
                'Development Status :: 5 - Production/Stable',

     

       139
       136
        
                'Intended Audience :: Developers',

     

       140
       140
       -
       @@ -137,4 +41,3 @@ setup(

     

       141
       141
       -
                'Programming Language :: Python :: 3.8',

     

       137
       137
       +
       @@ -137,4 +42,3 @@ setup(

     

       138
       138
       +
                'Programming Language :: Python :: 3.9',

     

       142
       139
        
            ],

     

       143
       140
        
        )

     

       144
       141
        
       -

     

       145
       142
        
       -- 

     

       146
       146
       -
       2.28.0

     

       143
       143
       +
       2.29.3

     

       147
       144