Merge master into staging-next

8 files changed, 11 insertions, 200 deletions

diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix
index da7715b3e347..e75403f2e801 100644
--- a/pkgs/development/python-modules/approvaltests/default.nix
+++ b/pkgs/development/python-modules/approvaltests/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "approvaltests";
-  version = "14.5.0";
+  version = "14.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "approvals";
     repo = "ApprovalTests.Python";
     tag = "v${version}";
-    hash = "sha256-VWYl+8hS9XnvtqmokNntdKGHWSJVlGPomvAEwaBcjY8=";
+    hash = "sha256-hoBT83p2PHZR5NtVChdWK5SMjLt8llj59K5ODaKtRhQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/django-hierarkey/default.nix b/pkgs/development/python-modules/django-hierarkey/default.nix
index 86220923db7b..c802318fe3cf 100644
--- a/pkgs/development/python-modules/django-hierarkey/default.nix
+++ b/pkgs/development/python-modules/django-hierarkey/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "django-hierarkey";
-  version = "1.2.0";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "raphaelm";
     repo = "django-hierarkey";
     tag = version;
-    hash = "sha256-1LSH9GwoNF3NrDVNUIHDAVsktyKIprDgB5XlIHeM3fM=";
+    hash = "sha256-GkCNVovo2bDCp6m2GBvusXsaBhcmJkPNu97OdtsYROY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/django-phonenumber-field/default.nix b/pkgs/development/python-modules/django-phonenumber-field/default.nix
index 1890a3b70bc0..ca8d0552814c 100644
--- a/pkgs/development/python-modules/django-phonenumber-field/default.nix
+++ b/pkgs/development/python-modules/django-phonenumber-field/default.nix
@@ -9,22 +9,19 @@
   phonenumbers,
   phonenumberslite,
   python,
-  pythonOlder,
   setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "django-phonenumber-field";
-  version = "8.0.0";
+  version = "8.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "stefanfoulis";
     repo = "django-phonenumber-field";
     tag = version;
-    hash = "sha256-l+BAh7QYGN0AgDHICvlQnBYAcpEn8acu+JBmoo85kF0=";
+    hash = "sha256-KRi2rUx88NYoQhRChmNABP8KalMbf4HhWC8Wwnc/xB4=";
   };
 
   build-system = [ setuptools-scm ];
@@ -60,7 +57,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Django model and form field for normalised phone numbers using python-phonenumbers";
     homepage = "https://github.com/stefanfoulis/django-phonenumber-field/";
-    changelog = "https://github.com/stefanfoulis/django-phonenumber-field/releases/tag/${version}";
+    changelog = "https://github.com/stefanfoulis/django-phonenumber-field/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ sephi ];
   };
diff --git a/pkgs/development/python-modules/django/5_1.nix b/pkgs/development/python-modules/django/5_1.nix
index c872bd6f704a..741d75c86cd3 100644
--- a/pkgs/development/python-modules/django/5_1.nix
+++ b/pkgs/development/python-modules/django/5_1.nix
@@ -33,7 +33,6 @@
   pylibmc,
   pymemcache,
   python,
-  pywatchman,
   pyyaml,
   pytz,
   redis,
@@ -108,7 +107,6 @@ buildPythonPackage rec {
     pillow
     pylibmc
     pymemcache
-    pywatchman
     pyyaml
     pytz
     redis
@@ -117,11 +115,6 @@ buildPythonPackage rec {
     tzdata
   ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  doCheck =
-    !stdenv.hostPlatform.isDarwin
-    # pywatchman depends on folly which does not support 32bits
-    && !stdenv.hostPlatform.is32bit;
-
   preCheck = ''
     # make sure the installed library gets imported
     rm -rf django
diff --git a/pkgs/development/python-modules/django/5_2.nix b/pkgs/development/python-modules/django/5_2.nix
index 73a0a7b74fb5..e2f72a774e82 100644
--- a/pkgs/development/python-modules/django/5_2.nix
+++ b/pkgs/development/python-modules/django/5_2.nix
@@ -33,7 +33,6 @@
   pylibmc,
   pymemcache,
   python,
-  pywatchman,
   pyyaml,
   pytz,
   redis,
@@ -101,7 +100,6 @@ buildPythonPackage rec {
     pillow
     pylibmc
     pymemcache
-    pywatchman
     pyyaml
     pytz
     redis
@@ -110,11 +108,6 @@ buildPythonPackage rec {
     tzdata
   ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  doCheck =
-    !stdenv.hostPlatform.isDarwin
-    # pywatchman depends on folly which does not support 32bits
-    && !stdenv.hostPlatform.is32bit;
-
   preCheck = ''
     # make sure the installed library gets imported
     rm -rf django
@@ -132,7 +125,8 @@ buildPythonPackage rec {
     runHook preCheck
 
     pushd tests
-    ${python.interpreter} runtests.py --settings=test_sqlite
+    # without --parallel=1, tests fail with an "unexpected error due to a database lock" on Darwin
+    ${python.interpreter} runtests.py --settings=test_sqlite ${lib.optionalString stdenv.hostPlatform.isDarwin "--parallel=1"}
     popd
 
     runHook postCheck
diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix
index 5cad63057288..d86353c3eb04 100644
--- a/pkgs/development/python-modules/litellm/default.nix
+++ b/pkgs/development/python-modules/litellm/default.nix
@@ -46,7 +46,7 @@
 
 buildPythonPackage rec {
   pname = "litellm";
-  version = "1.69.0";
+  version = "1.72.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
     owner = "BerriAI";
     repo = "litellm";
     tag = "v${version}-stable";
-    hash = "sha256-W2uql9fKzwAmSgeLTuESguh+dVn+b3JNTeGlCc9NP2A=";
+    hash = "sha256-CGmdk5SjtmeqXLVWiBqvofQ4+C2gW4TJXFkQdaQqMEA=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix
deleted file mode 100644
index ad83654c3ab3..000000000000
--- a/pkgs/development/python-modules/radian/default.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pytestCheckHook,
-  pyte,
-  pexpect,
-  ptyprocess,
-  pythonOlder,
-  jedi,
-  git,
-  lineedit,
-  prompt-toolkit,
-  pygments,
-  rchitect,
-  R,
-  rPackages,
-  setuptools,
-  setuptools-scm,
-}:
-
-buildPythonPackage rec {
-  pname = "radian";
-  version = "0.6.13";
-  pyproject = true;
-
-  disabled = pythonOlder "3.9";
-
-  src = fetchFromGitHub {
-    owner = "randy3k";
-    repo = "radian";
-    tag = "v${version}";
-    hash = "sha256-gz2VczAgVbvISzvY/v0GvZ/Erv6ipZwPU61r6OJ+3Fo=";
-  };
-
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace '"pytest-runner"' ""
-  '';
-
-  build-system = [
-    setuptools
-    setuptools-scm
-  ];
-
-  nativeBuildInputs = [
-    R # needed at setup time to detect R_HOME
-  ];
-
-  propagatedBuildInputs =
-    [
-      lineedit
-      prompt-toolkit
-      pygments
-      rchitect
-    ]
-    ++ (with rPackages; [
-      reticulate
-      askpass
-    ]);
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    pyte
-    pexpect
-    ptyprocess
-    jedi
-    git
-  ];
-
-  makeWrapperArgs = [ "--set R_HOME ${R}/lib/R" ];
-
-  preCheck = ''
-    export HOME=$TMPDIR
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${R}/lib/R/lib
-  '';
-
-  pythonImportsCheck = [ "radian" ];
-
-  meta = with lib; {
-    description = "21 century R console";
-    mainProgram = "radian";
-    homepage = "https://github.com/randy3k/radian";
-    changelog = "https://github.com/randy3k/radian/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ savyajha ];
-  };
-}
diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix
deleted file mode 100644
index 89769859cdf7..000000000000
--- a/pkgs/development/python-modules/uamqp/default.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchFromGitHub,
-  fetchpatch2,
-  setuptools,
-  cython,
-  certifi,
-  cmake,
-  openssl,
-  pytestCheckHook,
-  pytest-asyncio,
-}:
-
-buildPythonPackage rec {
-  pname = "uamqp";
-  version = "1.6.11";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "Azure";
-    repo = "azure-uamqp-python";
-    tag = "v${version}";
-    hash = "sha256-HTIOHheCrvyI7DwA/UcUXk/fbesd29lvUvJ9TAeG3CE=";
-  };
-
-  patches = [
-    (fetchpatch2 {
-      name = "fix-clang16-compatibility.patch";
-      url = "https://github.com/Azure/azure-uamqp-python/commit/bd6d9ef5a8bca3873e1e66218fd09ca787b8064e.patch";
-      hash = "sha256-xtnIVjB71EPJp/QjLQWctcSDds5s6n4ut+gnvp3VMlM=";
-    })
-  ];
-
-  postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isx86_64) ''
-    # force darwin aarch64 to use openssl instead of applessl, removing
-    # some quirks upstream thinks they need to use openssl on macos
-    sed -i \
-      -e '/^use_openssl =/cuse_openssl = True' \
-      -e 's/\bazssl\b/ssl/' \
-      -e 's/\bazcrypto\b/crypto/' \
-      setup.py
-    sed -i \
-      -e '/#define EVP_PKEY_id/d' \
-      src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/x509_openssl.c
-    sed -z -i \
-      -e 's/OpenSSL 3\nif(LINUX)/OpenSSL 3\nif(1)/' \
-      src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt
-  '';
-
-  build-system = [
-    cython
-    setuptools
-  ];
-
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  buildInputs = [ openssl ];
-
-  dependencies = [ certifi ];
-
-  dontUseCmakeConfigure = true;
-
-  preCheck = ''
-    # remove src module, so tests use the installed module instead
-    rm -r uamqp
-  '';
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    pytest-asyncio
-  ];
-
-  pythonImportsCheck = [ "uamqp" ];
-
-  meta = with lib; {
-    description = "AMQP 1.0 client library for Python";
-    homepage = "https://github.com/Azure/azure-uamqp-python";
-    license = licenses.mit;
-    maintainers = with maintainers; [ maxwilson ];
-  };
-}