Merge branch 'master' into staging-next

2021-01-14 02:24:17 +01:00
parent 318e673af0 acc4bb890e
commit b813710c04
102 changed files with 2621 additions and 2559 deletions
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -216,7 +216,7 @@ in with passthru; stdenv.mkDerivation {
      else
        ./3.7/fix-finding-headers-when-cross-compiling.patch
    )
-  ] ++ optionals (isPy37) [
+  ] ++ optionals (isPy36 || isPy37) [
    # Backport a fix for ctypes.util.find_library.
    ./3.7/find_library.patch
  ];