Merge branch 'master' into current

pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20240805-1";
+  version = "20240816";
 
   src = fetchFromGitHub {
     owner = "bepaald";
-    repo = pname;
+    repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-n1mFIyrZ8d9h2m6rUzIVSt9Xdw1VlBLlXY15JLoIaVA=";
+    hash = "sha256-8r3XpKqCR2ElfQnRuuBaDDIUwAASTTfGSihOounIVZQ=";
   };
 
   postPatch = ''

pkgs/by-name/uw/uwsm/package.nix

@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "uwsm";
-  version = "0.18.0";
+  version = "0.18.2";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "uwsm";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-VGywdMRHJaQgWD9EurYdMTlbOo8Wu8NWiLuiY7xJh4M=";
+    hash = "sha256-/LmSc1AKNZ/VZ2rkUsOvwqpJmPgb6dThTtOu44BriQs=";
   };
 
   nativeBuildInputs = [

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

@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "instructor";
-  version = "1.3.3";
+  version = "1.3.7";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,13 +32,14 @@ buildPythonPackage rec {
     owner = "jxnl";
     repo = "instructor";
     rev = "refs/tags/${version}";
-    hash = "sha256-ye6uNnwvJ3RXmKM8ix/sBiJgeCFQazNVgHZkBAnL0nw=";
+    hash = "sha256-XouTXv8wNPPBKVs2mCue1o4hfHlPlq6uXBuDXiZLIHI=";
   };
 
   pythonRelaxDeps = [
     "docstring-parser"
-    "pydantic"
     "jiter"
+    "pydantic"
+    "tenacity"
   ];
 
   build-system = [ poetry-core ];
@@ -68,8 +69,9 @@ buildPythonPackage rec {
 
   disabledTests = [
     # Tests require OpenAI API key
-    "test_partial"
     "successfully"
+    "test_mode_functions_deprecation_warning"
+    "test_partial"
   ];
 
   disabledTestPaths = [

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

@@ -1,29 +1,35 @@
 {
   lib,
   buildPythonPackage,
+  defusedxml,
   fetchFromGitHub,
+  pytestCheckHook,
+  pythonOlder,
   pyyaml,
   semantic-version,
-  defusedxml,
-  pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "lib4sbom";
-  version = "0.7.2";
-  format = "setuptools";
+  version = "0.7.3";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "anthonyharrison";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-sjfOCG1E5Of+HPcfRsBwEKmGkhUOIkAARWja81FL2PY=";
+    repo = "lib4sbom";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-RuIvhlLnWf/ayU6tjpHYKvBFqU8ojPwJK/pDIdLrD2s=";
   };
 
+  build-system = [ setuptools ];
+
   dependencies = [
+    defusedxml
     pyyaml
     semantic-version
-    defusedxml
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
@@ -54,6 +60,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library to ingest and generate SBOMs";
     homepage = "https://github.com/anthonyharrison/lib4sbom";
+    changelog = "https://github.com/anthonyharrison/lib4sbom/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ teatwig ];
   };

pkgs/development/python-modules/sanic-testing/default.nix

@@ -6,13 +6,14 @@
   httpx,
   pythonOlder,
   sanic,
+  setuptools,
   websockets,
 }:
 
 buildPythonPackage rec {
   pname = "sanic-testing";
-  version = "23.12.0";
-  format = "setuptools";
+  version = "24.6.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -20,7 +21,7 @@ buildPythonPackage rec {
     owner = "sanic-org";
     repo = "sanic-testing";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pFsGB0QDeO/iliHOitHqBIQtDlwRgFg8nhgMLsopoec=";
+    hash = "sha256-biUgxa0sINHAYzyKimVD8+/mPUq2dlnCl2BN+UeUaEo=";
   };
 
   outputs = [
@@ -28,7 +29,9 @@ buildPythonPackage rec {
     "testsout"
   ];
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     httpx
     sanic
     websockets

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

@@ -1,61 +1,48 @@
 {
   lib,
   stdenv,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonAtLeast,
-
-  # build-system
-  setuptools,
-  wheel,
-
-  # propagates
   aiofiles,
+  aioquic,
+  beautifulsoup4,
+  buildPythonPackage,
+  doCheck ? !stdenv.isDarwin, # on Darwin, tests fail but pkg still works
+  fetchFromGitHub,
+  gunicorn,
   html5tagger,
   httptools,
   multidict,
+  pytest-asyncio,
+  pytestCheckHook,
+  pythonAtLeast,
+  pythonOlder,
   sanic-routing,
+  sanic-testing,
+  setuptools,
   tracerite,
   typing-extensions,
   ujson,
+  uvicorn,
   uvloop,
   websockets,
-
-  # optionals
-  aioquic,
-
-  # tests
-  doCheck ? !stdenv.isDarwin, # on Darwin, tests fail but pkg still works
-
-  beautifulsoup4,
-  gunicorn,
-  pytest-asyncio,
-  pytestCheckHook,
-  pythonOlder,
-  sanic-testing,
-  uvicorn,
 }:
 
 buildPythonPackage rec {
   pname = "sanic";
-  version = "23.12.1";
-  format = "pyproject";
+  version = "24.6.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "sanic-org";
-    repo = pname;
+    repo = "sanic";
     rev = "refs/tags/v${version}";
-    hash = "sha256-TizjibqoLNMX0m5oPyncKgFnltXOLZUIPSzVIeKU25w=";
+    hash = "sha256-AviYqdr+r5ya4mFJKGUatBsaMMmCQGqE3YtDJwTuaY0=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-    wheel
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiofiles
     httptools
     html5tagger
@@ -115,16 +102,19 @@ buildPythonPackage rec {
       # Server mode mismatch (debug vs production)
       "test_num_workers"
       # Racy tests
+      "test_custom_cert_loader"
       "test_keep_alive_client_timeout"
       "test_keep_alive_server_timeout"
+      "test_logger_vhosts"
+      "test_ssl_in_multiprocess_mode"
       "test_zero_downtime"
       # sanic.exceptions.SanicException: Cannot setup Sanic Simple Server without a path to a directory
       "test_load_app_simple"
-      # create defunct python processes
+      # Tests create defunct Python processes
       "test_reloader_live"
       "test_reloader_live_with_dir"
       "test_reload_listeners"
-      # crash the python interpreter
+      # Tests crash the Python interpreter
       "test_host_port_localhost"
       "test_host_port"
       "test_server_run"
@@ -156,7 +146,7 @@ buildPythonPackage rec {
     "test_multiprocessing.py"
   ];
 
-  # avoid usage of nixpkgs-review in darwin since tests will compete usage
+  # Avoid usage of nixpkgs-review in darwin since tests will compete usage
   # for the same local port
   __darwinAllowLocalNetworking = true;
 
@@ -164,10 +154,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Web server and web framework";
-    mainProgram = "sanic";
     homepage = "https://github.com/sanic-org/sanic/";
     changelog = "https://github.com/sanic-org/sanic/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = [ ];
+    mainProgram = "sanic";
   };
 }

pkgs/tools/archivers/peazip/default.nix

@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "peazip";
-  version = "9.8.0";
+  version = "9.9.1";
 
   src = fetchFromGitHub {
     owner = "peazip";
     repo = pname;
     rev = version;
-    hash = "sha256-oHtxiunB409xwk4tYB336Bq51Fl7PFrXKwH7ySaYCEs=";
+    hash = "sha256-hn3EhePmBlj9Zdlij/GMxJPTP6suUm2oThaSKjoKeQQ=";
   };
   sourceRoot = "${src.name}/peazip-sources";