|
19 | 19 | ); |
20 | 20 |
|
21 | 21 | devPostgresql = pkgs.postgresql_17.overrideAttrs (oldAttrs: {} // pkgs.lib.optionalAttrs debugBuild { dontStrip = true; }); # If debug symbols are needed. |
22 | | - devPython = pkgs.python313.withPackages (ps: (requiredPythonPackages ps)); |
| 22 | + devPython = pkgs.python311.withPackages (ps: (requiredPythonPackages ps)); |
23 | 23 |
|
24 | 24 | testPythonVersions = with pkgs; [ |
25 | 25 | # python39 # end of security support is scheduled for 2025-10-31; therefore nixpkgs support was dropped before nixos 25.05 was released |
26 | 26 | # python310 # error: sphinx-8.2.3 not supported for interpreter python3.10 |
27 | 27 | python311 |
28 | | - python312 |
29 | | - python313 |
| 28 | + # python312 # tests are currently broken where plpython3u is used -- https://github.com/pgsql-io/multicorn2/issues/60 |
| 29 | + # python313 # tests are currently broken where plpython3u is used -- https://github.com/pgsql-io/multicorn2/issues/60 |
30 | 30 | ]; |
31 | 31 | testPostgresVersions = with pkgs; [ |
32 | 32 | postgresql_13 |
33 | 33 | postgresql_14 |
34 | 34 | postgresql_15 |
35 | 35 | postgresql_16 |
36 | | - postgresql_17 |
| 36 | + # postgresql_17 |
37 | 37 | ]; |
38 | 38 | testVersionCombos = pkgs.lib.cartesianProduct { |
39 | 39 | python = testPythonVersions; |
|
123 | 123 |
|
124 | 124 | makeTestSuite = test_python: test_postgresql: |
125 | 125 | let |
126 | | - # "Build order", so to speak... |
| 126 | + # "# -> Build order", so to speak... structed to build up a PostgreSQL with a compatible Python interpreter that |
| 127 | + # is already configured to load the multicorn module. |
| 128 | + # |
127 | 129 | # 1. Multicorn python package first, using the "raw" Python & "raw" PostgreSQL |
| 130 | + multicornPython = (makeMulticornPythonPackage test_python test_postgresql); |
| 131 | + |
128 | 132 | # 2. Python enhanced w/ the multicorn package |
129 | | - # 3. PostgreSQL w/ plpython3, using "enhanced" Python |
130 | | - # 4. Multicorn postgresql extension, using the "enhanced" Python & plpython3 PostgreSQL |
131 | | - # 5. PostgreSQL w/ plpython3 + multicorn extension |
| 133 | + enhancedPython = (test_python.withPackages (ps: [multicornPython] ++ (requiredPythonPackages ps) )); |
132 | 134 |
|
133 | | - multicornPython = (makeMulticornPythonPackage test_python test_postgresql); |
134 | | - enhancedPython = (test_python.withPackages (ps: |
135 | | - [multicornPython] |
136 | | - ++ |
137 | | - (requiredPythonPackages ps) |
138 | | - )); |
| 135 | + # 3. PostgreSQL w/ plpython3, using "enhanced" Python |
139 | 136 | pythonEnabledPostgres = (makePostgresWithPlPython enhancedPython test_postgresql); |
| 137 | + |
| 138 | + # 4. Multicorn postgresql extension, using the "enhanced" Python & plpython3 PostgreSQL |
140 | 139 | multicornPostgresExtension = (makeMulticornPostgresExtension enhancedPython pythonEnabledPostgres); |
| 140 | + |
| 141 | + # 5. PostgreSQL w/ plpython3 + multicorn extension |
141 | 142 | postgresqlWithMulticorn = pythonEnabledPostgres.withPackages (ps: [ |
142 | 143 | pythonEnabledPostgres.plpython3 |
143 | 144 | multicornPostgresExtension |
|
0 commit comments