From 8b4b44954318c3be178ffffd15c5c86dff005f18 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Wed, 26 Oct 2022 22:16:06 +0200 Subject: [PATCH] datalad: use default Python version --- pkgs/development/python-modules/boto/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix index 3dbe709cb796..9d0248003778 100644 --- a/pkgs/development/python-modules/boto/default.nix +++ b/pkgs/development/python-modules/boto/default.nix @@ -24,6 +24,9 @@ buildPythonPackage rec { ./bug-953970_python3.8-compat.patch ]; + # boto is deprecated by upstream as of 2021-05-27 (https://github.com/boto/boto/commit/4980ac58764c3d401cb0b9552101f9c61c18f445) + # this patch is a bit simpler than https://github.com/boto/boto/pull/3898 + # as we don't have to take care of pythonOlder "3.3". postPatch = '' substituteInPlace boto/dynamodb/types.py --replace 'from collections import Mapping' 'from collections.abc import Mapping' substituteInPlace boto/mws/connection.py --replace 'import collections' 'import collections.abc as collections' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87a6dfbb5d22..71d86e1a69a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -450,9 +450,7 @@ with pkgs; databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { }; - datalad = callPackage ../applications/version-management/datalad { - python3 = python39; # `boto` currently broken with Python3.10 - }; + datalad = callPackage ../applications/version-management/datalad { }; dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { };