Merge master into staging-next

2023-09-01 12:01:23 +00:00 · 2023-09-01 12:01:23 +00:00 · 7c38c696db
parent 43e9f383af 2a01448de1
commit 7c38c696db
73 changed files with 1038 additions and 699 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -18007,6 +18007,12 @@
      fingerprint = "5814 50EB 6E17 E715 7C63  E7F1 9879 8C3C 4D68 8D6D";
    }];
  };
+  viktornordling = {
+    email = "antique_paler_0i@icloud.com";
+    github = "viktornordling";
+    githubId = 90482;
+    name = "Viktor Nordling";
+  };
  viluon = {
    email = "nix@viluon.me";
    github = "viluon";
--- a/nixos/modules/services/web-apps/cloudlog.nix
+++ b/nixos/modules/services/web-apps/cloudlog.nix
@ -308,8 +308,6 @@ in
      pools.cloudlog = {
        inherit (cfg) user;
        group = config.services.nginx.group;
-        # cloudlog is currently broken on php 8.2
-        phpPackage = pkgs.php81;
        settings =  {
          "listen.owner" = config.services.nginx.user;
          "listen.group" = config.services.nginx.group;
--- a/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch
+++ b/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch
@ -1,32 +0,0 @@
-From 324a267b0e5505c9124874581bc48fb174fb2542 Mon Sep 17 00:00:00 2001
-From: "P. R. d. O" <d.ol.rod@tutanota.com>
-Date: Fri, 4 Mar 2022 07:03:17 -0600
-Subject: [PATCH] Pillow update
-
---
- pyproject.toml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 5dc25e0..b3ba397 100644
--- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -11,7 +11,7 @@ readme = "README.rst"
- [tool.poetry.dependencies]
- python = "^3.7"
- logbook = "^1.5.3"
-Pillow = "^8.2.0"
-+Pillow = "^9.0.0"
- requests = "^2.24.0"
- kiss-headers = "^2.2.3"
- single-version = "^1.5.1"
-@@ -33,4 +33,4 @@ skip-string-normalization = true
- 
- [build-system]
-requires = ["poetry>=0.12"]
-+requires = ["poetry-core"]
-build-backend = "poetry.masonry.api"
-+build-backend = "poetry.core.masonry.api"
-- 
-2.35.1
-
--- a/pkgs/applications/misc/cobang/default.nix
+++ b/pkgs/applications/misc/cobang/default.nix
@ -1,49 +1,62 @@
 { lib
+, atk
 , buildPythonApplication
 , fetchFromGitHub
-, wrapGAppsHook
-, atk
 , gdk-pixbuf
 , gobject-introspection
-, gtk3
 , gst-plugins-good
+, gst-python
+, gtk3
+, kiss-headers
 , libhandy
 , librsvg
+, logbook
 , networkmanager
 , pango
-, gst-python
-, kiss-headers
-, logbook
 , pillow
 , poetry-core
 , pygobject3
+, pytestCheckHook
 , python
 , python-zbar
+, pythonRelaxDepsHook
 , requests
 , single-version
-, pytestCheckHook }:
+, wrapGAppsHook
+}:

 buildPythonApplication rec {
  pname = "cobang";
-  version = "0.9.6";
+  version = "0.10.1";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "hongquan";
    repo = "CoBang";
-    rev = "v${version}";
-    sha256 = "sha256-YcXQ2wAgFSsJEqcaDQotpX1put4pQaF511kwq/c2yHw=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-yNDnBTBmwcP3g51UkkLNyF4eHYjblwxPxS2lMwbFKUM=";
  };

-  patches = [
-    ./0001-Poetry-core-and-pillow-9.patch
+  pythonRelaxDeps = [
+    "logbook"
+    "Pillow"
  ];

  nativeBuildInputs = [
    gobject-introspection
+    pythonRelaxDepsHook
    wrapGAppsHook
  ];

+  buildInputs = [
+    atk
+    gdk-pixbuf
+    gst-plugins-good
+    libhandy
+    networkmanager
+    pango
+  ];
+
  propagatedBuildInputs = [
    gst-python
    kiss-headers
@ -56,15 +69,6 @@ buildPythonApplication rec {
    single-version
  ];

-  buildInputs = [
-    atk
-    gdk-pixbuf
-    gst-plugins-good
-    libhandy
-    networkmanager
-    pango
-  ];
-
  nativeCheckInputs = [
    pytestCheckHook
  ];
--- a/pkgs/applications/misc/ttdl/default.nix
+++ b/pkgs/applications/misc/ttdl/default.nix
@ -5,16 +5,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "ttdl";
-  version = "4.0.0";
+  version = "4.1.0";

  src = fetchFromGitHub {
    owner = "VladimirMarkelov";
    repo = "ttdl";
    rev = "v${version}";
-    sha256 = "sha256-er2IDPVFbcuT0COBCpBymNVBKtETdWjzR2330WUBp6U=";
+    sha256 = "sha256-twl72feo1PpWZbs50a962pvvD5YUHfZRW9OjY/meYVo=";
  };

-  cargoHash = "sha256-WcqkvnXRgsDJM7p2WGa5lmeeuwNwBy2ZQATVkTHRX7Q=";
+  cargoHash = "sha256-ZoVPC/PyMm+yuDYhVFykIBk0T5RNLAfmIT36Tl/dxCo=";

  meta = with lib; {
    description = "A CLI tool to manage todo lists in todo.txt format";
--- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
+++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "tektoncd-cli";
-  version = "0.31.1";
+  version = "0.31.2";

  src = fetchFromGitHub {
    owner = "tektoncd";
    repo = "cli";
    rev = "v${version}";
-    sha256 = "sha256-SneGlXEthl/x6n+IlMN6y/ZubgHlfseoV0PS9sGcrTM=";
+    sha256 = "sha256-QBJ8UoR61XOFT6u5glpL+DHaj5Kyqq73r0pyteINQNA=";
  };

  vendorHash = null;
--- a/pkgs/applications/networking/cluster/zarf/default.nix
+++ b/pkgs/applications/networking/cluster/zarf/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "zarf";
-  version = "0.29.0";
+  version = "0.29.1";

  src = fetchFromGitHub {
    owner = "defenseunicorns";
    repo = "zarf";
    rev = "v${version}";
-    hash = "sha256-MpjxyVOouivB1FT8ejKhq3lPSfCaXwxMXpyxoaNxVEk=";
+    hash = "sha256-m/eyy3MpHHlxlWU9Y7tsQw5jGGZIKCvBkIgoRmvecBI=";
  };

-  vendorHash = "sha256-h/N50x64ROW3KJ5965vauSpkIoeq8Zn26eCEmJqU0Zg=";
+  vendorHash = "sha256-p1QLNbkNlIwqHzLjGX5YGC2Xxu0nAjmMfGwKXhi9XkU=";
  proxyVendor = true;

  preBuild = ''
--- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
+++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
@ -2,12 +2,12 @@

 stdenv.mkDerivation rec {
  pname = "chatterino2";
-  version = "2.4.4";
+  version = "2.4.5";
  src = fetchFromGitHub {
    owner = "Chatterino";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-zvwvvwMPWnNT44L7g8fiY0N7H62Ot1lNCFCIkL8SxQw=";
+    sha256 = "sha256-ughEavlvL1/mvevbYrDG+2/JYigMhVwyy3RFysQqUNs=";
    fetchSubmodules = true;
  };
  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
--- a/pkgs/applications/office/appflowy/default.nix
+++ b/pkgs/applications/office/appflowy/default.nix
@ -6,7 +6,6 @@
 , copyDesktopItems
 , makeDesktopItem
 , gtk3
-, openssl_1_1
 , xdg-user-dirs
 , keybinder3
 }:
@ -29,7 +28,6 @@ stdenv.mkDerivation rec {

  buildInputs = [
    gtk3
-    openssl_1_1
    keybinder3
  ];

--- a/pkgs/applications/radio/cloudlog/default.nix
+++ b/pkgs/applications/radio/cloudlog/default.nix
@ -8,13 +8,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "cloudlog";
-  version = "2.4.5";
+  version = "2.4.8";

  src = fetchFromGitHub {
    owner = "magicbug";
    repo = "Cloudlog";
    rev = version;
-    sha256 = "sha256-L68jk49lGw9LNSqIPlDp2WHoQhn8UBW6VDZwsCtjTQI=";
+    sha256 = "sha256-LY8kTZooBzwrrruCjwdiNhxjrmIDV4N2HcfhbSSe6o4=";
  };

  postPath = ''
--- a/pkgs/applications/science/misc/openmvs/default.nix
+++ b/pkgs/applications/science/misc/openmvs/default.nix
@ -26,14 +26,14 @@ let
  });
 in
 stdenv.mkDerivation rec {
-  version = "2.1.0";
+  version = "2.2.0";
  pname = "openmvs";

  src = fetchFromGitHub {
    owner = "cdcseacave";
    repo = "openmvs";
    rev = "v${version}";
-    sha256 = "sha256-eqNprBgR0hZnbLKLZLJqjemKxHhDtGblmaSxYlmegsc=";
+    sha256 = "sha256-j/tGkR73skZiU+bP4j6aZ5CxkbIcHtqKcaUTgNvj0C8=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@ -11,13 +11,13 @@

 buildGoModule rec {
  pname = "containerd";
-  version = "1.7.3";
+  version = "1.7.5";

  src = fetchFromGitHub {
    owner = "containerd";
    repo = "containerd";
    rev = "v${version}";
-    hash = "sha256-BUbZe37rBZTr6nWb4lY2HHuwtq7toDUkGaJOiOoVkWI=";
+    hash = "sha256-g+1JfXO1k0ijPpVTo+WxmXro4p4MbRCIZdgtgy58M60=";
  };

  vendorHash = null;
--- a/pkgs/data/themes/where-is-my-sddm-theme/default.nix
+++ b/pkgs/data/themes/where-is-my-sddm-theme/default.nix
@ -23,13 +23,13 @@ in

 stdenvNoCC.mkDerivation rec {
  pname = "where-is-my-sddm-theme";
-  version = "1.3.0";
+  version = "1.5.0";

  src = fetchFromGitHub {
    owner = "stepanzubkov";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-40XTihp3hYbXzXSmgrmFCQjZUBkDi/NLiGQEs5ZmRIg=";
+    hash = "sha256-kW6W8DELi9Xqn9xWLlcKmxk4tO5FKdApaYTZimQ+7B0=";
  };

  propagatedUserEnvPkgs = [ qtgraphicaleffects ];
--- a/pkgs/development/compilers/aspectj/default.nix
+++ b/pkgs/development/compilers/aspectj/default.nix
@ -2,14 +2,14 @@

 stdenv.mkDerivation rec {
  pname = "aspectj";
-  version = "1.9.19";
+  version = "1.9.20";
  builder = ./builder.sh;

  src = let
    versionSnakeCase = builtins.replaceStrings ["."] ["_"] version;
  in fetchurl {
    url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar";
-    sha256 = "sha256-Oujyg05yvtcyfLmqonc++GX9AyFKwfIzITOHDz0px0M=";
+    sha256 = "sha256-zrU7JlEyUwoYxQ+sTaJM4YGVW5NucDXDiEao4glJAk0=";
  };

  inherit jre;
--- a/pkgs/development/compilers/lunarml/default.nix
+++ b/pkgs/development/compilers/lunarml/default.nix
@ -5,19 +5,16 @@
 , lua5_3
 }:

-let
-  pname = "lunarml";
-in
 stdenvNoCC.mkDerivation {
-  inherit pname;
+  pname = "lunarml";

-  version = "unstable-2023-07-25";
+  version = "unstable-2023-08-25";

  src = fetchFromGitHub {
    owner = "minoki";
    repo = "LunarML";
-    rev = "4a5f9c7d42c6b1fcd3d73ab878321f887a153aa7";
-    sha256 = "dpYUXMbYPRvk+t6Cnc4uh8w5MwuPXuKPgZQl2P0EBZU=";
+    rev = "69d09b47601f4041ca7e8a513c75f3e4835af9dd";
+    sha256 = "sha256-GXUcWI4/akOKIvCHrsOfceZEdyNZdIdalTc6wX+svS4=";
  };

  outputs = [ "out" "doc" ];
@ -37,18 +34,21 @@ stdenvNoCC.mkDerivation {
  doCheck = true;

  installPhase = ''
-    mkdir -p $doc/${pname} $out/{bin,lib}
+    runHook preInstall
+
+    mkdir -p $doc/lunarml $out/{bin,lib}
    cp -r bin $out
    cp -r lib $out
-    cp -r doc/* README.* LICENSE* $doc/${pname}
-    cp -r example $doc/${pname}
+    cp -r example $doc/lunarml
+
+    runHook postInstall
  '';

  meta = {
    description = "Standard ML compiler that produces Lua/JavaScript";
    homepage = "https://github.com/minoki/LunarML";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ toastal ];
+    maintainers = with lib.maintainers; [ toastal ratsclub ];
    platforms = mlton.meta.platforms;
  };
 }
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@ -7,8 +7,8 @@ with builtins; with lib; let
    { case = "8.13"; out = { version = "1.13.7"; };}
    { case = "8.14"; out = { version = "1.13.7"; };}
    { case = "8.15"; out = { version = "1.15.0"; };}
-    { case = "8.16"; out = { version = "1.16.5"; };}
-    { case = "8.17"; out = { version = "1.16.5"; };}
+    { case = "8.16"; out = { version = "1.17.0"; };}
+    { case = "8.17"; out = { version = "1.17.0"; };}
  ] {} );
 in mkCoqDerivation {
  pname = "elpi";
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@ -2,12 +2,12 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "clojure";
-  version = "1.11.1.1405";
+  version = "1.11.1.1413";

  src = fetchurl {
    # https://github.com/clojure/brew-install/releases
    url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz";
-    hash = "sha256-sqKhnddOy2rKcYtM2rSiaHIihoajZ8GBfBfyU4oPtXQ=";
+    hash = "sha256-k8Olo63KUcWFgGNBmr9myD2/JOoV4f2S95v35mI4H+A=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/belcard/default.nix
+++ b/pkgs/development/libraries/belcard/default.nix
@ -8,7 +8,7 @@

 stdenv.mkDerivation rec {
  pname = "belcard";
-  version = "5.2.12";
+  version = "5.2.98";

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
    group = "BC";
    repo = pname;
    rev = version;
-    sha256 = "sha256-Q5FJ1Nh61woyXN7BVTZGNGXOVhcZXakLWcxaavPpgeY=";
+    sha256 = "sha256-pRNJ1bDS2v0Cn+6cxMeFa0JQ27UZR6kCI9P6gQ5W2GA=";
  };

  buildInputs = [ bctoolbox belr ];
--- a/pkgs/development/libraries/hyperscan/default.nix
+++ b/pkgs/development/libraries/hyperscan/default.nix
@ -41,6 +41,15 @@ stdenv.mkDerivation (finalAttrs: {
      --replace "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
  '';

+  doCheck = true;
+  checkPhase = ''
+    runHook preCheck
+
+    bin/unit-hyperscan
+
+    runHook postCheck
+  '';
+
  meta = with lib; {
    description = "High-performance multiple regex matching library";
    longDescription = ''
--- a/pkgs/development/libraries/libisoburn/default.nix
+++ b/pkgs/development/libraries/libisoburn/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "libisoburn";
-  version = "1.5.4";
+  version = "1.5.6";

  src = fetchurl {
    url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
-    sha256 = "sha256-LYmEbUOIDxf6WRxTs76kL/uANijk5jDGgPwskYT3kTI=";
+    sha256 = "sha256-K4Cm9z3WM6XSQ/rL6XoV5cmgdkSl4aJCwhm5N1pF9xs=";
  };

  buildInputs = [ attr zlib libburn libisofs ];
--- a/pkgs/development/libraries/sqlcipher/default.nix
+++ b/pkgs/development/libraries/sqlcipher/default.nix
@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "sqlcipher";
-  version = "4.5.4";
+  version = "4.5.5";

  src = fetchFromGitHub {
    owner = "sqlcipher";
    repo = "sqlcipher";
    rev = "v${version}";
-    hash = "sha256-n9KPtTj/mHXrnFJnbWPO3H+Vol3Z2mg7XLl55ynyLwY=";
+    hash = "sha256-amWYkVQr+Rmcj+32lFDRq43Q+Ojj8V8B6KoURqdwGt0=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix
+++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix
@ -1,32 +1,32 @@
-{ stdenv
-, lib
+{ dbus
+, docbook-xsl-nons
+, docbook_xml_dtd_43
 , fetchurl
+, glib
+, lib
+, libxslt
 , meson
 , ninja
 , pkg-config
-, libxslt
-, docbook-xsl-nons
-, docbook_xml_dtd_43
-, dbus
-, glib
+, stdenv
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "xdg-dbus-proxy";
-  version = "0.1.4";
+  version = "0.1.5";

  src = fetchurl {
-    url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-HsDqtT0eSZZtciNSvP1RrEAtzlGQuu3HSahUHnYWcKs=";
+    url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${finalAttrs.version}/xdg-dbus-proxy-${finalAttrs.version}.tar.xz";
+    hash = "sha256-Bh3Pr4oGUOX9nVQy3+iL2nSeoNB53BNjBL/s+84GYfs=";
  };

  nativeBuildInputs = [
+    docbook-xsl-nons
+    docbook_xml_dtd_43
+    libxslt
    meson
    ninja
    pkg-config
-    libxslt
-    docbook-xsl-nons
-    docbook_xml_dtd_43
  ];

  buildInputs = [
@ -40,12 +40,12 @@ stdenv.mkDerivation rec {
  # dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory
  doCheck = false;

-  meta = with lib; {
+  meta = {
    description = "DBus proxy for Flatpak and others";
    homepage = "https://github.com/flatpak/xdg-dbus-proxy";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ jtojnar ];
-    platforms = platforms.linux;
+    license = lib.licenses.lgpl21Plus;
    mainProgram = "xdg-dbus-proxy";
+    maintainers = with lib.maintainers; [ jtojnar ];
+    platforms = lib.platforms.linux;
  };
-}
+})
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@ -8,7 +8,7 @@
 , ppxlib, ppx_deriving
 , ppxlib_0_15, ppx_deriving_0_15
 , coqPackages
-, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.16.5"
+, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.17.0"
    else if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1"
 }:

@ -16,6 +16,7 @@ let p5 = camlp5; in
 let camlp5 = p5.override { legacy = true; }; in

 let fetched = coqPackages.metaFetch ({
+    release."1.17.0".sha256 = "sha256-DTxE8CvYl0et20pxueydI+WzraI6UPHMNvxyp2gU/+w=";
    release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A=";
    release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s=";
    release."1.15.0".sha256 = "sha256:1ngdc41sgyzyz3i3lkzjhnj66gza5h912virkh077dyv17ysb6ar";
@ -34,7 +35,7 @@ buildDunePackage rec {
  pname = "elpi";
  inherit (fetched) version src;

-  patches = lib.optional (lib.versionAtLeast version "1.16" || version == "dev")
+  patches = lib.optional (version == "1.16.5")
    ./atd_2_10.patch;

  minimalOCamlVersion = "4.04";
--- a/pkgs/development/python-modules/aiolifx-themes/default.nix
+++ b/pkgs/development/python-modules/aiolifx-themes/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "aiolifx-themes";
-  version = "0.4.7";
+  version = "0.4.8";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "Djelibeybi";
    repo = "aiolifx-themes";
    rev = "refs/tags/v${version}";
-    hash = "sha256-0zcyMn0Y0UI5S8JGdYVXkK7FBdSHCA0FOmkmXDT9P48=";
+    hash = "sha256-jbL6f6gDH6AxsfuD7mFtvCGKLqy/NKoo5bUmXN9hBrM=";
  };

  prePatch = ''
--- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
+++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "appthreat-vulnerability-db";
-  version = "5.2.3";
+  version = "5.2.5";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "AppThreat";
    repo = "vulnerability-db";
    rev = "refs/tags/v${version}";
-    hash = "sha256-HIUBHyuh66PjHRPTFKIq859+tSYnaseQE9GOMduxBP4=";
+    hash = "sha256-h1xpP3fFr8+twa5jXQrZfKFjNAlCvXv7sFvhgJZ88H0=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/asyncsleepiq/default.nix
+++ b/pkgs/development/python-modules/asyncsleepiq/default.nix
@ -7,14 +7,14 @@

 buildPythonPackage rec {
  pname = "asyncsleepiq";
-  version = "1.3.6";
+  version = "1.3.7";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-h+Q9g0kznGMLLi8i/iKodGXB+f/m3PXoF6h6hhIX9ys=";
+    hash = "sha256-nKXZXOpwVN8Xe1vwwPGPucvyffiIQ8I4D+0A3qGco5w=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/awkward-cpp/default.nix
+++ b/pkgs/development/python-modules/awkward-cpp/default.nix
@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "awkward-cpp";
-  version = "21";
+  version = "22";
  format = "pyproject";

-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-sobmPegDBI/4EvdpxrY28TsNO8vyLhuRsV9s+5WThR4=";
+    hash = "sha256-IWeWNvshz+NxX4ijIyaleRmThNstpKYplcMQUC1/6F8=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "botocore-stubs";
-  version = "1.31.38";
+  version = "1.31.39";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "botocore_stubs";
    inherit version;
-    hash = "sha256-ZgduwHPPoW+RPMtudt8GsggJdHhgQNY6mo0pdFnryuc=";
+    hash = "sha256-pqpGnPXZT5lDnTpXBfsJk0/tBtUovgazAWZf/TZJfNg=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/pkgs/development/python-modules/casbin/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "casbin";
-  version = "1.25.0";
+  version = "1.26.0";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = pname;
    repo = "pycasbin";
    rev = "refs/tags/v${version}";
-    hash = "sha256-o8pjoVuZLifGOmijJIl2LpjLguYwPLRVB44iFsGe1BM=";
+    hash = "sha256-wM27HW5w8fDjHoGV+OGDTaO5SKJrq8fGKh1EPQt+wlo=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@ -28,14 +28,14 @@

 buildPythonPackage rec {
  pname = "celery";
-  version = "5.3.1";
+  version = "5.3.3";
  format = "setuptools";

-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-+E0cIaFSDBFsK30mWTkmWBGRQ1oDqnS3fJQbk8ocYhA=";
+    hash = "sha256-uskO+ZtwubW11M/Ov28atRaLhsYSC8fFgUzYI039k4E=";
  };

  propagatedBuildInputs = [
@ -95,6 +95,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Distributed task queue";
    homepage = "https://github.com/celery/celery/";
+    changelog = "https://github.com/celery/celery/releases/tag/v${version}";
    license = licenses.bsd3;
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/censys/default.nix
+++ b/pkgs/development/python-modules/censys/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "censys";
-  version = "2.2.4";
+  version = "2.2.5";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "censys";
    repo = "censys-python";
    rev = "refs/tags/v${version}";
-    hash = "sha256-gCq01lfAoKoS74C8gjj84mZpXDMtdNVaRLwhlEXwiPI=";
+    hash = "sha256-D25deUPMWc6KRlwytSfZqoPeJGmTV304slUP9gCyrUw=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/coredis/default.nix
+++ b/pkgs/development/python-modules/coredis/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "coredis";
-  version = "4.15.1";
+  version = "4.16.0";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "alisaifee";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-9nojHufUt53Ovoos4gaR7qh1xN8D1+gJOEyFsOndXJU=";
+    hash = "sha256-7qpoNc5/z8/EKtGWULrPPwfH9swYe9TqqUL+zxrFQSk=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/dataclasses-json/default.nix
+++ b/pkgs/development/python-modules/dataclasses-json/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "dataclasses-json";
-  version = "0.5.14";
+  version = "0.5.15";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "lidatong";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-pCvVKHh2elHaukEJNTw8MgJmoTlYjO9aVWFCQXXD13c=";
+    hash = "sha256-ADWNB2Eu4TwlAvchyzBwGiw9YT9McPr9lsNfo1lR1WI=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/dataproperty/default.nix
+++ b/pkgs/development/python-modules/dataproperty/default.nix
@ -1,39 +1,55 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchFromGitHub
-, lib
+, loguru
 , mbstrdecoder
-, typepy
 , pytestCheckHook
+, pythonOlder
+, tcolorpy
 , termcolor
+, typepy
 }:

 buildPythonPackage rec {
  pname = "dataproperty";
-  version = "0.55.0";
+  version = "1.0.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "thombashi";
    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-ODSrKZ8M/ni9r2gkVIKWaKkdr+3AVi4INkEKJ+cmb44=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-adUxUU9eASkC9n5ppZYNN0MP19u4xcL8XziBWSCp2L8=";
  };

-  propagatedBuildInputs = [ mbstrdecoder typepy ];
+  propagatedBuildInputs = [
+    mbstrdecoder
+    typepy
+    tcolorpy
+  ] ++ typepy.optional-dependencies.datetime;

-  nativeCheckInputs = [ pytestCheckHook ];
-  checkInputs = [ termcolor ];
+  passthru.optional-dependencies = {
+    logging = [
+      loguru
+    ];
+  };

-  # Tests fail, even on non-nixos
-  pytestFlagsArray = [
-    "--deselect test/test_dataproperty.py::Test_DataPeroperty_len::test_normal_ascii_escape_sequence"
-    "--deselect test/test_dataproperty.py::Test_DataPeroperty_is_include_ansi_escape::test_normal"
-    "--deselect test/test_dataproperty.py::Test_DataPeroperty_repr::test_normal"
+  nativeCheckInputs = [
+    pytestCheckHook
+    termcolor
+  ];
+
+  pythonImportsCheck = [
+    "dataproperty"
  ];

  meta = with lib; {
+    description = "Library for extracting properties from data";
    homepage = "https://github.com/thombashi/dataproperty";
-    description = "A library for extracting properties from data";
-    maintainers = with maintainers; [ genericnerdyusername ];
+    changelog = "https://github.com/thombashi/DataProperty/releases/tag/v${version}";
    license = licenses.mit;
+    maintainers = with maintainers; [ genericnerdyusername ];
  };
 }
--- a/pkgs/development/python-modules/dbt-core/default.nix
+++ b/pkgs/development/python-modules/dbt-core/default.nix
@ -51,6 +51,7 @@ buildPythonPackage rec {
    "click"
    "mashumaro"
    "networkx"
+    "logbook"
  ];

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/funsor/default.nix
+++ b/pkgs/development/python-modules/funsor/default.nix
@ -21,7 +21,7 @@

 buildPythonPackage rec {
  pname = "funsor";
-  version = "0.4.5";
+  version = "0.4.6";

  disabled = pythonOlder "3.7";

@ -29,7 +29,7 @@ buildPythonPackage rec {
    owner = "pyro-ppl";
    repo = "funsor";
    rev = "refs/tags/${version}";
-    hash = "sha256-3JxnRlJN/kYstcIKt8cvDmqnp8oyoA4jkMBDVuAMa5Q=";
+    hash = "sha256-Prj1saT0yoPAP8rDE0ipBEpR3QMk4PS12VSJlxc22p8=";
  };

  # Disable the tests that rely on downloading assets from the internet as well as the linting checks.
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "hahomematic";
-  version = "2023.8.13";
+  version = "2023.8.14";
  format = "pyproject";

  disabled = pythonOlder "3.11";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "danielperna84";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-SZIxZHuw3YLGA3dU73jxCahq2pxTyeflXJxnOfJtyJg=";
+    hash = "sha256-msN3S7rBYZnCAh2IGBVzHjqiTapzH2kMV5CBFHmtcNE=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/json5/default.nix
+++ b/pkgs/development/python-modules/json5/default.nix
@ -7,13 +7,13 @@

 buildPythonPackage rec {
  pname = "json5";
-  version = "0.9.9";
+  version = "0.9.14";

  src = fetchFromGitHub {
    owner = "dpranke";
    repo = "pyjson5";
    rev = "v${version}";
-    hash = "sha256-0ommoTv5q7YuLNF+ZPWW/Xg/8CwnPrF7rXJ+eS0joUs=";
+    hash = "sha256-cshP1kraLENqWuQTlm4HPAP/0ywRRLFOJI8mteWcjR4=";
  };

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/jupyter-collaboration/default.nix
+++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix
@ -19,16 +19,15 @@

 buildPythonPackage rec {
  pname = "jupyter-collaboration";
-  version = "1.0.1";
+  version = "1.1.0";
+  format = "pyproject";

  disabled = pythonOlder "3.8";

-  format = "pyproject";
-
  src = fetchPypi {
    pname = "jupyter_collaboration";
    inherit version;
-    hash = "sha256-cf7BpF6WSoHQJQW0IXdpCAGTdkX9RNWZ4JovTHvcPho=";
+    hash = "sha256-3OxduJ93TmbS/fKSKmVXs5vj2IZMX5MqKPTeGklFCbM=";
  };

  postPatch = ''
@ -55,14 +54,16 @@ buildPythonPackage rec {
    ypy-websocket
  ];

-  pythonImportsCheck = [ "jupyter_collaboration" ];
-
  nativeCheckInputs = [
    pytest-asyncio
    pytest-jupyter
    pytestCheckHook
  ];

+  pythonImportsCheck = [
+    "jupyter_collaboration"
+  ];
+
  pytestFlagsArray = [
    "-W" "ignore::DeprecationWarning"
  ];
@ -71,11 +72,11 @@ buildPythonPackage rec {
    export HOME=$TEMP
  '';

-  meta = {
-    changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/v${version}/CHANGELOG.md";
+  meta = with lib; {
    description = "JupyterLab Extension enabling Real-Time Collaboration";
    homepage = "https://github.com/jupyterlab/jupyter_collaboration";
-    license = lib.licenses.bsd3;
-    maintainers = lib.teams.jupyter.members;
+    changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/v${version}/CHANGELOG.md";
+    license = licenses.bsd3;
+    maintainers = teams.jupyter.members;
  };
 }
--- a/pkgs/development/python-modules/klaus/default.nix
+++ b/pkgs/development/python-modules/klaus/default.nix
@ -2,13 +2,13 @@

 buildPythonPackage rec {
  pname = "klaus";
-  version = "2.0.2";
+  version = "2.0.3";

  src = fetchFromGitHub {
    owner = "jonashaag";
    repo = pname;
    rev = version;
-    hash = "sha256-kQcza2beyekJhRT9RwSdMIkeyapcUDtjgkapK3rocvg=";
+    hash = "sha256-VAwIdmwdo/Rim2sVlR605Wo5/zkNOMiGkh40qLrENmU=";
  };

  prePatch = ''
--- a/pkgs/development/python-modules/kombu/default.nix
+++ b/pkgs/development/python-modules/kombu/default.nix
@ -27,14 +27,14 @@

 buildPythonPackage rec {
  pname = "kombu";
-  version = "5.3.1";
+  version = "5.3.2";
  format = "setuptools";

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-+9dXLZLAv3HBEqa0UWMVPepae2pwHsFrVown0P0jcPI=";
+    hash = "sha256-C6IT9jCiyydycorvVqxog9w6LxNDXhAEj26X1IUG270=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/logbook/default.nix
+++ b/pkgs/development/python-modules/logbook/default.nix
@ -1,30 +1,87 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, brotli }:
+{ lib
+, brotli
+, buildPythonPackage
+, cython
+, execnet
+, fetchFromGitHub
+, jinja2
+, pytestCheckHook
+, pythonOlder
+, pyzmq
+, redis
+, setuptools
+, sqlalchemy
+}:

 buildPythonPackage rec {
  pname = "logbook";
-  version = "1.5.3";
+  version = "1.6.0";
+  format = "setuptools";

-  src = fetchPypi {
-    pname = "Logbook";
-    inherit version;
-    sha256 = "1s1gyfw621vid7qqvhddq6c3z2895ci4lq3g0r1swvpml2nm9x36";
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "getlogbook";
+    repo = "logbook";
+    rev = "refs/tags/${version}";
+    hash = "sha256-2K6fM6MFrh3l0smhSz8RFd79AIOXQZJQbNLTJM4WZUo=";
  };

-  nativeCheckInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ];
+  nativeBuildInputs = [
+    cython
+    setuptools
+  ];

-  propagatedBuildInputs = [ brotli ];
+  passthru.optional-dependencies = {
+    execnet = [
+      execnet
+    ];
+    sqlalchemy = [
+      sqlalchemy
+    ];
+    redis = [
+      redis
+    ];
+    zmq = [
+      pyzmq
+    ];
+    compression = [
+      brotli
+    ];
+    jinja = [
+      jinja2
+    ];
+    all = [
+      brotli
+      execnet
+      jinja2
+      pyzmq
+      redis
+      sqlalchemy
+    ];
+  };

-  checkPhase = ''
-    find tests -name \*.pyc -delete
-    py.test tests
-  '';
+  nativeCheckInputs = [
+    pytestCheckHook
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);

  # Some of the tests use localhost networking.
  __darwinAllowLocalNetworking = true;

-  meta = {
-    homepage = "https://pythonhosted.org/Logbook/";
+  pythonImportsCheck = [
+    "logbook"
+  ];
+
+  disabledTests = [
+    # Test require Redis instance
+    "test_redis_handler"
+  ];
+
+  meta = with lib; {
    description = "A logging replacement for Python";
-    license = lib.licenses.bsd3;
+    homepage = "https://logbook.readthedocs.io/";
+    changelog = "https://github.com/getlogbook/logbook/blob/${version}/CHANGES";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
+++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
@ -1,22 +1,26 @@
 { lib
+, beautifulsoup4
 , buildPythonPackage
 , drawio-headless
-, fetchPypi
-, pythonOlder
+, fetchFromGitHub
 , mkdocs
-, beautifulsoup4
+, pathspec
+, pytestCheckHook
+, pythonOlder
 }:

 buildPythonPackage rec {
  pname = "mkdocs-swagger-ui-tag";
-  version = "0.6.2";
+  version = "0.6.4";
  format = "setuptools";

  disabled = pythonOlder "3.7";

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-H/eqrwlZntEYoKkJZKiRV+KyzkrDKRirMDDSciFNIGo=";
+  src = fetchFromGitHub {
+    owner = "Blueswen";
+    repo = "mkdocs-swagger-ui-tag";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/Spvj3lt7p+ZUbA/7xaQMLCSmHOOsoCRliqaAN+YU3g=";
  };

  propagatedBuildInputs = [
@ -24,10 +28,22 @@ buildPythonPackage rec {
    beautifulsoup4
  ];

+  nativeCheckInputs = [
+    pathspec
+    pytestCheckHook
+  ];
+
  pythonImportsCheck = [
    "mkdocs_swagger_ui_tag"
  ];

+  disabledTests = [
+    # Don't actually build results
+    "test_material"
+    "test_material_dark_scheme_name"
+    "test_template"
+  ];
+
  meta = with lib; {
    description = "A MkDocs plugin supports for add Swagger UI in page";
    homepage = "https://github.com/Blueswen/mkdocs-swagger-ui-tag";
--- a/pkgs/development/python-modules/neo4j/default.nix
+++ b/pkgs/development/python-modules/neo4j/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "neo4j";
-  version = "5.11.0";
+  version = "5.12.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "neo4j";
    repo = "neo4j-python-driver";
    rev = "refs/tags/${version}";
-    hash = "sha256-xPMO1Db1+TwOT+JsBGJcTc7BL2B8Eb1K3kqKMGnsUmE=";
+    hash = "sha256-feKKBbULkWxEgUaMROvmQph2YTAgSOVDRz/OnpzG9Ac=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/oci/default.nix
+++ b/pkgs/development/python-modules/oci/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "oci";
-  version = "2.110.2";
+  version = "2.111.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "oracle";
    repo = "oci-python-sdk";
    rev = "refs/tags/v${version}";
-    hash = "sha256-4+qP/eCd3xy0Q3Nrwbj2VpyNWqiKL82nrX7Od0yHToo=";
+    hash = "sha256-7lkxk/oFb5DPH3LcOJLJByMaf4xQB8L6FLKrXOn+HsM=";
  };

  pythonRelaxDeps = [
--- a/pkgs/development/python-modules/paddleocr/default.nix
+++ b/pkgs/development/python-modules/paddleocr/default.nix
@ -0,0 +1,111 @@
+{ lib
+, buildPythonPackage
+, pythonRelaxDepsHook
+, fetchFromGitHub
+, attrdict
+, beautifulsoup4
+, cython
+, fire
+, fonttools
+, lmdb
+, lxml
+, numpy
+, opencv4
+, openpyxl
+, pdf2docx
+, pillow
+, premailer
+, pyclipper
+, pymupdf
+, python-docx
+, rapidfuzz
+, scikit-image
+, shapely
+, tqdm
+, paddlepaddle
+, lanms-neo
+, polygon3
+}:
+
+let
+  version = "2.7.0.1";
+in
+buildPythonPackage {
+  pname = "paddleocr";
+  inherit version;
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "PaddlePaddle";
+    repo = "PaddleOCR";
+    rev = "254786752a2659e184822b4b2de5637a05236590";
+    hash = "sha256-M/Fpk9swX9Gds7o5poM9Iv6LOhKoZNbe0Wv9JNMPOU0=";
+  };
+
+  patches = [
+    # The `ppocr.data.imaug` re-exports the `IaaAugment` and `CopyPaste`
+    # classes. These classes depend on the `imgaug` package which is
+    # unmaintained and has been removed from nixpkgs.
+    #
+    # The image OCR feature of PaddleOCR doesn't use these classes though, so
+    # they work even after stripping the the `IaaAugment` and `CopyPaste`
+    # exports. It probably breaks some of the OCR model creation tooling that
+    # PaddleOCR provides, however.
+    ./remove-import-imaug.patch
+  ];
+
+  nativeBuildInputs = [ pythonRelaxDepsHook ];
+  # trying to relax only pymupdf makes the whole build fail
+  pythonRelaxDeps = true;
+  pythonRemoveDeps = [
+    "imgaug"
+    "visualdl"
+    "opencv-python"
+    "opencv-contrib-python"
+  ];
+
+  propagatedBuildInputs = [
+    attrdict
+    beautifulsoup4
+    cython
+    fire
+    fonttools
+    lmdb
+    lxml
+    numpy
+    opencv4
+    openpyxl
+    pdf2docx
+    pillow
+    premailer
+    pyclipper
+    pymupdf
+    python-docx
+    rapidfuzz
+    scikit-image
+    shapely
+    tqdm
+    paddlepaddle
+    lanms-neo
+    polygon3
+  ];
+
+  # TODO: The tests depend, among possibly other things, on `cudatoolkit`.
+  # But Cudatoolkit fails to install.
+  # preCheck = "export HOME=$TMPDIR";
+  # nativeCheckInputs = with pkgs; [ which cudatoolkit ];
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "https://github.com/PaddlePaddle/PaddleOCR";
+    license = licenses.asl20;
+    description = "Multilingual OCR toolkits based on PaddlePaddle";
+    longDescription = ''
+      PaddleOCR aims to create multilingual, awesome, leading, and practical OCR
+      tools that help users train better models and apply them into practice.
+    '';
+    changelog = "https://github.com/PaddlePaddle/PaddleOCR/releases/tag/v${version}";
+    maintainers = with maintainers; [ happysalada ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+  };
+}
--- a/pkgs/development/python-modules/paddleocr/remove-import-imaug.patch
+++ b/pkgs/development/python-modules/paddleocr/remove-import-imaug.patch
@ -0,0 +1,20 @@
+diff --git a/ppocr/data/imaug/__init__.py b/ppocr/data/imaug/__init__.py
+index 121582b4..a6987c75 100644
+--- a/ppocr/data/imaug/__init__.py
+++ b/ppocr/data/imaug/__init__.py
+@@ -16,7 +16,6 @@ from __future__ import division
+ from __future__ import print_function
+ from __future__ import unicode_literals
+ 
+-from .iaa_augment import IaaAugment
+ from .make_border_map import MakeBorderMap
+ from .make_shrink_map import MakeShrinkMap
+ from .random_crop_data import EastRandomCropData, RandomCropImgMask
+@@ -30,7 +29,6 @@ from .rec_img_aug import BaseDataAugmentation, RecAug, RecConAug, RecResizeImg,
+     RFLRecResizeImg, SVTRRecAug
+ from .ssl_img_aug import SSLRotateResize
+ from .randaugment import RandAugment
+-from .copy_paste import CopyPaste
+ from .ColorJitter import ColorJitter
+ from .operators import *
+ from .label_ops import *
--- a/pkgs/development/python-modules/pkg-about/default.nix
+++ b/pkgs/development/python-modules/pkg-about/default.nix
@ -0,0 +1,55 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, importlib-metadata
+, importlib-resources
+, setuptools
+, packaging
+, tomli
+, tox
+}:
+
+buildPythonPackage rec {
+  pname = "pkg-about";
+  version = "1.0.8";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    pname = "pkg_about";
+    inherit version;
+    extension = "zip";
+    hash = "sha256-mb43XbKypgilagXLW33kP8wXxioNsfLtl6AEnOI1WlA=";
+  };
+
+  nativeBuildInputs = [
+    packaging
+    setuptools
+    tox
+  ];
+
+  propagatedBuildInputs = [
+    importlib-metadata
+    importlib-resources
+    packaging
+    setuptools
+    tomli
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "pkg_about"
+  ];
+
+  meta = with lib; {
+    description = "Python metadata sharing at runtime";
+    homepage = "https://github.com/karpierz/pkg_about/";
+    changelog = "https://github.com/karpierz/pkg_about/blob/${version}/CHANGES.rst";
+    license = licenses.zlib;
+    maintainers = [ teams.ororatech ];
+  };
+}
--- a/pkgs/development/python-modules/pyhepmc/default.nix
+++ b/pkgs/development/python-modules/pyhepmc/default.nix
@ -0,0 +1,69 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, cmake
+, setuptools
+, setuptools-scm
+, numpy
+, pybind11
+, wheel
+, pytestCheckHook
+, pythonOlder
+, graphviz
+}:
+
+buildPythonPackage rec {
+  pname = "pyhepmc";
+  version = "2.12.0";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "scikit-hep";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-po1ad02dpY69RRhaRApskH6tdOaSIsCl5PgpjsAzyKo=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    setuptools
+    setuptools-scm
+    wheel
+  ];
+
+  buildInputs = [
+    pybind11
+  ];
+
+  propagatedBuildInputs = [
+    numpy
+  ];
+
+  dontUseCmakeConfigure = true;
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+  CMAKE_ARGS = [ "-DEXTERNAL_PYBIND11=ON" ];
+
+  preBuild = ''
+    export CMAKE_BUILD_PARALLEL_LEVEL="$NIX_BUILD_CORES"
+  '';
+
+  nativeCheckInputs = [
+    graphviz
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pyhepmc" ];
+
+  meta = with lib; {
+    description = "Easy-to-use Python bindings for HepMC3";
+    homepage = "https://github.com/scikit-hep/pyhepmc";
+    changelog = "https://github.com/scikit-hep/pyhepmc/releases/tag/v${version}";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
+
--- a/pkgs/development/python-modules/pytablewriter/default.nix
+++ b/pkgs/development/python-modules/pytablewriter/default.nix
@ -105,11 +105,13 @@ buildPythonPackage rec {
    "pathvalidate"
  ];

-  # Circular dependency
  disabledTests = [
+    # Circular dependency
    "test_normal_from_file"
    "test_normal_from_text"
    "test_normal_clear_theme"
+    # Test compares CLI output
+    "test_normal"
  ];

  disabledTestPaths = [
--- a/pkgs/development/python-modules/pytest-playwright/default.nix
+++ b/pkgs/development/python-modules/pytest-playwright/default.nix
@ -14,16 +14,16 @@

 buildPythonPackage rec {
  pname = "pytest-playwright";
-  version = "0.3.3";
+  version = "0.4.2";
  format = "setuptools";

-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "microsoft";
    repo = "playwright-pytest";
    rev = "refs/tags/v${version}";
-    hash = "sha256-2xdRW8Q10x6mtNs/EdAsgrOtVmvLAOdbIGXfyeB8ZAg=";
+    hash = "sha256-yYFzaIPYOsuvS8bGcuwQQNS/CtvGUe1XQdORmfEJQmU=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/typepy/default.nix
+++ b/pkgs/development/python-modules/typepy/default.nix
@ -26,14 +26,23 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    mbstrdecoder
-    python-dateutil
-    pytz
-    packaging
  ];

+  passthru.optional-dependencies = {
+    datetime = [
+      python-dateutil
+      pytz
+      packaging
+    ];
+  };
+
  nativeCheckInputs = [
    pytestCheckHook
    tcolorpy
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
+
+  pythonImportsCheck = [
+    "typepy"
  ];

  meta = with lib; {
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@ -22,14 +22,14 @@ with py.pkgs;

 buildPythonApplication rec {
  pname = "checkov";
-  version = "2.4.19";
+  version = "2.4.22";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "bridgecrewio";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-A3xKXh2btw+ZUZevbhPOqtTHWNx7ohZILpYM/KInGIg=";
+    hash = "sha256-pbeyv7Ms/7iJUsxEl2YeHjbXJ5ZJZe2OXtDpnnH5ZD8=";
  };

  patches = [
--- a/pkgs/development/tools/biome/default.nix
+++ b/pkgs/development/tools/biome/default.nix
@ -0,0 +1,63 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, libgit2_1_6
+, zlib
+, stdenv
+, darwin
+, git
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "biome";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "biomejs";
+    repo = "biome";
+    rev = "cli/v${version}";
+    hash = "sha256-oX/LyC6JN0NUc/xi4G9lzKgF9yOlooAt69Gw+eLJxbE=";
+  };
+
+  cargoHash = "sha256-4P57fmp5CpGn1wYkQos7PO3YFChup8LrrLExv9S76gs=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libgit2_1_6
+    zlib
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  nativeCheckInputs = [
+    git
+  ];
+
+  cargoBuildFlags = [ "-p=rome_cli" ];
+  cargoTestFlags = cargoBuildFlags;
+
+  env = {
+    BIOME_VERSION = version;
+  };
+
+  preCheck = ''
+    # tests assume git repository
+    git init
+
+    # tests assume $BIOME_VERSION is unset
+    unset BIOME_VERSION
+  '';
+
+  meta = with lib; {
+    description = "Toolchain of the web";
+    homepage = "https://biomejs.dev/";
+    changelog = "https://github.com/biomejs/biome/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "biome";
+  };
+}
--- a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "jsonnet-language-server";
-  version = "0.12.1";
+  version = "0.13.0";

  src = fetchFromGitHub {
    owner = "grafana";
    repo = "jsonnet-language-server";
    rev = "refs/tags/v${version}";
-    hash = "sha256-Z7ovjDt7MoV0/YRDOkidTs6O4vwKAVZyioeaNaehZLQ=";
+    hash = "sha256-8hy+lRh6WqyjInqGD21GHdS0QWz8g0e8MdZbQblv8II=";
  };

-  vendorHash = "sha256-dOs+CasHQt9kcjQENG2rJfTimmkGzayJyGuyE6u8Pz4=";
+  vendorHash = "sha256-/mfwBHaouYN8JIxPz720/7MlMVh+5EEB+ocnYe4B020=";

  ldflags = [
    "-s"
--- a/pkgs/development/tools/misc/act/default.nix
+++ b/pkgs/development/tools/misc/act/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "act";
-  version = "0.2.49";
+  version = "0.2.50";

  src = fetchFromGitHub {
    owner = "nektos";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-dJt8XrcB1rYt6os3enLQz0YuqXNIqQTh85BIJdXwi2A=";
+    hash = "sha256-NVzONabM1EUsA+PUyJ7hBOZmqs5RYfE0teNO6BMBu7M=";
  };

-  vendorHash = "sha256-QPpwYec2Y0x/VOsiTWvObKrNWGGE7dj8Cl5eM2l8ibk=";
+  vendorHash = "sha256-+MQofGGja4JUSWCctY0CWQ2aYpVrXj4/knqd/TW0PtI=";

  doCheck = false;

@ -29,6 +29,6 @@ buildGoModule rec {
    homepage = "https://github.com/nektos/act";
    changelog = "https://github.com/nektos/act/releases/tag/v${version}";
    license = licenses.mit;
-    maintainers = with maintainers; [ Br1ght0ne ];
+    maintainers = with maintainers; [ Br1ght0ne kashw2 ];
  };
 }
--- a/pkgs/development/tools/supabase-cli/default.nix
+++ b/pkgs/development/tools/supabase-cli/default.nix
@ -9,13 +9,13 @@

 buildGoModule rec {
  pname = "supabase-cli";
-  version = "1.86.1";
+  version = "1.88.0";

  src = fetchFromGitHub {
    owner = "supabase";
    repo = "cli";
    rev = "v${version}";
-    sha256 = "sha256-JAs0PScCWsE82cxhUWKjl3fB1EqwR9nh/ESbPd63mc0=";
+    hash = "sha256-OgeKr0xSWp83Ri3WBNsY3TL6tAWsMtsEdD6KeKdPdCw=";
  };

  vendorSha256 = "sha256-efcgpxvhHe6KtNfNYYc5fYv93fJPf63V39d+5AcCvPQ=";
@ -51,7 +51,7 @@ buildGoModule rec {
    description = "A CLI for interacting with supabase";
    homepage = "https://github.com/supabase/cli";
    license = licenses.mit;
-    maintainers = with maintainers; [ gerschtli ];
+    maintainers = with maintainers; [ gerschtli kashw2 ];
    mainProgram = "supabase";
  };
 }
--- a/pkgs/games/unciv/default.nix
+++ b/pkgs/games/unciv/default.nix
@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "unciv";
-  version = "4.7.17-patch1";
+  version = "4.7.19";

  src = fetchurl {
    url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-0kHeTzA9GnTHHV11aGHq6gATnBsW/jaPqKQYhgb1zqg=";
+    hash = "sha256-ABPaI7FivP1yl9q0Ne5L4ZJoTlDwHOz0gegtNRi0u2E=";
  };

  dontUnpack = true;
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@ -9,13 +9,13 @@

 buildDotnetModule rec {
  pname = "jackett";
-  version = "0.21.705";
+  version = "0.21.719";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    hash = "sha512-FgZdWEr+F9GuQQABlEQR6egcxRpvYOaL6T732K2d2326B57HXQpm+xPw0axphBwvZo+u3dw7Tz91HcnGhcDR1w==";
+    hash = "sha512-j2f8qsEEhvFIm2h87eIuOHjVUMtfy14v+FhO8p4JOmIIuhoG1DZ8zL8dgTgLUgtfCoXgvTd10P+cK/VfVuMJLw==";
  };

  projectFile = "src/Jackett.Server/Jackett.Server.csproj";
--- a/pkgs/servers/search/typesense/sources.json
+++ b/pkgs/servers/search/typesense/sources.json
@ -1,17 +1,17 @@
 {
-  "version": "0.24.1",
+  "version": "0.25.0",
  "platforms": {
    "aarch64-linux": {
      "arch": "linux-arm64",
-      "hash": "sha256-TI/bjGqyEZpGDq1F9MBaDypm5XDTlsw9OGd3lIn7JCI="
+      "hash": "sha256-R1ayDJah8EMZVVw5fQpHNXMUMwtOJWEPtx4qz5KbniM="
    },
    "x86_64-linux": {
      "arch": "linux-amd64",
-      "hash": "sha256-bmvje439QYivV96fjnEXblYJnSk8C916OwVeK2n/QR8="
+      "hash": "sha256-/EDDYaGP43LuOq90Vx8z/fmp4ougyuiTP1L5DmQPZ0Q="
    },
    "x86_64-darwin": {
      "arch": "darwin-amd64",
-      "hash": "sha256-24odPFqHWQoGXXXDLxvMDjCRu81Y+I5QOdK/KLdeH5o="
+      "hash": "sha256-M2yUAto7KlNY8zswSXqVwH120QV8OrGljobbZkjUSoQ="
    }
  }
 }
--- a/pkgs/tools/filesystems/stratisd/Cargo.lock
+++ b/pkgs/tools/filesystems/stratisd/Cargo.lock
@ -119,7 +119,7 @@ checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]

 [[package]]
@ -357,8 +357,6 @@ version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
 dependencies = [
- "futures-channel",
- "futures-util",
 "libc",
 "libdbus-sys",
 "winapi",
@ -551,7 +549,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]

 [[package]]
@ -1238,13 +1236,13 @@ checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b"

 [[package]]
 name = "serde_derive"
-version = "1.0.175"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]

 [[package]]
@ -1311,7 +1309,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"

 [[package]]
 name = "stratisd"
-version = "3.5.8"
+version = "3.5.9"
 dependencies = [
 "assert_cmd",
 "assert_matches",
@ -1359,7 +1357,7 @@ dependencies = [

 [[package]]
 name = "stratisd_proc_macros"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
 "proc-macro2",
 "quote",
@ -1385,9 +1383,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.27"
+version = "2.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
+checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
 dependencies = [
 "proc-macro2",
 "quote",
@ -1448,7 +1446,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]

 [[package]]
@ -1533,7 +1531,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 "wasm-bindgen-shared",
 ]

@ -1555,7 +1553,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
--- a/pkgs/tools/filesystems/stratisd/default.nix
+++ b/pkgs/tools/filesystems/stratisd/default.nix
@ -28,13 +28,13 @@

 stdenv.mkDerivation rec {
  pname = "stratisd";
-  version = "3.5.8";
+  version = "3.5.9";

  src = fetchFromGitHub {
    owner = "stratis-storage";
    repo = pname;
    rev = "refs/tags/stratisd-v${version}";
-    hash = "sha256-/Yqruz8gUyfL6zXYwlNvXa9feLBOOT4q4Gl/jxt1cMs=";
+    hash = "sha256-E4bBrbkqEh2twolPIHpHxphMG3bnDj0tjEBUWhrwL+M=";
  };

  cargoDeps = rustPlatform.importCargoLock {
--- a/pkgs/tools/misc/lighthouse-steamvr/Cargo.lock
+++ b/pkgs/tools/misc/lighthouse-steamvr/Cargo.lock
--- a/pkgs/tools/misc/lighthouse-steamvr/default.nix
+++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix
@ -2,19 +2,19 @@

 rustPlatform.buildRustPackage rec {
  pname = "Lighthouse";
-  version = "1.0.0";
+  version = "1.1.1";

  src = fetchFromGitHub {
    owner = "ShayBox";
    repo = pname;
    rev = version;
-    sha256 = "0628v6fq9dcv1w4spgnypgyxf1qw5x03yhasink5s9nqpcip0w4h";
+    sha256 = "0g0cs54j1vmcig5nc8sqgx30nfn2zjs40pvv30j5g9cyyszbzwkw";
  };

  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "clap-verbosity-flag-2.0.0" = "125b8ki3dqj2kilimmvpi9wslwky8xacydi75c2bdrxpi926nya6";
+      "clap-verbosity-flag-2.1.1" = "1213bsb0bpvv6621j9zicjsqy05sv21gh6inrvszqwcmj6fxxc7j";
    };
  };

--- a/pkgs/tools/misc/moar/default.nix
+++ b/pkgs/tools/misc/moar/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "moar";
-  version = "1.15.4";
+  version = "1.16.0";

  src = fetchFromGitHub {
    owner = "walles";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-jZ5CqTs38WotATYyptje3oVszD5ztHbAFRzUMchyK+U=";
+    hash = "sha256-m3IG5xZITh+iAE233NFMI+25VRt6GvK694oVd1wU5jA=";
  };

  vendorHash = "sha256-aFCv6VxHD1bOLhCHXhy4ubik8Z9uvU6AeqcMqIZI2Oo=";
--- a/pkgs/tools/misc/ollama/default.nix
+++ b/pkgs/tools/misc/ollama/default.nix
@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "ollama";
-  version = "0.0.15";
+  version = "0.0.17";

  src = fetchFromGitHub {
    owner = "jmorganca";
    repo = "ollama";
    rev = "v${version}";
-    hash = "sha256-p2YLgLyjmf2MPvFue45+wW7kqKpUli9rX3aWNH08cDk=";
+    hash = "sha256-idsFcjsRD1zPmG742gnYQJcgSWDA2DLMHksCFNe2GiY=";
  };

  buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@ -5,11 +5,11 @@

 stdenv.mkDerivation rec {
  pname = "xdaliclock";
-  version = "2.47";
+  version = "2.48";

  src = fetchurl {
    url = "https://www.jwz.org/xdaliclock/${pname}-${version}.tar.gz";
-    hash = "sha256-1Jkv9iulvyY+b5KryDr8s+v8LU95hcVi7PJQsL1rUL4=";
+    hash = "sha256-BZiqjTSSAgvT/56OJDcKh4pDP9uqVhR5cCx89H+5FLQ=";
  };

  # Note: don't change this to set sourceRoot, or updateAutotoolsGnuConfigScriptsHook
--- a/pkgs/tools/networking/ipinfo/default.nix
+++ b/pkgs/tools/networking/ipinfo/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "ipinfo";
-  version = "2.10.1";
+  version = "3.0.1";

  src = fetchFromGitHub {
    owner = pname;
    repo = "cli";
    rev = "refs/tags/${pname}-${version}";
-    hash = "sha256-/CW+CmtKc96tVEh5cB6x+/Hb4WnbVi+3AZ0CEao0NE4=";
+    hash = "sha256-b6Rh5TJHqcdexZ4AHY+4jQsCMdn69J3MTbmgKXEaACw=";
  };

-  vendorSha256 = null;
+  vendorHash = null;

  # Tests require network access
  doCheck = false;
--- a/pkgs/tools/security/clairvoyance/default.nix
+++ b/pkgs/tools/security/clairvoyance/default.nix
@ -5,14 +5,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "clairvoyance";
-  version = "2.0.6";
+  version = "2.5.3";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "nikitastupin";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-Jsb/UjqAppAUz9AGgON6AyVgUdOY6aswjQ9EL939Kro=";
+    hash = "sha256-CVXa2HvX7M0cwqnTeZVETg07j324ATQuMNreEgAC2QA=";
  };

  nativeBuildInputs = with python3.pkgs; [
@ -21,6 +21,7 @@ python3.pkgs.buildPythonApplication rec {

  propagatedBuildInputs = with python3.pkgs; [
    aiohttp
+    rich
  ];

  nativeCheckInputs = with python3.pkgs; [
@ -45,6 +46,7 @@ python3.pkgs.buildPythonApplication rec {
  meta = with lib; {
    description = "Tool to obtain GraphQL API schemas";
    homepage = "https://github.com/nikitastupin/clairvoyance";
+    changelog = "https://github.com/nikitastupin/clairvoyance/releases/tag/v${version}";
    license = with licenses; [ asl20 ];
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/tools/security/cosign/default.nix
+++ b/pkgs/tools/security/cosign/default.nix
@ -13,13 +13,13 @@
 }:
 buildGoModule rec {
  pname = "cosign";
-  version = "2.1.1";
+  version = "2.2.0";

  src = fetchFromGitHub {
    owner = "sigstore";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-5dRrq+mV2fDGTi2WZHlCP8+GH3cBJIE8AHGuch7hv/I=";
+    hash = "sha256-VE/rm85KZs3JWMsidIlUGJ9JrtZ4VBI+Go1yujq7z1s=";
  };

  buildInputs =
@ -28,7 +28,7 @@ buildGoModule rec {

  nativeBuildInputs = [ pkg-config installShellFiles ];

-  vendorHash = "sha256-y9bUwyQMYw4m7JZ6RpTlcYZOiCoxaQRiWYKNmgzEXJA=";
+  vendorHash = "sha256-mpT4/BS/NofMueBbwhh4v6pNEONEpWM9RDKuYZ+9BtA=";

  subPackages = [
    "cmd/cosign"
--- a/pkgs/tools/security/grype/default.nix
+++ b/pkgs/tools/security/grype/default.nix
@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "grype";
-  version = "0.65.2";
+  version = "0.66.0";

  src = fetchFromGitHub {
    owner = "anchore";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-ST+fJfkViQubCWVMY2BbOgE7tOpXjCX1ATLBmLmvMiY=";
+    hash = "sha256-oZSXUwWucSyd2JYx0TkYfxgP6NZjjA2bhTrlOJSNh8c=";
    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
    leaveDotGit = true;
@ -28,7 +28,7 @@ buildGoModule rec {

  proxyVendor = true;

-  vendorHash = "sha256-HaqJ1Pc0A29D0HielGhP6uxkVccB8JyUrm0Q5nW8teU=";
+  vendorHash = "sha256-Ur68es1eXsIldXqZjBbtMoK2fjvTIZ+ae2cWaiNzfBg=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -7045,6 +7045,8 @@ with pkgs;

  biodiff = callPackage ../development/tools/biodiff { };

+  biome = callPackage ../development/tools/biome { };
+
  biosdevname = callPackage ../tools/networking/biosdevname { };

  bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -1215,6 +1215,8 @@ self: super: with self; {

  paddle2onnx = callPackage ../development/python-modules/paddle2onnx { };

+  paddleocr = callPackage ../development/python-modules/paddleocr { };
+
  paddlepaddle = callPackage ../development/python-modules/paddlepaddle { };

  pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; };
@ -7982,6 +7984,8 @@ self: super: with self; {

  pkgutil-resolve-name = callPackage ../development/python-modules/pkgutil-resolve-name { };

+  pkg-about = callPackage ../development/python-modules/pkg-about { };
+
  micloud = callPackage ../development/python-modules/micloud { };

  mqtt2influxdb = callPackage ../development/python-modules/mqtt2influxdb { };
@ -8190,6 +8194,8 @@ self: super: with self; {

  pyheos = callPackage ../development/python-modules/pyheos { };

+  pyhepmc = callPackage ../development/python-modules/pyhepmc { };
+
  pyhiveapi = callPackage ../development/python-modules/pyhiveapi { };

  pyhumps = callPackage ../development/python-modules/pyhumps { };