···

       
48
       
48
       
 
       
# to be conditionally disabled

     

       
49
       
49
       
 
       
denyAttrList=(

     

       
50
       
50
       
 
       
        python27Packages

     

       
51
       
51
       
-
       
        python37Packages

     

       
52
       
51
       
 
       
        linuxPackages_

     

       
53
       
52
       
 
       
        rubyPackages_

     

       
54
       
53
       
 
       
)

     

···

       
1
       
1
       
-
       
From a612c481f6116955d420db5ae1fe4c1eb93eb2f2 Mon Sep 17 00:00:00 2001

     

       
2
       
2
       
-
       
From: Marcin Niemira <marcin.niemira@gmail.com>

     

       
3
       
3
       
-
       
Date: Sun, 9 Jun 2019 07:05:06 +1000

     

       
4
       
4
       
-
       
Subject: [PATCH] bpo-11122: fix hardcoded path checking for rpmbuild in

     

       
5
       
5
       
-
       
 bdist_rpm.py (GH-10594) (cherry picked from commit

     

       
6
       
6
       
-
       
 45a14942c969ed508b35abd5e116cb18f84ce5b4)

     

       
7
       
7
       
-
       


     

       
8
       
8
       
-
       
Co-authored-by: Marcin Niemira <marcin.niemira@gmail.com>

     

       
9
       
9
       
-
       
---

     

       
10
       
10
       
-
       
 Lib/distutils/command/bdist_rpm.py                           | 5 +----

     

       
11
       
11
       
-
       
 .../next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst    | 1 +

     

       
12
       
12
       
-
       
 2 files changed, 2 insertions(+), 4 deletions(-)

     

       
13
       
13
       
-
       
 create mode 100644 Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst

     

       
14
       
14
       
-
       


     

       
15
       
15
       
-
       
diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py

     

       
16
       
16
       
-
       
index 20ca7ac6dcffa..74381cc69a6ce 100644

     

       
17
       
17
       
-
       
--- a/Lib/distutils/command/bdist_rpm.py

     

       
18
       
18
       
-
       
+++ b/Lib/distutils/command/bdist_rpm.py

     

       
19
       
19
       
-
       
@@ -309,10 +309,7 @@ def run(self):

     

       
20
       
20
       
-
       
 

     

       
21
       
21
       
-
       
         # build package

     

       
22
       
22
       
-
       
         log.info("building RPMs")

     

       
23
       
23
       
-
       
-        rpm_cmd = ['rpm']

     

       
24
       
24
       
-
       
-        if os.path.exists('/usr/bin/rpmbuild') or \

     

       
25
       
25
       
-
       
-           os.path.exists('/bin/rpmbuild'):

     

       
26
       
26
       
-
       
-            rpm_cmd = ['rpmbuild']

     

       
27
       
27
       
-
       
+        rpm_cmd = ['rpmbuild']

     

       
28
       
28
       
-
       
 

     

       
29
       
29
       
-
       
         if self.source_only: # what kind of RPMs?

     

       
30
       
30
       
-
       
             rpm_cmd.append('-bs')

     

···

       
1
       
1
       
-
       
From ba458f33f335b217d078fdce56e9c6f9f93adb49 Mon Sep 17 00:00:00 2001

     

       
2
       
2
       
-
       
From: Frederik Rietdijk <fridh@fridh.nl>

     

       
3
       
3
       
-
       
Date: Mon, 28 Aug 2017 09:24:06 +0200

     

       
4
       
4
       
-
       
Subject: [PATCH] Don't use ldconfig

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
---

     

       
7
       
7
       
-
       
 Lib/ctypes/util.py | 78 ++--------------------------------------------

     

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

     

       
9
       
9
       
-
       


     

       
10
       
10
       
-
       
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py

     

       
11
       
11
       
-
       
index 0c2510e..79635a8 100644

     

       
12
       
12
       
-
       
--- a/Lib/ctypes/util.py

     

       
13
       
13
       
-
       
+++ b/Lib/ctypes/util.py

     

       
14
       
14
       
-
       
@@ -100,54 +100,7 @@ elif os.name == "posix":

     

       
15
       
15
       
-
       
             return thefile.read(4) == elf_header

     

       
16
       
16
       
-
       
 

     

       
17
       
17
       
-
       
     def _findLib_gcc(name):

     

       
18
       
18
       
-
       
-        # Run GCC's linker with the -t (aka --trace) option and examine the

     

       
19
       
19
       
-
       
-        # library name it prints out. The GCC command will fail because we

     

       
20
       
20
       
-
       
-        # haven't supplied a proper program with main(), but that does not

     

       
21
       
21
       
-
       
-        # matter.

     

       
22
       
22
       
-
       
-        expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))

     

       
23
       
23
       
-
       
-

     

       
24
       
24
       
-
       
-        c_compiler = shutil.which('gcc')

     

       
25
       
25
       
-
       
-        if not c_compiler:

     

       
26
       
26
       
-
       
-            c_compiler = shutil.which('cc')

     

       
27
       
27
       
-
       
-        if not c_compiler:

     

       
28
       
28
       
-
       
-            # No C compiler available, give up

     

       
29
       
29
       
-
       
-            return None

     

       
30
       
30
       
-
       
-

     

       
31
       
31
       
-
       
-        temp = tempfile.NamedTemporaryFile()

     

       
32
       
32
       
-
       
-        try:

     

       
33
       
33
       
-
       
-            args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]

     

       
34
       
34
       
-
       
-

     

       
35
       
35
       
-
       
-            env = dict(os.environ)

     

       
36
       
36
       
-
       
-            env['LC_ALL'] = 'C'

     

       
37
       
37
       
-
       
-            env['LANG'] = 'C'

     

       
38
       
38
       
-
       
-            try:

     

       
39
       
39
       
-
       
-                proc = subprocess.Popen(args,

     

       
40
       
40
       
-
       
-                                        stdout=subprocess.PIPE,

     

       
41
       
41
       
-
       
-                                        stderr=subprocess.STDOUT,

     

       
42
       
42
       
-
       
-                                        env=env)

     

       
43
       
43
       
-
       
-            except OSError:  # E.g. bad executable

     

       
44
       
44
       
-
       
-                return None

     

       
45
       
45
       
-
       
-            with proc:

     

       
46
       
46
       
-
       
-                trace = proc.stdout.read()

     

       
47
       
47
       
-
       
-        finally:

     

       
48
       
48
       
-
       
-            try:

     

       
49
       
49
       
-
       
-                temp.close()

     

       
50
       
50
       
-
       
-            except FileNotFoundError:

     

       
51
       
51
       
-
       
-                # Raised if the file was already removed, which is the normal

     

       
52
       
52
       
-
       
-                # behaviour of GCC if linking fails

     

       
53
       
53
       
-
       
-                pass

     

       
54
       
54
       
-
       
-        res = re.findall(expr, trace)

     

       
55
       
55
       
-
       
-        if not res:

     

       
56
       
56
       
-
       
-            return None

     

       
57
       
57
       
-
       
-

     

       
58
       
58
       
-
       
-        for file in res:

     

       
59
       
59
       
-
       
-            # Check if the given file is an elf file: gcc can report

     

       
60
       
60
       
-
       
-            # some files that are linker scripts and not actual

     

       
61
       
61
       
-
       
-            # shared objects. See bpo-41976 for more details

     

       
62
       
62
       
-
       
-            if not _is_elf(file):

     

       
63
       
63
       
-
       
-                continue

     

       
64
       
64
       
-
       
-            return os.fsdecode(file)

     

       
65
       
65
       
-
       
-

     

       
66
       
66
       
-
       
+        return None

     

       
67
       
67
       
-
       
 

     

       
68
       
68
       
-
       
     if sys.platform == "sunos5":

     

       
69
       
69
       
-
       
         # use /usr/ccs/bin/dump on solaris

     

       
70
       
70
       
-
       
@@ -268,34 +221,7 @@ elif os.name == "posix":

     

       
71
       
71
       
-
       
     else:

     

       
72
       
72
       
-
       
 

     

       
73
       
73
       
-
       
         def _findSoname_ldconfig(name):

     

       
74
       
74
       
-
       
-            import struct

     

       
75
       
75
       
-
       
-            if struct.calcsize('l') == 4:

     

       
76
       
76
       
-
       
-                machine = os.uname().machine + '-32'

     

       
77
       
77
       
-
       
-            else:

     

       
78
       
78
       
-
       
-                machine = os.uname().machine + '-64'

     

       
79
       
79
       
-
       
-            mach_map = {

     

       
80
       
80
       
-
       
-                'x86_64-64': 'libc6,x86-64',

     

       
81
       
81
       
-
       
-                'ppc64-64': 'libc6,64bit',

     

       
82
       
82
       
-
       
-                'sparc64-64': 'libc6,64bit',

     

       
83
       
83
       
-
       
-                's390x-64': 'libc6,64bit',

     

       
84
       
84
       
-
       
-                'ia64-64': 'libc6,IA-64',

     

       
85
       
85
       
-
       
-                }

     

       
86
       
86
       
-
       
-            abi_type = mach_map.get(machine, 'libc6')

     

       
87
       
87
       
-
       
-

     

       
88
       
88
       
-
       
-            # XXX assuming GLIBC's ldconfig (with option -p)

     

       
89
       
89
       
-
       
-            regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'

     

       
90
       
90
       
-
       
-            regex = os.fsencode(regex % (re.escape(name), abi_type))

     

       
91
       
91
       
-
       
-            try:

     

       
92
       
92
       
-
       
-                with subprocess.Popen(['/sbin/ldconfig', '-p'],

     

       
93
       
93
       
-
       
-                                      stdin=subprocess.DEVNULL,

     

       
94
       
94
       
-
       
-                                      stderr=subprocess.DEVNULL,

     

       
95
       
95
       
-
       
-                                      stdout=subprocess.PIPE,

     

       
96
       
96
       
-
       
-                                      env={'LC_ALL': 'C', 'LANG': 'C'}) as p:

     

       
97
       
97
       
-
       
-                    res = re.search(regex, p.stdout.read())

     

       
98
       
98
       
-
       
-                    if res:

     

       
99
       
99
       
-
       
-                        return os.fsdecode(res.group(1))

     

       
100
       
100
       
-
       
-            except OSError:

     

       
101
       
101
       
-
       
-                pass

     

       
102
       
102
       
-
       
+            return None

     

       
103
       
103
       
-
       
 

     

       
104
       
104
       
-
       
         def _findLib_ld(name):

     

       
105
       
105
       
-
       
             # See issue #9998 for why this is needed

     

       
106
       
106
       
-
       
-- 

     

       
107
       
107
       
-
       
2.30.0

     

       
108
       
108
       
-
       


     

···

       
1
       
1
       
-
       
Backport from CPython 3.8 of a good list of tests to run for PGO.

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
Upstream commit:

     

       
4
       
4
       
-
       
  https://github.com/python/cpython/commit/4e16a4a31

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
Upstream discussion:

     

       
7
       
7
       
-
       
  https://bugs.python.org/issue36044

     

       
8
       
8
       
-
       


     

       
9
       
9
       
-
       
diff --git a/Makefile.pre.in b/Makefile.pre.in

     

       
10
       
10
       
-
       
index 00fdd21ce..713dc1e53 100644

     

       
11
       
11
       
-
       
--- a/Makefile.pre.in

     

       
12
       
12
       
-
       
+++ b/Makefile.pre.in

     

       
13
       
13
       
-
       
@@ -259,7 +259,7 @@ TCLTK_LIBS=

     

       
14
       
14
       
-
       
 # The task to run while instrumented when building the profile-opt target.

     

       
15
       
15
       
-
       
 # We exclude unittests with -x that take a rediculious amount of time to

     

       
16
       
16
       
-
       
 # run in the instrumented training build or do not provide much value.

     

       
17
       
17
       
-
       
-PROFILE_TASK=-m test.regrtest --pgo

     

       
18
       
18
       
-
       
+PROFILE_TASK=-m test.regrtest --pgo test_array test_base64 test_binascii test_binop test_bisect test_bytes test_bz2 test_cmath test_codecs test_collections test_complex test_dataclasses test_datetime test_decimal test_difflib test_embed test_float test_fstring test_functools test_generators test_hashlib test_heapq test_int test_itertools test_json test_long test_lzma test_math test_memoryview test_operator test_ordered_dict test_pickle test_pprint test_re test_set test_sqlite test_statistics test_struct test_tabnanny test_time test_unicode test_xml_etree test_xml_etree_c

     

       
19
       
19
       
-
       
 

     

       
20
       
20
       
-
       
 # report files for gcov / lcov coverage report

     

       
21
       
21
       
-
       
 COVERAGE_INFO= $(abs_builddir)/coverage.info

     

···

       
240
       
240
       
 
       
  ] ++ optionals mimetypesSupport [

     

       
241
       
241
       
 
       
    # Make the mimetypes module refer to the right file

     

       
242
       
242
       
 
       
    ./mimetypes.patch

     

       
243
       
243
       
-
       
  ] ++ optionals isPy37 [

     

       
244
       
244
       
-
       
    # Backport a fix for discovering `rpmbuild` command when doing `python setup.py bdist_rpm` to 3.5, 3.6, 3.7.

     

       
245
       
245
       
-
       
    # See: https://bugs.python.org/issue11122

     

       
246
       
246
       
-
       
    ./3.7/fix-hardcoded-path-checking-for-rpmbuild.patch

     

       
247
       
247
       
-
       
    # The workaround is for unittests on Win64, which we don't support.

     

       
248
       
248
       
-
       
    # It does break aarch64-darwin, which we do support. See:

     

       
249
       
249
       
-
       
    # * https://bugs.python.org/issue35523

     

       
250
       
250
       
-
       
    # * https://github.com/python/cpython/commit/e6b247c8e524

     

       
251
       
251
       
-
       
    ./3.7/no-win64-workaround.patch

     

       
252
       
243
       
 
       
  ] ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.11") [

     

       
253
       
244
       
 
       
    # Fix darwin build https://bugs.python.org/issue34027

     

       
254
       
245
       
 
       
    ./3.7/darwin-libutil.patch

     

       
255
       
246
       
 
       
  ] ++ optionals (pythonAtLeast "3.11") [

     

       
256
       
247
       
 
       
    ./3.11/darwin-libutil.patch

     

       
257
       
257
       
-
       
  ] ++ optionals (pythonOlder "3.8") [

     

       
258
       
258
       
-
       
    # Backport from CPython 3.8 of a good list of tests to run for PGO.

     

       
259
       
259
       
-
       
    ./3.7/profile-task.patch

     

       
260
       
248
       
 
       
  ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.isDarwin) [

     

       
261
       
249
       
 
       
    # Stop checking for TCL/TK in global macOS locations

     

       
262
       
250
       
 
       
    ./3.9/darwin-tcl-tk.patch

     

···

       
151
       
151
       
 
       
    inherit passthruFun;

     

       
152
       
152
       
 
       
  };

     

       
153
       
153
       
 
       


     

       
154
       
154
       
-
       
  python37 = callPackage ./cpython {

     

       
155
       
155
       
-
       
    self = __splicedPackages.python37;

     

       
156
       
156
       
-
       
    sourceVersion = {

     

       
157
       
157
       
-
       
      major = "3";

     

       
158
       
158
       
-
       
      minor = "7";

     

       
159
       
159
       
-
       
      patch = "16";

     

       
160
       
160
       
-
       
      suffix = "";

     

       
161
       
161
       
-
       
    };

     

       
162
       
162
       
-
       
    sha256 = "sha256-gzjwwiIthH6QTJVTaRVdwb7u7YBujV7wSwDvR4cji/0=";

     

       
163
       
163
       
-
       
    inherit (darwin) configd;

     

       
164
       
164
       
-
       
    inherit passthruFun;

     

       
165
       
165
       
-
       
  };

     

       
166
       
166
       
-
       


     

       
167
       
154
       
 
       
  python38 = callPackage ./cpython {

     

       
168
       
155
       
 
       
    self = __splicedPackages.python38;

     

       
169
       
156
       
 
       
    sourceVersion = {

     

···

       
16279
       
16279
       
 
       
    bluezSupport = true;

     

       
16280
       
16280
       
 
       
    x11Support = true;

     

       
16281
       
16281
       
 
       
  };

     

       
16282
       
16282
       
-
       
  python37Full = python37.override {

     

       
16283
       
16283
       
-
       
    self = python37Full;

     

       
16284
       
16284
       
-
       
    pythonAttr = "python37Full";

     

       
16285
       
16285
       
-
       
    bluezSupport = true;

     

       
16286
       
16286
       
-
       
    x11Support = true;

     

       
16287
       
16287
       
-
       
  };

     

       
16288
       
16282
       
 
       
  python38Full = python38.override {

     

       
16289
       
16283
       
 
       
    self = python38Full;

     

       
16290
       
16284
       
 
       
    pythonAttr = "python38Full";

     
···

       
16311
       
16305
       
 
       
  };

     

       
16312
       
16306
       
 
       


     

       
16313
       
16307
       
 
       
  pythonInterpreters = callPackage ./../development/interpreters/python { };

     

       
16314
       
16314
       
-
       
  inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy39 pypy38 pypy37 rustpython;

     

       
16308
       
16308
       
+
       
  inherit (pythonInterpreters) python27 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy39 pypy38 pypy37 rustpython;

     

       
16315
       
16309
       
 
       


     

       
16316
       
16310
       
 
       
  # List of extensions with overrides to apply to all Python package sets.

     

       
16317
       
16311
       
 
       
  pythonPackagesExtensions = [ ];

     

       
16318
       
16312
       
 
       
  # Python package sets.

     

       
16319
       
16313
       
 
       
  python27Packages = python27.pkgs;

     

       
16320
       
16320
       
-
       
  python37Packages = python37.pkgs;

     

       
16321
       
16314
       
 
       
  python38Packages = python38.pkgs;

     

       
16322
       
16315
       
 
       
  python39Packages = python39.pkgs;

     

       
16323
       
16316
       
 
       
  python310Packages = recurseIntoAttrs python310.pkgs;