Merge staging-next into staging

pkgs/development/python-modules/babel/default.nix

@@ -1,20 +1,8 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pythonAtLeast
-, pythonOlder
-
-# tests
-, freezegun
-, pytestCheckHook
-, pytz
-}:
+{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, pytz, pytestCheckHook, freezegun }:
 
 buildPythonPackage rec {
   pname = "babel";
   version = "2.12.1";
-  format = "setuptools";
-
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
@@ -23,30 +11,12 @@ buildPythonPackage rec {
     hash = "sha256-zC2ZmZzQHURCCuclohyeNxGzqtx5dtYUf2IthYGWNFU=";
   };
 
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [
-    pytz
-  ];
+  propagatedBuildInputs = lib.optional (pythonOlder "3.9") pytz;
 
-  # including backports.zoneinfo for python<3.9 yields infinite recursion
-  doCheck = pythonAtLeast "3.9";
-
-  nativeCheckInputs = [
-    # via setup.py
-    freezegun
-    pytestCheckHook
-    # via tox.ini
-    pytz
-  ];
-
-  disabledTests = [
-    # fails on days switching from and to daylight saving time in EST
-    # https://github.com/python-babel/babel/issues/988
-    "test_format_time"
-  ];
+  nativeCheckInputs = [ pytestCheckHook freezegun ];
 
   meta = with lib; {
     homepage = "https://babel.pocoo.org/";
-    changelog = "https://github.com/python-babel/babel/releases/tag/v${version}";
     description = "Collection of internationalizing tools";
     license = licenses.bsd3;
     maintainers = with maintainers; [ SuperSandro2000 ];