Merge pull request #208232 from NixOS/python-updates

NixOS · Jan 5, 2023 · 482a59b · 482a59b
2 parents 4acd5a9 + ea3e3d0
commit 482a59b
Show file tree

Hide file tree

Showing 684 changed files with 5,263 additions and 2,498 deletions.
diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix
@@ -6,21 +6,16 @@
 
 let chia = python3Packages.buildPythonApplication rec {
   pname = "chia";
-  version = "1.6.0";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "Chia-Network";
     repo = "chia-blockchain";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-TNaHPvN19fkRqkQHtqdeEDwhqbntcVhxXhY8TNIScEg=";
+    hash = "sha256-BgUgTYpjFsKisfFni8TzSYQ8+S3P+7m78DuyjWF5xh8=";
   };
 
-  patches = [
-    # chia tries to put lock files in the python modules directory
-    ./dont_lock_in_store.patch
-  ];
-
   postPatch = ''
     substituteInPlace setup.py \
       --replace "==" ">="
@@ -59,6 +54,7 @@ let chia = python3Packages.buildPythonApplication rec {
     fasteners
     filelock
     keyrings-cryptfile
+    psutil
     pyyaml
     setproctitle
     setuptools # needs pkg_resources at runtime

diff --git a/pkgs/applications/blockchains/chia/dont_lock_in_store.patch b/pkgs/applications/blockchains/chia/dont_lock_in_store.patch
diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix
@@ -20,7 +20,7 @@ in
 rec {
   launcher = runCommand "octave-kernel-launcher" {
     inherit octave;
-    python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel ps.metakernel kernel ]);
+    python = python3.withPackages (ps: [ ps.traitlets ps.jupyter-core ps.ipykernel ps.metakernel kernel ]);
     nativeBuildInputs = [ makeWrapper ];
   } ''
     mkdir -p $out/bin

diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
@@ -49,7 +49,7 @@
 , boost
 , singular
 , pip
-, jupyter_core
+, jupyter-core
 , sage-setup
 , libhomfly
 , libbraiding
@@ -87,7 +87,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     iml
     perl
-    jupyter_core
+    jupyter-core
     pkg-config
     sage-setup
     pip # needed to query installed packages

diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix
@@ -1,7 +1,7 @@
 { lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal,
   git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg,
   libpng, libtiff, libxcrypt, openscenegraph , proj, python3,
-  python37Packages, stdenv, swig, xercesc, xorg, zlib }:
+  python3Packages, stdenv, swig, xercesc, xorg, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "sumo";
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     libxcrypt
     openscenegraph
     proj
-    python37Packages.setuptools
+    python3Packages.setuptools
     xercesc
     zlib
     python3

diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix
@@ -7,6 +7,7 @@
 , lib
 , packaging
 , poetry-core
+, py
 , pytest-freezegun
 , pytest-mock
 , pytest-regressions
@@ -29,14 +30,19 @@ buildPythonApplication rec {
     owner = "commitizen-tools";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Fri5WdLfDCn3NOtCGneKnAN+eOkLAJgPYBR+WBmc/bo=";
+    hash = "sha256-W+k+hqH0TKQAXf1Em6A1/VdqzJkhYp99I3lbqH6iDDc=";
     deepClone = true;
   };
 
   format = "pyproject";
 
   nativeBuildInputs = [ poetry-core ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"'
+  '';
+
   propagatedBuildInputs = [
     termcolor
     questionary
@@ -54,6 +60,7 @@ buildPythonApplication rec {
 
   checkInputs = [
     pre-commit
+    py
     pytestCheckHook
     pytest-freezegun
     pytest-mock
@@ -81,6 +88,8 @@ buildPythonApplication rec {
     "test_bump_pre_commit_changelog"
     "test_bump_pre_commit_changelog_fails_always"
     "test_get_commits_with_signature"
+    # fatal: not a git repository (or any of the parent directories): .git
+    "test_commitizen_debug_excepthook"
   ];
 
   passthru.updateScript = nix-update-script { };

diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix
@@ -13,7 +13,7 @@ let
           owner = "jstasiak";
           repo = "python-zeroconf";
           rev = version;
-          sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj";
+          hash = "sha256-8pYbIkPsg16VelwqpYSzqfAJaCU37lun+XZ/crzCDZU=";
         };
       });
 
@@ -29,7 +29,7 @@ let
         version = "9.2.0";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "02ig2wf2yyrnnl88r2n13s1naskwsifwgx3syifmcxygflsmjd3d";
+          hash = "sha256-bTRZNXXPd1Zd9Hr0x13UfGplgx7BiowQtTZ7LxwXLwo=";
         };
       });
     };

diff --git a/pkgs/common-updater/scripts/mark-broken b/pkgs/common-updater/scripts/mark-broken
@@ -48,7 +48,6 @@ denyFileList=(
 # to be conditionally disabled
 denyAttrList=(
         python27Packages
-        python37Packages
         linuxPackages_
         rubyPackages_
 )

diff --git a/...evelopment/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch b/...evelopment/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch
diff --git a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch
diff --git a/pkgs/development/interpreters/python/cpython/3.7/profile-task.patch b/pkgs/development/interpreters/python/cpython/3.7/profile-task.patch
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
@@ -240,23 +240,11 @@ in with passthru; stdenv.mkDerivation {
   ] ++ optionals mimetypesSupport [
     # Make the mimetypes module refer to the right file
     ./mimetypes.patch
-  ] ++ optionals isPy37 [
-    # Backport a fix for discovering `rpmbuild` command when doing `python setup.py bdist_rpm` to 3.5, 3.6, 3.7.
-    # See: https://bugs.python.org/issue11122
-    ./3.7/fix-hardcoded-path-checking-for-rpmbuild.patch
-    # The workaround is for unittests on Win64, which we don't support.
-    # It does break aarch64-darwin, which we do support. See:
-    # * https://bugs.python.org/issue35523
-    # * https://github.com/python/cpython/commit/e6b247c8e524
-    ./3.7/no-win64-workaround.patch
   ] ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.11") [
     # Fix darwin build https://bugs.python.org/issue34027
     ./3.7/darwin-libutil.patch
   ] ++ optionals (pythonAtLeast "3.11") [
     ./3.11/darwin-libutil.patch
-  ] ++ optionals (pythonOlder "3.8") [
-    # Backport from CPython 3.8 of a good list of tests to run for PGO.
-    ./3.7/profile-task.patch
   ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.isDarwin) [
     # Stop checking for TCL/TK in global macOS locations
     ./3.9/darwin-tcl-tk.patch

diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
@@ -151,19 +151,6 @@ in {
     inherit passthruFun;
   };
 
-  python37 = callPackage ./cpython {
-    self = __splicedPackages.python37;
-    sourceVersion = {
-      major = "3";
-      minor = "7";
-      patch = "16";
-      suffix = "";
-    };
-    sha256 = "sha256-gzjwwiIthH6QTJVTaRVdwb7u7YBujV7wSwDvR4cji/0=";
-    inherit (darwin) configd;
-    inherit passthruFun;
-  };
-
   python38 = callPackage ./cpython {
     self = __splicedPackages.python38;
     sourceVersion = {

diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix
@@ -1,6 +1,6 @@
 { callPackage, abseil-cpp, ... }:
 
 callPackage ./generic-v3-cmake.nix {
-  version = "3.21.8";
-  sha256 = "sha256-cSNHX18CvMmydpYWqfe6WWk9rGxIlFfY/85rfSyznU4=";
+  version = "3.21.12";
+  sha256 = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU=";
 }