Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

pypy{27,310}: 7.3.17 -> 7.3.19, pypy311: init at 7.3.19

+153 -20
+49 -14
pkgs/development/interpreters/python/default.nix
··· 138 sourceVersion = { 139 major = "7"; 140 minor = "3"; 141 - patch = "17"; 142 }; 143 144 - hash = "sha256-UOBoQPS73pFEgICkEYBoqJuPvK4l/42h4rsUAtyaA0Y="; 145 pythonVersion = "2.7"; 146 db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; }; 147 python = __splicedPackages.pythonInterpreters.pypy27_prebuilt; ··· 153 sourceVersion = { 154 major = "7"; 155 minor = "3"; 156 - patch = "17"; 157 }; 158 159 - hash = "sha256-atdLxXjpxtOoocUVAzEwWOPFjDXfhvdIVFPEvmqyS/c="; 160 pythonVersion = "3.10"; 161 db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; }; 162 python = __splicedPackages.pypy27; 163 inherit passthruFun; 164 }; 165 166 pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix { 167 # Not included at top-level 168 self = __splicedPackages.pythonInterpreters.pypy27_prebuilt; 169 sourceVersion = { 170 major = "7"; 171 minor = "3"; 172 - patch = "17"; 173 }; 174 175 hash = 176 { 177 - aarch64-linux = "sha256-qN9c4WUPR1aTP4eAhwyRoKQOfJhw10YpvyQTkry1wuM="; 178 - x86_64-linux = "sha256-nzSX+HszctF+RHNp4AFqS+yZprTSpZq6d0olv+Q1NHQ="; 179 - aarch64-darwin = "sha256-gCJIc5sqzIwb5tlH8Zsy/A44wI4xKzXAXMf7IvEHCeQ="; 180 - x86_64-darwin = "sha256-gtRgQhRmyBraSh2Z3y3xuLNTQbOXyF///lGkwwItCDM="; 181 } 182 .${stdenv.system}; 183 pythonVersion = "2.7"; ··· 190 sourceVersion = { 191 major = "7"; 192 minor = "3"; 193 - patch = "17"; 194 }; 195 hash = 196 { 197 - aarch64-linux = "sha256-v79JVJirwv53G2C/ZOXDwHLgr7z8pprHKCxP9Dd/9BY="; 198 - x86_64-linux = "sha256-NA2kGWYGsiRQmhuLMa/SAYE/CCYB3xicE46QXB1g4K8="; 199 - aarch64-darwin = "sha256-KPKf/JxcyQbo6QgT/BRPA34js4TwUuGE4kIzL3tgqwY="; 200 - x86_64-darwin = "sha256-I/8mS3PlvFt8OhufrHdosj35bH1mDLZBLxxSNSGjNL8="; 201 } 202 .${stdenv.system}; 203 pythonVersion = "3.10"; 204 inherit passthruFun; 205 }; 206 }
··· 138 sourceVersion = { 139 major = "7"; 140 minor = "3"; 141 + patch = "19"; 142 }; 143 144 + hash = "sha256-hwPNywH5+Clm3UO2pgGPFAOZ21HrtDwSXB+aIV57sAM="; 145 pythonVersion = "2.7"; 146 db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; }; 147 python = __splicedPackages.pythonInterpreters.pypy27_prebuilt; ··· 153 sourceVersion = { 154 major = "7"; 155 minor = "3"; 156 + patch = "19"; 157 }; 158 159 + hash = "sha256-p8IpMLkY9Ahwhl7Yp0FH9ENO+E09bKKzweupNV1JKcg="; 160 pythonVersion = "3.10"; 161 db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; }; 162 python = __splicedPackages.pypy27; 163 inherit passthruFun; 164 }; 165 166 + pypy311 = callPackage ./pypy { 167 + self = __splicedPackages.pypy311; 168 + sourceVersion = { 169 + major = "7"; 170 + minor = "3"; 171 + patch = "19"; 172 + }; 173 + 174 + hash = "sha256-SBfARLtGmjJ05gqjZFdw+B60+RZup/3E5sNRNFVUyNg="; 175 + pythonVersion = "3.11"; 176 + db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; }; 177 + python = __splicedPackages.pypy27; 178 + inherit passthruFun; 179 + }; 180 + 181 pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix { 182 # Not included at top-level 183 self = __splicedPackages.pythonInterpreters.pypy27_prebuilt; 184 sourceVersion = { 185 major = "7"; 186 minor = "3"; 187 + patch = "19"; 188 }; 189 190 hash = 191 { 192 + aarch64-linux = "sha256-/onU/UrxP3bf5zFZdQA1GM8XZSDjzOwVRKiNF09QkQ4="; 193 + x86_64-linux = "sha256-04RFUIwurxTrs4DZwd7TIcXr6uMcfmaAAXPYPLjd9CM="; 194 + aarch64-darwin = "sha256-KHgOC5CK1ttLTglvQjcSS+eezJcxlG2EDZyHSetnp1k="; 195 + x86_64-darwin = "sha256-a+KNRI2OZP/8WG2bCuTQkGSoPMrrW4BgxlHFzZrgaHg="; 196 } 197 .${stdenv.system}; 198 pythonVersion = "2.7"; ··· 205 sourceVersion = { 206 major = "7"; 207 minor = "3"; 208 + patch = "19"; 209 }; 210 hash = 211 { 212 + aarch64-linux = "sha256-ryeliRePERmOIkSrZcpRBjC6l8Ex18zEAh61vFjef1c="; 213 + x86_64-linux = "sha256-xzrCzCOArJIn/Sl0gr8qPheoBhi6Rtt1RNU1UVMh7B4="; 214 + aarch64-darwin = "sha256-PbigP8SWFkgBZGhE1/OxK6oK2zrZoLfLEkUhvC4WijY="; 215 + x86_64-darwin = "sha256-LF5cKjOsiCVR1/KLmNGdSGuJlapQgkpztO3Mau7DXGM="; 216 } 217 .${stdenv.system}; 218 pythonVersion = "3.10"; 219 + inherit passthruFun; 220 + }; 221 + 222 + pypy311_prebuilt = callPackage ./pypy/prebuilt.nix { 223 + # Not included at top-level 224 + self = __splicedPackages.pythonInterpreters.pypy311_prebuilt; 225 + sourceVersion = { 226 + major = "7"; 227 + minor = "3"; 228 + patch = "19"; 229 + }; 230 + hash = 231 + { 232 + aarch64-linux = "sha256-EyB9v4HOJOltp2CxuGNie3e7ILH7TJUZHgKgtyOD33Q="; 233 + x86_64-linux = "sha256-kXfZ4LuRsF+SHGQssP9xoPNlO10ppC1A1qB4wVt1cg8="; 234 + aarch64-darwin = "sha256-dwTg1TAuU5INMtz+mv7rEENtTJQjPogwz2A6qVWoYcE="; 235 + x86_64-darwin = "sha256-okOfnTDf2ulqXpEBx9xUqKaLVsnXMU6jmbCiXT6H67I="; 236 + } 237 + .${stdenv.system}; 238 + pythonVersion = "3.11"; 239 inherit passthruFun; 240 }; 241 }
+101 -4
pkgs/development/interpreters/python/pypy/default.nix
··· 121 dontPatchShebangs = true; 122 disallowedReferences = [ python ]; 123 124 C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" buildInputs; 125 LIBRARY_PATH = lib.makeLibraryPath buildInputs; 126 LD_LIBRARY_PATH = lib.makeLibraryPath ( ··· 192 mkdir -p $out/${executable}-c/pypy/bin 193 mv $out/bin/${executable} $out/${executable}-c/pypy/bin/${executable} 194 ln -s $out/${executable}-c/pypy/bin/${executable} $out/bin/${executable} 195 ''; 196 197 setupHook = python-setup-hook sitePackages; 198 199 - # TODO: A bunch of tests are failing as of 7.1.1, please feel free to 200 - # fix and re-enable if you have the patience and tenacity. 201 - doCheck = false; 202 checkPhase = 203 let 204 disabledTests = ··· 213 "test_urllib2net" 214 "test_urllibnet" 215 "test_urllib2_localnet" 216 ] 217 ++ lib.optionals isPy3k [ 218 # disable asyncio due to https://github.com/NixOS/nix/issues/1238 ··· 226 # disable __all__ because of spurious imp/importlib warning and 227 # warning-to-error test policy 228 "test___all__" 229 ]; 230 in 231 '' ··· 264 265 meta = with lib; { 266 homepage = "https://www.pypy.org/"; 267 description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; 268 mainProgram = "pypy"; 269 license = licenses.mit; ··· 274 "x86_64-darwin" 275 ]; 276 broken = optimizationLevel == "0"; # generates invalid code 277 - maintainers = with maintainers; [ andersk ]; 278 }; 279 }
··· 121 dontPatchShebangs = true; 122 disallowedReferences = [ python ]; 123 124 + # fix compiler error in curses cffi module, where char* != const char* 125 + NIX_CFLAGS_COMPILE = 126 + if stdenv.cc.isClang then "-Wno-error=incompatible-function-pointer-types" else null; 127 C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" buildInputs; 128 LIBRARY_PATH = lib.makeLibraryPath buildInputs; 129 LD_LIBRARY_PATH = lib.makeLibraryPath ( ··· 195 mkdir -p $out/${executable}-c/pypy/bin 196 mv $out/bin/${executable} $out/${executable}-c/pypy/bin/${executable} 197 ln -s $out/${executable}-c/pypy/bin/${executable} $out/bin/${executable} 198 + '' 199 + # _testcapi is compiled dynamically, into the store. 200 + # This would fail if we don't do it here. 201 + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' 202 + pushd / 203 + $out/bin/${executable} -c "from test import support" 204 + popd 205 ''; 206 207 setupHook = python-setup-hook sitePackages; 208 209 + # TODO: Investigate why so many tests are failing. 210 checkPhase = 211 let 212 disabledTests = ··· 221 "test_urllib2net" 222 "test_urllibnet" 223 "test_urllib2_localnet" 224 + # test_subclass fails with "internal error" 225 + # test_load_default_certs_env fails for unknown reason 226 + "test_ssl" 227 ] 228 ++ lib.optionals isPy3k [ 229 # disable asyncio due to https://github.com/NixOS/nix/issues/1238 ··· 237 # disable __all__ because of spurious imp/importlib warning and 238 # warning-to-error test policy 239 "test___all__" 240 + # fail for multiple reasons, TODO: investigate 241 + "test__opcode" 242 + "test_ast" 243 + "test_audit" 244 + "test_builtin" 245 + "test_c_locale_coercion" 246 + "test_call" 247 + "test_class" 248 + "test_cmd_line" 249 + "test_cmd_line_script" 250 + "test_code" 251 + "test_code_module" 252 + "test_codeop" 253 + "test_compile" 254 + "test_coroutines" 255 + "test_cprofile" 256 + "test_ctypes" 257 + "test_embed" 258 + "test_exceptions" 259 + "test_extcall" 260 + "test_frame" 261 + "test_generators" 262 + "test_grammar" 263 + "test_idle" 264 + "test_iter" 265 + "test_itertools" 266 + "test_list" 267 + "test_marshal" 268 + "test_memoryio" 269 + "test_memoryview" 270 + "test_metaclass" 271 + "test_mmap" 272 + "test_multibytecodec" 273 + "test_opcache" 274 + "test_pdb" 275 + "test_peepholer" 276 + "test_positional_only_arg" 277 + "test_print" 278 + "test_property" 279 + "test_pyclbr" 280 + "test_range" 281 + "test_re" 282 + "test_readline" 283 + "test_regrtest" 284 + "test_repl" 285 + "test_rlcompleter" 286 + "test_signal" 287 + "test_sort" 288 + "test_source_encoding" 289 + "test_ssl" 290 + "test_string_literals" 291 + "test_structseq" 292 + "test_subprocess" 293 + "test_super" 294 + "test_support" 295 + "test_syntax" 296 + "test_sys" 297 + "test_sys_settrace" 298 + "test_tcl" 299 + "test_termios" 300 + "test_threading" 301 + "test_trace" 302 + "test_tty" 303 + "test_unpack_ex" 304 + "test_utf8_mode" 305 + "test_weakref" 306 + "test_capi" 307 + "test_concurrent_futures" 308 + "test_dataclasses" 309 + "test_doctest" 310 + "test_future_stmt" 311 + "test_importlib" 312 + "test_inspect" 313 + "test_pydoc" 314 + "test_warnings" 315 + ] 316 + ++ lib.optionals isPy310 [ 317 + "test_contextlib_async" 318 + "test_future" 319 + "test_lzma" 320 + "test_module" 321 + "test_typing" 322 ]; 323 in 324 '' ··· 357 358 meta = with lib; { 359 homepage = "https://www.pypy.org/"; 360 + changelog = "https://doc.pypy.org/en/stable/release-v${version}.html"; 361 description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; 362 mainProgram = "pypy"; 363 license = licenses.mit; ··· 368 "x86_64-darwin" 369 ]; 370 broken = optimizationLevel == "0"; # generates invalid code 371 + maintainers = with maintainers; [ 372 + andersk 373 + fliegendewurst 374 + ]; 375 }; 376 }
-1
pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
··· 100 mv -t $out bin include lib-python lib_pypy site-packages 101 mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ 102 ${lib.optionalString stdenv.hostPlatform.isLinux '' 103 - mv lib/libffi.so.6* $out/lib/ 104 rm $out/bin/*.debug 105 ''} 106
··· 100 mv -t $out bin include lib-python lib_pypy site-packages 101 mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ 102 ${lib.optionalString stdenv.hostPlatform.isLinux '' 103 rm $out/bin/*.debug 104 ''} 105
+3 -1
pkgs/top-level/all-packages.nix
··· 6580 6581 pypy = pypy2; 6582 pypy2 = pypy27; 6583 - pypy3 = pypy310; 6584 6585 # Python interpreter that is build with all modules, including tkinter. 6586 # These are for compatibility and should not be used inside Nixpkgs. ··· 6652 python3Minimal 6653 pypy27 6654 pypy310 6655 ; 6656 6657 # List of extensions with overrides to apply to all Python package sets. ··· 6669 pypy27Packages = pypy27.pkgs; 6670 pypy3Packages = pypy3.pkgs; 6671 pypy310Packages = pypy310.pkgs; 6672 6673 pythonManylinuxPackages = callPackage ./../development/interpreters/python/manylinux { }; 6674
··· 6580 6581 pypy = pypy2; 6582 pypy2 = pypy27; 6583 + pypy3 = pypy311; 6584 6585 # Python interpreter that is build with all modules, including tkinter. 6586 # These are for compatibility and should not be used inside Nixpkgs. ··· 6652 python3Minimal 6653 pypy27 6654 pypy310 6655 + pypy311 6656 ; 6657 6658 # List of extensions with overrides to apply to all Python package sets. ··· 6670 pypy27Packages = pypy27.pkgs; 6671 pypy3Packages = pypy3.pkgs; 6672 pypy310Packages = pypy310.pkgs; 6673 + pypy311Packages = pypy311.pkgs; 6674 6675 pythonManylinuxPackages = callPackage ./../development/interpreters/python/manylinux { }; 6676