Merge staging-next-24.11 into staging-24.11

2026-10-02 13:00:23 +00:00 · 2025-03-28 00:18:04 +00:00
parent f001047ba7 888d7b2ad7
commit b64e1aee4b
31 changed files with 1534 additions and 845 deletions
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -9,10 +9,10 @@

 buildMozillaMach rec {
  pname = "firefox";
-  version = "136.0.2";
+  version = "136.0.3";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "50dfbedb6bd513a3c6cf90558d7c6993cc78558cccc69fcc882f8e54eb8e8bec9779dce6fb7211c1a0234ac4a189438c5fa55ee9d0d06fcbae5cf44778af2ef1";
+    sha512 = "59cb54bc946aecea810169970aad4ba3f7b3092e56f15f86ff3d51fa2752c89632a057a1bda016f0005665ec5099d9b9f9a4786b9c02e3f5656eb2003b6a1747";
  };

  meta = {
--- a/pkgs/applications/networking/cluster/rke2/default.nix
+++ b/pkgs/applications/networking/cluster/rke2/default.nix
@@ -25,13 +25,19 @@ in
    }
  ) extraArgs;

-  rke2_testing = common (
-    (import ./testing/versions.nix)
-    // {
-      updateScript = [
-        ./update-script.sh
-        "testing"
-      ];
-    }
-  ) extraArgs;
+  rke2_testing =
+    (common (
+      (import ./testing/versions.nix)
+      // {
+        updateScript = [
+          ./update-script.sh
+          "testing"
+        ];
+      }
+    ) extraArgs).overrideAttrs
+      {
+        meta.knownVulnerabilities = [
+          "The RKE2 testing channel no longer serves releases, this package will not receive updates."
+        ];
+      };
 }
--- a/pkgs/applications/networking/cluster/rke2/latest/versions.nix
+++ b/pkgs/applications/networking/cluster/rke2/latest/versions.nix
@@ -1,14 +1,14 @@
 {
-  rke2Version = "1.31.1+rke2r1";
-  rke2Commit = "909d20d6a28cd7656b7177190f06f69f57927613";
-  rke2TarballHash = "sha256-9ZryOX6QMNpjDtsOXLOVNPjCc6AMAa+XDLOn1EpyCcg=";
-  rke2VendorHash = "sha256-7nWbWi4oJTOWZ5iZr9ptECDJJakPg4qZ7hW+tU7LBsI=";
-  k8sVersion = "v1.31.1";
-  k8sImageTag = "v1.31.1-rke2r1-build20240912";
-  etcdVersion = "v3.5.13-k3s1-build20240910";
+  rke2Version = "1.32.3+rke2r1";
+  rke2Commit = "18005e93ee0b015b78be47cf6515ae6d3a9afd55";
+  rke2TarballHash = "sha256-rDqSq38WoNN+9dMPTg/iteqkfX/pnlRtzt1HmhkAbRI=";
+  rke2VendorHash = "sha256-GwwNXW4JmhvO47V9SysOiKTfK2z55PkWpTDUE2qJgpA=";
+  k8sVersion = "v1.32.3";
+  k8sImageTag = "v1.32.3-rke2r1-build20250312";
+  etcdVersion = "v3.5.19-k3s1-build20250306";
  pauseVersion = "3.6";
-  ccmVersion = "v1.31.0-build20240910";
-  dockerizedVersion = "v1.31.1-rke2r1";
-  golangVersion = "go1.22.6";
-  eol = "2025-10-28";
+  ccmVersion = "v1.32.0-rc3.0.20241220224140-68fbd1a6b543-build20250101";
+  dockerizedVersion = "v1.32.3-rke2r1";
+  golangVersion = "go1.23.6";
+  eol = "2026-02-28";
 }
--- a/pkgs/applications/networking/cluster/rke2/stable/versions.nix
+++ b/pkgs/applications/networking/cluster/rke2/stable/versions.nix
@@ -1,14 +1,14 @@
 {
-  rke2Version = "1.30.5+rke2r1";
-  rke2Commit = "0c83bc82315cd61664880d0b52a7e070e9fbd623";
-  rke2TarballHash = "sha256-K5e7TNlL97PQ13IYnr4PSrXb4XaGJT9bPq55iWL0m1g=";
-  rke2VendorHash = "sha256-QIcVyWnedKNF10OqJ2WmZqZeKA+8hvwDQ4Pl+WUOEJY=";
-  k8sVersion = "v1.30.5";
-  k8sImageTag = "v1.30.5-rke2r1-build20240912";
-  etcdVersion = "v3.5.13-k3s1-build20240910";
+  rke2Version = "1.31.7+rke2r1";
+  rke2Commit = "7b18bda1c5ec1e110cec206f9163f6aba3a2154d";
+  rke2TarballHash = "sha256-u7U5eGLTrm1mxatl3v4iCBzw/Rin8wlndSs/OKLWtiw=";
+  rke2VendorHash = "sha256-UiFpAZHic2GVvdW4RDJxH2j5N2x8ec43YFfvBDR4fyM=";
+  k8sVersion = "v1.31.7";
+  k8sImageTag = "v1.31.7-rke2r1-build20250312";
+  etcdVersion = "v3.5.19-k3s1-build20250306";
  pauseVersion = "3.6";
-  ccmVersion = "v1.30.4-build20240910";
-  dockerizedVersion = "v1.30.5-rke2r1";
-  golangVersion = "go1.22.6";
-  eol = "2025-06-28";
+  ccmVersion = "v1.31.2-0.20241016053446-0955fa330f90-build20241016";
+  dockerizedVersion = "v1.31.7-rke2r1";
+  golangVersion = "go1.23.6";
+  eol = "2025-10-28";
 }
--- a/pkgs/applications/office/libreoffice/darwin/default.nix
+++ b/pkgs/applications/office/libreoffice/darwin/default.nix
@@ -9,21 +9,21 @@
 let
  appName = "LibreOffice.app";
  scriptName = "soffice";
-  version = "7.6.7";
+  version = "25.2.1";

  dist = {
    aarch64-darwin = rec {
      arch = "aarch64";
      archSuffix = arch;
      url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
-      sha256 = "17686aff42734ea4feef08e1189bab3011220000f7784061314c1ae9e5942531";
+      sha256 = "d0f8573dfc5d1a858061a9bc7889313cb6837db8a8f1b568d067ca156c03745e";
    };

    x86_64-darwin = rec {
      arch = "x86_64";
      archSuffix = "x86-64";
      url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
-      sha256 = "42d2eeaeee7bcb0e76e9decdcb8f5a4beebf133ad31f7d42a5e96ea770860110";
+      sha256 = "88746b5e46a72ae964ed2275399ee0fb2a0712f6d93a30b151358ffa0ea8349a";
    };
  };
 in
--- a/pkgs/by-name/ca/calibre-web/package.nix
+++ b/pkgs/by-name/ca/calibre-web/package.nix
@@ -1,56 +1,24 @@
-{ lib
-, fetchFromGitHub
-, nixosTests
-, nix-update-script
-, python3
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+  nixosTests,
+  python3Packages,
 }:

-let
-  python = python3.override {
-    self = python;
-    packageOverrides = self: super: {
-      sqlalchemy = super.sqlalchemy_1_4;
-    };
-  };
-in
-python.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
  pname = "calibre-web";
-  version = "0.6.22";
+  version = "0.6.24";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "janeczku";
    repo = "calibre-web";
-    rev = version;
-    hash = "sha256-nWZmDasBH+DW/+Cvw510mOv11CXorRnoBwNFpoKPErY=";
+    tag = version;
+    hash = "sha256-DYhlD3ly6U/e5cDlsubDyW1uKeCtB+HrpagJlNDJhyI=";
  };

-  propagatedBuildInputs = with python.pkgs; [
-    advocate
-    apscheduler
-    babel
-    bleach
-    chardet
-    flask
-    flask-babel
-    flask-limiter
-    flask-login
-    flask-principal
-    flask-wtf
-    iso-639
-    jsonschema
-    lxml
-    pypdf
-    python-magic
-    pytz
-    regex
-    requests
-    sqlalchemy
-    tornado
-    unidecode
-    wand
-    werkzeug
-  ];
-
  patches = [
    # default-logger.patch switches default logger to /dev/stdout. Otherwise calibre-web tries to open a file relative
    # to its location, which can't be done as the store is read-only. Log file location can later be configured using UI
@@ -68,24 +36,121 @@ python.pkgs.buildPythonApplication rec {
    mv cps.py src/calibreweb/__init__.py
    mv cps src/calibreweb

-    substituteInPlace setup.cfg \
-      --replace-fail "cps = calibreweb:main" "calibre-web = calibreweb:main"
+    substituteInPlace pyproject.toml \
+      --replace-fail 'cps = "calibreweb:main"' 'calibre-web = "calibreweb:main"'
  '';

-  # Upstream repo doesn't provide any tests.
-  doCheck = false;
+  build-system = [ python3Packages.setuptools ];
+
+  dependencies = with python3Packages; [
+    apscheduler
+    babel
+    bleach
+    chardet
+    cryptography
+    flask
+    flask-babel
+    flask-httpauth
+    flask-limiter
+    flask-principal
+    flask-wtf
+    iso-639
+    lxml
+    netifaces-plus
+    pycountry
+    pypdf
+    python-magic
+    pytz
+    regex
+    requests
+    sqlalchemy
+    tornado
+    unidecode
+    urllib3
+    wand
+  ];
+
+  optional-dependencies = {
+    comics = with python3Packages; [
+      comicapi
+      natsort
+    ];
+
+    gdrive = with python3Packages; [
+      gevent
+      google-api-python-client
+      greenlet
+      httplib2
+      oauth2client
+      pyasn1-modules
+      # https://github.com/NixOS/nixpkgs/commit/bf28e24140352e2e8cb952097febff0e94ea6a1e
+      # pydrive2
+      pyyaml
+      rsa
+      uritemplate
+    ];
+
+    gmail = with python3Packages; [
+      google-api-python-client
+      google-auth-oauthlib
+    ];
+
+    # We don't support the goodreads feature, as the `goodreads` package is
+    # archived and depends on other long unmaintained packages (rauth & nose)
+    # goodreads = [ ];
+
+    kobo = with python3Packages; [ jsonschema ];
+
+    ldap = with python3Packages; [
+      flask-simpleldap
+      python-ldap
+    ];
+
+    metadata = with python3Packages; [
+      faust-cchardet
+      html2text
+      markdown2
+      mutagen
+      py7zr
+      pycountry
+      python-dateutil
+      rarfile
+      scholarly
+    ];
+
+    oauth = with python3Packages; [
+      flask-dance
+      sqlalchemy-utils
+    ];
+  };
+
+  pythonRelaxDeps = [
+    "apscheduler"
+    "bleach"
+    "cryptography"
+    "flask"
+    "flask-limiter"
+    "lxml"
+    "pypdf"
+    "regex"
+  ];
+
+  nativeCheckInputs = lib.flatten (lib.attrValues optional-dependencies);
+
+  pythonImportsCheck = [ "calibreweb" ];

  passthru = {
-    tests.calibre-web = nixosTests.calibre-web;
+    tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) calibre-web; };
    updateScript = nix-update-script { };
  };

-  meta = with lib; {
+  meta = {
    description = "Web app for browsing, reading and downloading eBooks stored in a Calibre database";
    homepage = "https://github.com/janeczku/calibre-web";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ pborzenkov ];
-    platforms = platforms.all;
+    changelog = "https://github.com/janeczku/calibre-web/releases/tag/${src.tag}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ pborzenkov ];
    mainProgram = "calibre-web";
+    platforms = lib.platforms.all;
  };
 }
--- a/pkgs/by-name/ex/exim/package.nix
+++ b/pkgs/by-name/ex/exim/package.nix
@@ -39,11 +39,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "exim";
-  version = "4.98.1";
+  version = "4.98.2";

  src = fetchurl {
    url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz";
-    hash = "sha256-2Fi3WtLMa/cckHG6JqVbPqmt0mYHvYMt88tU+CIhws4=";
+    hash = "sha256-iLjopnwdtswLHRSBYao25mL0yi/vJdW282lNSQ5C3K4=";
  };

  enableParallelBuilding = true;
--- a/pkgs/by-name/ex/extra-container/package.nix
+++ b/pkgs/by-name/ex/extra-container/package.nix
@@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "extra-container";
-  version = "0.12";
+  version = "0.13";

  src = fetchFromGitHub {
    owner = "erikarvstedt";
    repo = pname;
    rev = version;
-    hash = "sha256-/5wPv962ZHvZoZMOr4nMz7qcvbzlExRYS2nrnay/PU8=";
+    hash = "sha256-vgh3TqfkFdnPxREBedw4MQehIDc3N8YyxBOB45n+AvU=";
  };

  buildCommand = ''
--- a/pkgs/by-name/ke/key/deps.json
+++ b/pkgs/by-name/ke/key/deps.json
@@ -21,23 +21,28 @@
   "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=",
   "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4="
  },
-  "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.16.0": {
-   "pom": "sha256-t7fpzal2JnrDlnQg2XKuFdCUKpaOAao/w001t4FqJB8="
+  "com/diffplug/durian#durian-swt.os/4.2.2": {
+   "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=",
+   "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=",
+   "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU="
  },
-  "com/diffplug/spotless#spotless-lib-extra/2.36.0": {
-   "jar": "sha256-MZG1Gw6vUU0mzly9R+1gf9mrJj7QovAYqBkBYR+IbB4=",
-   "module": "sha256-8aXEkvFOqReh69NvxgccnJN2Zkla5crmxIo+Gk5ydWA=",
-   "pom": "sha256-nvcS3CwkJ9Hc7ZuCUwT2N2qsGrZbnW0weWVQaYqaJ5c="
+  "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.25.0": {
+   "pom": "sha256-9FyCsS+qzYWs1HTrppkyL6XeqIQIskfQ5L3pQSkIIjo="
  },
-  "com/diffplug/spotless#spotless-lib/2.36.0": {
-   "jar": "sha256-X8YG5rHmDzRUljPq3WvjuL78W5phU4h1S2EpdShJ8W4=",
-   "module": "sha256-aPxoow80oNLAqh/z8l9Rq9OnJZFzX7cVR4YIARJjCCE=",
-   "pom": "sha256-XOa+58kXCmyUnZTvtzrRWbcBckyR3KT8kHWRfJ5aEMk="
+  "com/diffplug/spotless#spotless-lib-extra/2.45.0": {
+   "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=",
+   "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=",
+   "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A="
  },
-  "com/diffplug/spotless#spotless-plugin-gradle/6.16.0": {
-   "jar": "sha256-4O/38KyEdJg/vJLxYwLHgq8VZueixfHaSoyWB9pMKhs=",
-   "module": "sha256-kT7gdWRyP7wqf62KiHFJvk8TpM65u775lF6m9fZt0Po=",
-   "pom": "sha256-c2VdzN3MnbLEY9abWSaedUrpw8ueVIIiDc1DvsE1TKM="
+  "com/diffplug/spotless#spotless-lib/2.45.0": {
+   "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=",
+   "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=",
+   "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw="
+  },
+  "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": {
+   "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=",
+   "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=",
+   "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo="
  },
  "com/fasterxml#oss-parent/48": {
   "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8="
@@ -73,9 +78,9 @@
   "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=",
   "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE="
  },
-  "com/googlecode/javaewah#JavaEWAH/1.1.13": {
-   "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=",
-   "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q="
+  "com/googlecode/javaewah#JavaEWAH/1.2.3": {
+   "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=",
+   "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM="
  },
  "com/mycila#license-maven-plugin-parent/3.0": {
   "pom": "sha256-DR8XPOud8hKSZ2Z8EMiR5eXXJm2C46hQcGaNtW2wy/o="
@@ -95,6 +100,24 @@
   "jar": "sha256-hw+TlnieL0inuPso38BwwvjnSyAHJ0ziPmm2WBEP0pQ=",
   "pom": "sha256-64P2FpRcjH37TYDm+QnnKG9SO7EQd4ArzSFr1w6ccXo="
  },
+  "com/squareup/okhttp3#okhttp/4.12.0": {
+   "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=",
+   "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=",
+   "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg="
+  },
+  "com/squareup/okio#okio-jvm/3.6.0": {
+   "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=",
+   "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=",
+   "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8="
+  },
+  "com/squareup/okio#okio/3.6.0": {
+   "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=",
+   "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU="
+  },
+  "commons-codec#commons-codec/1.16.0": {
+   "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=",
+   "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ="
+  },
  "commons-io#commons-io/2.11.0": {
   "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=",
   "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k="
@@ -107,6 +130,11 @@
   "jar": "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=",
   "pom": "sha256-0PLhbQVOi7l63ZyiZSXrI0b2koCfzSooeH2ozrPDXug="
  },
+  "dev/equo/ide#solstice/1.7.5": {
+   "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=",
+   "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=",
+   "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8="
+  },
  "gradle/plugin/com/hierynomus/gradle/plugins#license-gradle-plugin/0.16.1": {
   "jar": "sha256-vTz8QElIBmJZ+vHfCRGMxU14s9VpaFSAi31bOzurpi0=",
   "pom": "sha256-XHYxuV84us2anPOguyxUlADYH1qSt2YCSA6KSFgWptQ="
@@ -138,6 +166,9 @@
  "org/apache#apache/27": {
   "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
  },
+  "org/apache#apache/29": {
+   "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c="
+  },
  "org/apache#apache/4": {
   "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ="
  },
@@ -181,6 +212,9 @@
  "org/apache/commons#commons-parent/52": {
   "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
  },
+  "org/apache/commons#commons-parent/58": {
+   "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA="
+  },
  "org/apache/commons#commons-pool2/2.2": {
   "jar": "sha256-h4Czu7Mah5fnTp8wIvBD3a3Crui+Y9lPgIKmoWVGxBs=",
   "pom": "sha256-SPll6CQtvwF4bQqS0K1j4gogHUpTbgMh0DsQ0uDJgVM="
@@ -259,17 +293,50 @@
  "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": {
   "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM="
  },
-  "org/eclipse/jgit#org.eclipse.jgit-parent/6.4.0.202211300538-r": {
-   "pom": "sha256-WEE7RzI80aRWLJNcZy1VGVUruaYRuQP8igcwXlQ7icU="
+  "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": {
+   "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8="
  },
-  "org/eclipse/jgit#org.eclipse.jgit/6.4.0.202211300538-r": {
-   "jar": "sha256-wUh5ierbU71YpHty+waWNjl7uN/t8hOHpAqGw+ey+qw=",
-   "pom": "sha256-9ja7QmqoCtQGzr1zKrEXw9cHLBFsupggIYRSnO+mnFY="
+  "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": {
+   "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=",
+   "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI="
+  },
+  "org/eclipse/platform#org.eclipse.osgi/3.18.300": {
+   "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=",
+   "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ="
  },
  "org/jdom#jdom2/2.0.6.1": {
   "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=",
   "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M="
  },
+  "org/jetbrains#annotations/13.0": {
+   "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
+   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": {
+   "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=",
+   "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": {
+   "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": {
+   "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=",
+   "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": {
+   "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": {
+   "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=",
+   "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": {
+   "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/1.9.10": {
+   "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=",
+   "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I="
+  },
  "org/junit#junit-bom/5.7.2": {
   "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=",
   "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs="
@@ -278,6 +345,10 @@
   "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=",
   "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw="
  },
+  "org/junit#junit-bom/5.9.3": {
+   "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=",
+   "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc="
+  },
  "org/ow2#ow2/1.5.1": {
   "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
  },
@@ -293,12 +364,12 @@
   "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=",
   "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q="
  },
-  "org/slf4j#slf4j-api/1.7.30": {
-   "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=",
-   "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ="
+  "org/slf4j#slf4j-api/1.7.36": {
+   "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=",
+   "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ="
  },
-  "org/slf4j#slf4j-parent/1.7.30": {
-   "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U="
+  "org/slf4j#slf4j-parent/1.7.36": {
+   "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI="
  },
  "org/sonatype/forge#forge-parent/4": {
   "pom": "sha256-GDjRMkeQBbS3RZt5jp2ZFVFQkMKICC/c2G2wsQmDokw="
@@ -335,6 +406,10 @@
  "org/springframework#spring-parent/3.1.3.RELEASE": {
   "pom": "sha256-ZOkRARj4KhQnWaMW0J09jY1xfV2VB51/aziO5Hn6eC8="
  },
+  "org/tukaani#xz/1.9": {
+   "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=",
+   "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo="
+  },
  "org/vafer#jdependency/2.8.0": {
   "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=",
   "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0="
@@ -349,16 +424,16 @@
   "jar": "sha256-9XWbf838g6UloDbe7cvTLltTa2JevCgkJvFsoTfrWQI=",
   "pom": "sha256-dwRxCQykChe55DbuLsAIGb5CBC2m9Ahezh03kW3Aj/k="
  },
-  "ch/qos/logback#logback-classic/1.4.8": {
-   "jar": "sha256-5tnBIIv2ZMQnufX+lwuDcveUJHRzaTw/XSRA+mt7tSc=",
-   "pom": "sha256-GOI+XJts04m55gnu7km1XRURtdE6g+/2peAFAJPYadk="
+  "ch/qos/logback#logback-classic/1.5.7": {
+   "jar": "sha256-fLF/axL9pO5pGRYEjKeprk0bDNvmgSWs+dbi2v2ywX0=",
+   "pom": "sha256-xu/O1xfr0JOrhQE78w+G8vw8KyrpOQtbEZkzQ+GJGMM="
  },
-  "ch/qos/logback#logback-core/1.4.8": {
-   "jar": "sha256-EjRTFCtBtie8DQNdH+6MHtTer6z72svjojiTTBmgYno=",
-   "pom": "sha256-njguj3OLVBiXfjwQwcFZJuXwHn1QDVHZmqpQxqSerMw="
+  "ch/qos/logback#logback-core/1.5.7": {
+   "jar": "sha256-wyspr2nCAe/eaGIl+LQ5+QU+iOyqrBEMAvy+G0cj+tw=",
+   "pom": "sha256-wUBD7EJzFU9mAbrmNZ+EldTDIbC51lIDEi3PqS9ozpc="
  },
-  "ch/qos/logback#logback-parent/1.4.8": {
-   "pom": "sha256-83hJR2Jabz7XbSgtoOIuYVJ/kOfvllGm1ezx0mwY2mY="
+  "ch/qos/logback#logback-parent/1.5.7": {
+   "pom": "sha256-jKYZjNN538JvvZ9nzbMR8+pF0KQXlAaQsnVEuyK8kmM="
  },
  "com/beust#jcommander/1.48": {
   "jar": "sha256-pzE/z94HCTDkDsee3zxZSM805PDSXLOgn5lj2L3YQRM=",
@@ -408,16 +483,16 @@
   "jar": "sha256-PfVyskCmjRO1zXeK0jk+iF0mQRQ0zY8JisWYfqLmTOM=",
   "pom": "sha256-Pe8rKa9KGa2AXLFTBWklqJqQP5L77hre4S7S/BTETug="
  },
-  "com/miglayout#miglayout-core/11.1": {
-   "jar": "sha256-6qoDeHmJuuyi1xVYVFL3oWTYydUFkXcx6Zm0+ODZywQ=",
-   "pom": "sha256-TDxDWInIEEIAP7RqrD9Q1DqjNHCgJTaEEpFY+FmFu8I="
+  "com/miglayout#miglayout-core/11.4.2": {
+   "jar": "sha256-HCP2KNjyp6G3LI9jTGd10aj9AQD88Fv1DXoqyNr7DmI=",
+   "pom": "sha256-VNPQ8pqW7Ox2LM5+/aCafk144UrX8akpnc2KbUIeAa0="
  },
-  "com/miglayout#miglayout-parent/11.1": {
-   "pom": "sha256-vLy8hQYQqWkqV1US2xVPt+YMuXUrMzNKLeaqFZFP2xE="
+  "com/miglayout#miglayout-parent/11.4.2": {
+   "pom": "sha256-s5BMe0+/4LUeW9RcmyVDkE1PKGO69DMJVT+fF0owAZc="
  },
-  "com/miglayout#miglayout-swing/11.1": {
-   "jar": "sha256-U8pq8ys32FhvuVCHZeJy30ry2Q5NWewMx/6+Jp0W2f0=",
-   "pom": "sha256-si//ijUkv+cV545/Ze+Fv1H9jGry06FmZxfEsWt6yh4="
+  "com/miglayout#miglayout-swing/11.4.2": {
+   "jar": "sha256-A2uFMgIQkq/McVnTdWCGpfvhn2AUrIR0gX1V0Sia91Y=",
+   "pom": "sha256-3/AMAxxS3Apf8mj0UvRRzpnrpnbOvEJvJaKXgN5Tu5A="
  },
  "com/puppycrawl/tools#checkstyle/10.6.0": {
   "jar": "sha256-MTe8hcSBsytp9K2S0grpnZ0VKBFXwCG2VBpNup2TPBY=",
@@ -439,9 +514,15 @@
   "jar": "sha256-P2/7EM6FPvL2+TS0Z8zBPJwXCLTYOhpWZP2wfgeOjhw=",
   "pom": "sha256-TeCd0zhFd9Vzo9lP85jNe4SUbEJkDzhSva2X9yl0YXQ="
  },
-  "junit#junit/4.13.2": {
-   "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
-   "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
+  "io/github/eisop#checker-qual/3.42.0-eisop4": {
+   "jar": "sha256-D/jgda/4I/dlGT+egBEtbXzYgPCeEQGU/9bZ3UIxvNY=",
+   "module": "sha256-/mEgQEliAvzc8ztAAL/CAwrom16g1C4WcE8H7nAyCQY=",
+   "pom": "sha256-BAVDiaDCD2+w2DRQhwx+g4OhtSpPnnH9Hp4QT0st7Dk="
+  },
+  "io/github/eisop#checker-util/3.42.0-eisop4": {
+   "jar": "sha256-gg5SfOZqAB9Yq9uOGSMCzLI8WIRxi+HWByGRfcCHEUc=",
+   "module": "sha256-SOvu5cjs6eEMxBDHvjrd+G/DpztaoRPZWhKrgYJwRvo=",
+   "pom": "sha256-DoQ00PM0h6i/9JpEMbrvXzIA8P5awQnMlMGHRTdtyOk="
  },
  "net/java/dev/javacc#javacc/4.0": {
   "jar": "sha256-z7qy1qzbN2TivLXAhCpZ9YPLXoui61wTqNuYNoqtzC8=",
@@ -503,8 +584,8 @@
  "org/antlr#antlr4-master/4.11.1": {
   "pom": "sha256-cupd6Nq7ZhV4X9D+qqur1T3NrnD+FrzXx7lobApuAK0="
  },
-  "org/antlr#antlr4-master/4.13.0": {
-   "pom": "sha256-IiBv17pJUVLlJvUO/sn8j03QX8tD38+PJk6Dffa2Qk8="
+  "org/antlr#antlr4-master/4.13.2": {
+   "pom": "sha256-Ct2gJmhYc/ZRNgF4v/xEbO7kgzCBc5466dbo8H6NkCo="
  },
  "org/antlr#antlr4-master/4.7.2": {
   "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE="
@@ -513,17 +594,17 @@
   "jar": "sha256-4GxlU8HMwU02BS7EsPxvE7gIz5V7Wx3D9hv0AZlq2lk=",
   "pom": "sha256-xFbsKVkHjFkfvX72mtlACnJ5IAaNdGmJx0q4BO1oGzQ="
  },
-  "org/antlr#antlr4-runtime/4.13.0": {
-   "jar": "sha256-vX97XQe8CwR/EJFbMspLsd6eV9gEkJiILkRTyIwHal0=",
-   "pom": "sha256-GY40+1rHWXsaPDGTAwHgjOlB5cpQQRbdVKOnU3iRSn8="
+  "org/antlr#antlr4-runtime/4.13.2": {
+   "jar": "sha256-3T6KE6LWab+E+42DTeNc5IdfJxV2mNIGJB7ISIqtyvc=",
+   "pom": "sha256-A84HonlsURsMlNwU/YbM3W44KMV5Z60jg94wTg0Runk="
  },
  "org/antlr#antlr4-runtime/4.7.2": {
   "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=",
   "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs="
  },
-  "org/antlr#antlr4/4.13.0": {
-   "jar": "sha256-HA3rJpklFJIvuLmWGRmPCcMveYQkbcatHDu8SYPeHTU=",
-   "pom": "sha256-OdLSWEk8QnvL1EAGP34PQqt4j6wVp4wP73RK5hk2d8k="
+  "org/antlr#antlr4/4.13.2": {
+   "jar": "sha256-5vCxDSrSBvM4r+FoZ/xHFItnKdbjomDqKDebkfA6Nlc=",
+   "pom": "sha256-gJ7klwbc42dJiLq/ytNrPFoOL9XPoKUSCRA5Y+hXJhs="
  },
  "org/apache#apache/16": {
   "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4="
@@ -534,6 +615,10 @@
  "org/apache#apache/23": {
   "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
  },
+  "org/apache-extras/beanshell#bsh/2.0b6": {
+   "jar": "sha256-oXlVl2BwwFcyNe5mLyeUp4CCdYthrM/86NP4rtzZEEc=",
+   "pom": "sha256-Z5vo8Sqihk98KG9/W8usg2WFHAGCHeW5mhLW93L1IeY="
+  },
  "org/apache/commons#commons-lang3/3.8.1": {
   "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=",
   "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU="
@@ -573,59 +658,48 @@
   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
  },
-  "org/beanshell#bsh/1.3.0": {
-   "jar": "sha256-mwTtx10Z21TxtOi1NV6TZDhMbPcesKG5ckwVnXeYefg=",
-   "pom": "sha256-DyaKBXFp+qO6hALh+8K54K4Z3voYt+xeC+hSvLoGgp0="
-  },
  "org/checkerframework#checker-qual/3.27.0": {
   "jar": "sha256-Jf2m8+su4hOf9dfTmSZn1Sbr8bD7h982/HWqNWeebas=",
   "module": "sha256-H1L7VyqCR4PvVyPW0LejEUOz2JKpQerXur4OH/kWM30=",
   "pom": "sha256-yXIt1Co1ywpkPGgAoo2sf8UXbYDkz2v4XBgjdzFjOrk="
  },
-  "org/hamcrest#hamcrest-core/1.3": {
-   "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
-   "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
-  },
-  "org/hamcrest#hamcrest-parent/1.3": {
-   "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
-  },
  "org/javassist#javassist/3.28.0-GA": {
   "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=",
   "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0="
  },
-  "org/junit#junit-bom/5.9.3": {
-   "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=",
-   "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc="
+  "org/jspecify#jspecify/1.0.0": {
+   "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=",
+   "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=",
+   "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y="
  },
-  "org/junit/jupiter#junit-jupiter-api/5.9.3": {
-   "jar": "sha256-2JXj7t9PobEN4xqRvlWjAbswe/GO8yWz+l2z+A7pLRw=",
-   "module": "sha256-ba7jABTiBFWh7MbW0LOsYERECtE+9CA5jikZCYDpuHo=",
-   "pom": "sha256-f3KVZWK+1JEdMhf5DeCw0kDdklb4V99aJLvrAVS0FBs="
+  "org/junit#junit-bom/5.11.0": {
+   "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=",
+   "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0="
  },
-  "org/junit/jupiter#junit-jupiter-engine/5.9.3": {
-   "jar": "sha256-tV4wSxzS6PEWwat3pdw+yoxNm0amnghLY6ylHN61Xw8=",
-   "module": "sha256-lY9TIPRbNNCmZ24W/1ScsBDhQm3KUs/bEFh2vM9Pdog=",
-   "pom": "sha256-D1/XZ2n95tJHMI+Dbf8TTItS9lpC5UuNCtoEFvMKc3o="
+  "org/junit/jupiter#junit-jupiter-api/5.11.0": {
+   "jar": "sha256-QqogL8hi92zFr2W0exwLGWHN15zSIWQFpt+ivSCyCXQ=",
+   "module": "sha256-8FlIEOl1rpHe3OqeHiIP8hlcSvnQMyJ6C2VkxsX1m4U=",
+   "pom": "sha256-cTmgP0mFrJoYz6iUyYHkmfDkw3IFGTaMomTqhkc2Te0="
  },
-  "org/junit/jupiter#junit-jupiter-params/5.9.3": {
-   "jar": "sha256-KvKC/pHlZJXAO4TpyucC6qIS/C9qMf2deeMcy2TNgf0=",
-   "module": "sha256-PDb9BY560Xk2w2qHkaXvks06slUbsVsYngURPhaA848=",
-   "pom": "sha256-HAzCQ766eIZChiVLRVKqvNUXrMMiAAJjaRxBUl/HtfY="
+  "org/junit/jupiter#junit-jupiter-engine/5.11.0": {
+   "jar": "sha256-cBJCM4PQx50DR8XPK9GZbDChIkD7cp4M36lUhS7Gk8w=",
+   "module": "sha256-KHwllg0eUqQFPj8ksY8eG6tM6K7us8eY3Z+N8p4yNFM=",
+   "pom": "sha256-wiNKZ/6wxv6pFlbG5ovSaeJGolN0jE+NBQyTj+MKn8A="
  },
-  "org/junit/platform#junit-platform-commons/1.9.3": {
-   "jar": "sha256-hRkVffgTwhDoX8FBS3QQnj2F9D1wklY+1wTEPEjw1eY=",
-   "module": "sha256-eWpB8nJB+2dgjwGazPTBw2cVe3MjinavhvbeuuNZnrQ=",
-   "pom": "sha256-4Xof3keC8vwjtC3sp1wLBWbVwphQ0DBr5lxdpzuAIXg="
+  "org/junit/jupiter#junit-jupiter-params/5.11.0": {
+   "jar": "sha256-ksyuLXLozHrE06kS/RqP7MXjBApirGxmegem9VuAI+s=",
+   "module": "sha256-zv6izpIZeI0B8JyDCbXcl1B6y90c6MpaYiGU7VGoTRY=",
+   "pom": "sha256-z8SNqdJaqPhGJZOe+JaH0zUFkiVnTxag/FQzV+LRU4E="
  },
-  "org/junit/platform#junit-platform-engine/1.9.3": {
-   "jar": "sha256-DDlVPZoDUQdXIn9aHGzGUwKHsaMh7WJYRQZkh0qioWo=",
-   "module": "sha256-nQVThnLcRrITlxJjbv3B8Xg9Q5qhwktp0Ckrgci36o8=",
-   "pom": "sha256-HFq3/OvjpgEYOXm6r78vQOVUOIKnyiPp+etxkZWnR9U="
+  "org/junit/platform#junit-platform-commons/1.11.0": {
+   "jar": "sha256-YJMzpFRfkBjrDFkHHv0wZjqen9zlKBIbZaBMJ+X8Jqc=",
+   "module": "sha256-AjF2P88IOaIFJjYqtOEKJ8ZuvA+yICgexBweQV50vC0=",
+   "pom": "sha256-DJ/cUOXGT0LhF5+q+aYFRXOJqC6/6Ah9us1Kgglf0LE="
  },
-  "org/junit/vintage#junit-vintage-engine/5.9.3": {
-   "jar": "sha256-a8G0IoKu2LnszbQGMc9FABr4qzrZ0Nhc/4bEXoX8WdA=",
-   "module": "sha256-903In7pI9S/PzSKUFEQbDXn4Cz5tgTsAvIuXT1K0bZE=",
-   "pom": "sha256-FISWCrLBD3mXJlEWmJuzsY21XJKfrFn96nS4ssd5WkY="
+  "org/junit/platform#junit-platform-engine/1.11.0": {
+   "jar": "sha256-p+ZyecZRxRaUlRK1BpFkdabZ4oTNT0ww0Cm0rXOpRNg=",
+   "module": "sha256-pdV2XcmtClTaDff0ggiEgxUt0JQsq1n14WqWCO5DmBI=",
+   "pom": "sha256-uL18viaZMQUQSho0jL3Rfqmcewb4fJc4971vW7e/bPI="
  },
  "org/key-project#docking-frames-base/1.1.3p1": {
   "pom": "sha256-/MvGKkZ8j1YkC7AILbv5pM2X7wAYmstCBad/PrFbRgs="
@@ -638,9 +712,10 @@
   "jar": "sha256-hXigFBxxS16XOpxffHemSIdXoXIIfmSBtcF04r5wBZc=",
   "pom": "sha256-qkwVR2roScEeE8smsNB0dCJfr7r7B7wNoHkQtF6tV+c="
  },
-  "org/opentest4j#opentest4j/1.2.0": {
-   "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=",
-   "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ="
+  "org/opentest4j#opentest4j/1.3.0": {
+   "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+   "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+   "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
  },
  "org/ow2#ow2/1.5": {
   "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs="
@@ -652,20 +727,23 @@
   "jar": "sha256-EmM2m1ninJQ5GN4R1tYVLi7GCFzmPlcQUW+MZ9No5Lw=",
   "pom": "sha256-jqwH4p+K6oOoFW17Kfo2j26/O+z7IJyaGsNqvZBhI+A="
  },
-  "org/ow2/asm#asm/9.5": {
-   "jar": "sha256-ti6EtZgHKXUbBFjFNM8TZvcnVCu40VhiEzVoKkYPA1M=",
-   "pom": "sha256-LJzOuVHMZYbejZoWxnKtPkwwucMjAo16PDNmVg1WJ7E="
+  "org/ow2/asm#asm/9.7": {
+   "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=",
+   "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA="
  },
  "org/reflections#reflections/0.10.2": {
   "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=",
   "pom": "sha256-tsqj6301vXVu1usKKoGGi408D29CJE/q5BdgrGYwbYc="
  },
-  "org/slf4j#slf4j-api/2.0.7": {
-   "jar": "sha256-XWKYuToZBcMs2mR4gIrBTC1KR+kVNeU8Qff+64XZRvQ=",
-   "pom": "sha256-LUA8zw4KAtXBqGZ7DiozyN/GA4qyh7lnHdaBwgUmeYE="
+  "org/slf4j#slf4j-api/2.0.16": {
+   "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=",
+   "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c="
  },
-  "org/slf4j#slf4j-parent/2.0.7": {
-   "pom": "sha256-wYK7Ns068ck8FgPN/v54iRV9swuotYT0pEU1/NIuRec="
+  "org/slf4j#slf4j-bom/2.0.16": {
+   "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk="
+  },
+  "org/slf4j#slf4j-parent/2.0.16": {
+   "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU="
  },
  "org/sonatype/oss#oss-parent/3": {
   "pom": "sha256-DCeIkmfAlGJEYRaZcJPGcVzMAMKzqVTmZDRDDY9Nrt4="
--- a/pkgs/by-name/ke/key/package.nix
+++ b/pkgs/by-name/ke/key/package.nix
@@ -9,8 +9,10 @@
  makeDesktopItem,
  copyDesktopItems,
  testers,
-  git,
+  z3,
+  cvc5,
  key,
+  substitute,
 }:

 let
@@ -19,20 +21,31 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "key";
-  version = "2.12.2";
+  version = "2.12.3";
  src = fetchFromGitHub {
    owner = "KeYProject";
    repo = "key";
-    tag = "KeY-${version}";
-    hash = "sha256-veqaWyWEiTot2cAjvyPG+Ra8/pqS4i6w6iR+qhozIM4=";
+    tag = "KEY-${version}";
+    hash = "sha256-1pN0lmr/teVitpMIM9M9lSTkmnVcZwdAQay2pzgJDCk=";
  };

+  patches = [
+    # Remove linting framework, causes issues with the update script.
+    (substitute {
+      src = ./remove-eisop-checker.patch;
+      substitutions = [
+        "--subst-var-by"
+        "version"
+        version
+      ];
+    })
+  ];
+
  nativeBuildInputs = [
    jdk
    gradle
    makeWrapper
    copyDesktopItems
-    git
  ];

  desktopItems = [
@@ -54,8 +67,7 @@ stdenv.mkDerivation rec {

  __darwinAllowLocalNetworking = true;

-  # tests are broken on darwin
-  # TODO: on update to 2.12.3+, restore to !stdenv.hostPlatform.isDarwin;
+  # TODO: on update to 2.12.4+, try again
  # (currently some tests are failing)
  doCheck = false;

@@ -68,6 +80,12 @@ stdenv.mkDerivation rec {
    mkdir -p $out/share/icons/hicolor/256x256/apps
    cp key.ui/src/main/resources/de/uka/ilkd/key/gui/images/key-color-icon-square.png $out/share/icons/hicolor/256x256/apps/key.png
    makeWrapper ${lib.getExe jre} $out/bin/KeY \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          z3
+          cvc5
+        ]
+      } \
      --add-flags "-cp $out/share/java/KeY.jar de.uka.ilkd.key.core.Main"

    runHook postInstall
--- a/pkgs/by-name/ke/key/remove-eisop-checker.patch
+++ b/pkgs/by-name/ke/key/remove-eisop-checker.patch
@@ -0,0 +1,96 @@
+diff --git a/build.gradle b/build.gradle
+index d90fe4733f..26d1e3755d 100644
+--- a/build.gradle
+++ b/build.gradle
+@@ -24,7 +24,6 @@ plugins {
+     id "com.diffplug.spotless" version "6.25.0"
+ 
+     // EISOP Checker Framework
+-    id "org.checkerframework" version "0.6.43"
+ }
+ 
+ // Configure this project for use inside IntelliJ:
+@@ -56,7 +55,6 @@ subprojects {
+     apply plugin: "com.diffplug.spotless"
+     apply plugin: "checkstyle"
+     apply plugin: "pmd"
+-    apply plugin: "org.checkerframework"
+ 
+     group = rootProject.group
+     version = rootProject.version
+@@ -87,7 +85,6 @@ subprojects {
+         compileOnly "io.github.eisop:checker-qual:$eisop_version"
+         compileOnly "io.github.eisop:checker-util:$eisop_version"
+         testCompileOnly "io.github.eisop:checker-qual:$eisop_version"
+-        checkerFramework "io.github.eisop:checker:$eisop_version"
+ 
+         testImplementation("ch.qos.logback:logback-classic:1.5.7")
+         testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
+@@ -531,6 +528,7 @@ if (jacocoEnabled.toBoolean()) {
+ 
+ @Memoized
+ def getChangedFiles() {
+    return []
+     // Get the target and source branch
+     def anchor = "git merge-base HEAD origin/main".execute().getText()
+ 
+diff --git a/key.core/build.gradle b/key.core/build.gradle
+index 054104438c..8d13452edf 100644
+--- a/key.core/build.gradle
+++ b/key.core/build.gradle
+@@ -196,7 +196,7 @@ task generateVersionFiles() {
+ // find names/SHAs for commits
+ static def gitRevParse(String args) {
+     try {
+-        return "git rev-parse $args".execute().text.trim()
+        return "@version@"
+     } catch (Exception e) {
+         return ""
+     }
+diff --git a/key.ncore/build.gradle b/key.ncore/build.gradle
+index 04eabab0a8..a99e8639c1 100644
+--- a/key.ncore/build.gradle
+++ b/key.ncore/build.gradle
+@@ -14,19 +14,3 @@ tasks.withType(Test) {
+     enableAssertions = true
+ }
+ 
+-
+-checkerFramework {
+-    if(System.getProperty("ENABLE_NULLNESS")) {
+-        checkers = [
+-                "org.checkerframework.checker.nullness.NullnessChecker",
+-        ]
+-        extraJavacArgs = [
+-                "-AonlyDefs=^org\\.key_project\\.logic",
+-                "-Xmaxerrs", "10000",
+-                "-Astubs=$rootDir/key.util/src/main/checkerframework:permit-nullness-assertion-exception.astub",
+-                "-AstubNoWarnIfNotFound",
+-                "-Werror",
+-                "-Aversion",
+-        ]
+-    }
+-}
+diff --git a/key.util/build.gradle b/key.util/build.gradle
+index 382a103b60..7187dc0236 100644
+--- a/key.util/build.gradle
+++ b/key.util/build.gradle
+@@ -4,18 +4,3 @@ dependencies {
+     implementation("org.jspecify:jspecify:1.0.0")
+ }
+ 
+-checkerFramework {
+-    if(System.getProperty("ENABLE_NULLNESS")) {
+-        checkers = [
+-                "org.checkerframework.checker.nullness.NullnessChecker",
+-        ]
+-        extraJavacArgs = [
+-                "-AonlyDefs=^org\\.key_project\\.util",
+-                "-Xmaxerrs", "10000",
+-                "-Astubs=$projectDir/src/main/checkerframework:permit-nullness-assertion-exception.astub:checker.jar/junit-assertions.astub",
+-                "-AstubNoWarnIfNotFound",
+-                "-Werror",
+-                "-Aversion",
+-        ]
+-    }
+-}
--- a/pkgs/by-name/li/libblake3/package.nix
+++ b/pkgs/by-name/li/libblake3/package.nix
@@ -3,7 +3,7 @@
  stdenv,
  cmake,
  fetchFromGitHub,
-  tbb_2022_0,
+  tbb_2021_11,
  useTBB ? true,
  darwinMinVersionHook,
 }:
@@ -24,7 +24,10 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [ cmake ];

  buildInputs =
-    lib.optionals useTBB [ tbb_2022_0 ]
+    lib.optionals useTBB [
+      # 2022.0 crashes on macOS at the moment
+      tbb_2021_11
+    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [ (darwinMinVersionHook "10.13") ];

  cmakeFlags = [
--- a/pkgs/by-name/so/sonarr/deps.json
+++ b/pkgs/by-name/so/sonarr/deps.json
@@ -955,8 +955,8 @@
  },
  {
    "pname": "SixLabors.ImageSharp",
-    "version": "3.1.6",
-    "hash": "sha256-FQjLyC4158F1GyhlKjzjGo6TxAu698rYWTY9lkko/fA="
+    "version": "3.1.7",
+    "hash": "sha256-jMD/FiIwW1kNhTI6hKig8/QFOO3eTQX/C22cSAcKBH4="
  },
  {
    "pname": "Swashbuckle.AspNetCore.Annotations",
--- a/pkgs/by-name/so/sonarr/package.nix
+++ b/pkgs/by-name/so/sonarr/package.nix
@@ -21,7 +21,7 @@
  applyPatches,
 }:
 let
-  version = "4.0.13.2932";
+  version = "4.0.14.2939";
  # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
  # the already patched lockfile to `fetchYarnDeps`.
  src = applyPatches {
@@ -29,7 +29,7 @@ let
      owner = "Sonarr";
      repo = "Sonarr";
      tag = "v${version}";
-      hash = "sha256-BR7CU8q+L2CY2UqR9n0cbX9R7ergzRPPvSrLl7Cn7EU=";
+      hash = "sha256-gtEDrAosI0Kyk712Kf8QDuloUBq9AArKdukX/PKAo8M=";
    };
    patches =
      [
--- a/pkgs/by-name/st/strace/package.nix
+++ b/pkgs/by-name/st/strace/package.nix
@@ -11,15 +11,20 @@

 stdenv.mkDerivation rec {
  pname = "strace";
-  version = "6.13";
+  version = "6.14";

  src = fetchurl {
    url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-4gna8O4DjKWtzEwnfpJztNUfRqL/htpXXTZ0KsNQihc=";
+    hash = "sha256-JE87XCCjKFTKm3yno+4JHdPUvSCTOhcezujbSGx308k=";
  };

  separateDebugInfo = true;

+  outputs = [
+    "out"
+    "man"
+  ];
+
  depsBuildBuild = [ buildPackages.stdenv.cc ];
  nativeBuildInputs = [ perl ];

--- a/pkgs/by-name/sy/systemtap-sdt/package.nix
+++ b/pkgs/by-name/sy/systemtap-sdt/package.nix
@@ -0,0 +1,10 @@
+{ linuxPackages }:
+linuxPackages.systemtap.override {
+  withStap = false;
+}
+// {
+  meta = linuxPackages.systemtap.meta // {
+    description = "Build USDT tracepoints with the 'dtrace' executable on Linux";
+    mainProgram = "dtrace";
+  };
+}
--- a/pkgs/by-name/zu/zulip/package.nix
+++ b/pkgs/by-name/zu/zulip/package.nix
@@ -1,7 +1,8 @@
 { lib
 , fetchFromGitHub
 , buildNpmPackage
-, electron_32
+, python3
+, electron_35
 , makeDesktopItem
 , makeShellWrapper
 , copyDesktopItems
@@ -9,16 +10,16 @@

 buildNpmPackage rec {
  pname = "zulip";
-  version = "5.11.1";
+  version = "5.12.0";

  src = fetchFromGitHub {
    owner = "zulip";
    repo = "zulip-desktop";
-    rev = "v${version}";
-    hash = "sha256-ELuQ/K5QhtS4QiTR35J9VtYNe1qBrS56Ay6mtcGL+FI=";
+    tag = "v${version}";
+    hash = "sha256-YDb69tJCR58DARssnZgdVxtRpR8vHsawCTv7kQ56y+8=";
  };

-  npmDepsHash = "sha256-13Rlqa7TC2JUq6q1b2U5X3EXpOJGZ62IeF163/mTo68=";
+  npmDepsHash = "sha256-MKKN6prUdWaHm27GybdbswDMNJH0xVffXsT2ZwroOHI=";

  env = {
    ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
@@ -27,6 +28,7 @@ buildNpmPackage rec {
  nativeBuildInputs = [
    makeShellWrapper
    copyDesktopItems
+    (python3.withPackages (ps: with ps; [ distutils ]))
  ];

  dontNpmBuild = true;
@@ -34,8 +36,8 @@ buildNpmPackage rec {
    runHook preBuild

    npm run pack -- \
-      -c.electronDist=${electron_32}/libexec/electron \
-      -c.electronVersion=${electron_32.version}
+      -c.electronDist=${electron_35}/libexec/electron \
+      -c.electronVersion=${electron_35.version}

    runHook postBuild
  '';
@@ -48,7 +50,7 @@ buildNpmPackage rec {

    install -m 444 -D app/resources/zulip.png $out/share/icons/hicolor/512x512/apps/zulip.png

-    makeShellWrapper '${lib.getExe electron_32}' "$out/bin/zulip" \
+    makeShellWrapper '${lib.getExe electron_35}' "$out/bin/zulip" \
      --add-flags "$out/share/lib/zulip/app.asar" \
      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true}}" \
      --inherit-argv0
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -46,7 +46,7 @@ let
                  else if (stdenv.hostPlatform.extensions.library == ".dll") then "2.0-0.dll"
                  else "2.0-0.lib";

-  systemtap' = buildPackages.linuxPackages.systemtap.override { withStap = false; };
+  systemtap' = buildPackages.systemtap-sdt;
  withDtrace =
    lib.meta.availableOn stdenv.buildPlatform systemtap' &&
    # dtrace support requires sys/sdt.h header
--- a/pkgs/development/python-modules/comicapi/default.nix
+++ b/pkgs/development/python-modules/comicapi/default.nix
@@ -0,0 +1,83 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  importlib-metadata,
+  natsort,
+  pillow,
+  py7zr,
+  pycountry,
+  pyicu,
+  pytestCheckHook,
+  pythonOlder,
+  rapidfuzz,
+  rarfile,
+  setuptools,
+  setuptools-scm,
+  text2digits,
+  wheel,
+  wordninja,
+}:
+
+buildPythonPackage rec {
+  pname = "comicapi";
+  version = "3.2.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "comictagger";
+    repo = "comicapi";
+    rev = "2bf8332114e49add0bbc0fd3d85bdbba02de3d1a";
+    hash = "sha256-Cd3ILy/4PqWUj1Uu9of9gCpdVp2R6CXjPOuSXgrB894=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+    wheel
+  ];
+
+  dependencies = [
+    importlib-metadata
+    natsort
+    pillow
+    pycountry
+    rapidfuzz
+    text2digits
+    wordninja
+  ];
+
+  optional-dependencies = {
+    _7z = [ py7zr ];
+
+    all = [
+      py7zr
+      rarfile
+    ] ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) pyicu;
+
+    cbr = [ rarfile ];
+
+    icu = lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) pyicu;
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
+
+  pythonRelaxDeps = [ "pycountry" ];
+
+  disabledTests = [
+    # AssertionError
+    "test_copy_from_archive"
+  ];
+
+  pythonImportsCheck = [ "comicapi" ];
+
+  meta = {
+    description = "Comic archive (cbr/cbz/cbt) and metadata utilities";
+    homepage = "https://github.com/comictagger/comicapi";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ getchoo ];
+  };
+}
--- a/pkgs/development/python-modules/flask-dance/default.nix
+++ b/pkgs/development/python-modules/flask-dance/default.nix
@@ -0,0 +1,95 @@
+{
+  lib,
+  betamax,
+  blinker,
+  buildPythonPackage,
+  coverage,
+  fetchFromGitHub,
+  flask,
+  flask-caching,
+  flask-login,
+  flask-sqlalchemy,
+  flit,
+  freezegun,
+  oauthlib,
+  pallets-sphinx-themes,
+  pillow,
+  pytest,
+  pytest-mock,
+  pytestCheckHook,
+  requests,
+  requests-oauthlib,
+  responses,
+  sphinx,
+  sphinxcontrib-seqdiag,
+  sphinxcontrib-spelling,
+  sqlalchemy,
+  urlobject,
+  werkzeug,
+}:
+
+buildPythonPackage rec {
+  pname = "flask-dance";
+  version = "7.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "singingwolfboy";
+    repo = "flask-dance";
+    tag = "v${version}";
+    hash = "sha256-rKHC0G5S7l52QSrbbweMii68AZuBAgf6tYsJdPKIeUk=";
+  };
+
+  build-system = [ flit ];
+
+  dependencies = [
+    flask
+    oauthlib
+    requests
+    requests-oauthlib
+    urlobject
+    werkzeug
+  ];
+
+  optional-dependencies = {
+    docs = [
+      betamax
+      pallets-sphinx-themes
+      pillow
+      sphinx
+      sphinxcontrib-seqdiag
+      sphinxcontrib-spelling
+      sqlalchemy
+    ];
+
+    signals = [ blinker ];
+
+    sqla = [ sqlalchemy ];
+
+    test = [
+      betamax
+      coverage
+      flask-caching
+      flask-login
+      flask-sqlalchemy
+      freezegun
+      oauthlib
+      pytest
+      pytest-mock
+      responses
+      sqlalchemy
+    ];
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
+
+  pythonImportsCheck = [ "flask_dance" ];
+
+  meta = {
+    description = "Doing the OAuth dance with style using Flask, requests, and oauthlib";
+    homepage = "https://github.com/singingwolfboy/flask-dance";
+    changelog = "https://github.com/singingwolfboy/flask-dance/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ getchoo ];
+  };
+}
--- a/pkgs/development/python-modules/netifaces-plus/default.nix
+++ b/pkgs/development/python-modules/netifaces-plus/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  setuptools,
+  wheel,
+}:
+
+buildPythonPackage rec {
+  pname = "netifaces-plus";
+  version = "0.12.4";
+  pyproject = true;
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "tsukumijima";
+    repo = "netifaces-plus";
+    tag = "release_${lib.replaceStrings [ "." ] [ "_" ] version}";
+    hash = "sha256-3CYAe0doWMagcUIN9+ikH9gEST9AqglSQDlZsKOMnC8=";
+  };
+
+  build-system = [
+    setuptools
+    wheel
+  ];
+
+  pythonImportsCheck = [ "netifaces" ];
+
+  meta = {
+    description = "Portable network interface information";
+    homepage = "https://github.com/tsukumijima/netifaces-plus";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ getchoo ];
+  };
+}
--- a/pkgs/development/python-modules/scholarly/default.nix
+++ b/pkgs/development/python-modules/scholarly/default.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  arrow,
+  beautifulsoup4,
+  bibtexparser,
+  buildPythonPackage,
+  deprecated,
+  fake-useragent,
+  fetchFromGitHub,
+  free-proxy,
+  httpx,
+  python-dotenv,
+  requests,
+  selenium,
+  setuptools,
+  sphinx-rtd-theme,
+  stem,
+  typing-extensions,
+  wheel,
+}:
+
+buildPythonPackage rec {
+  pname = "scholarly";
+  version = "1.7.11";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "scholarly-python-package";
+    repo = "scholarly";
+    tag = "v${version}";
+    hash = "sha256-yvew63tGwSjwseHK7wDqm26xiyCztUzxMqBpwwLD798=";
+  };
+
+  build-system = [
+    setuptools
+    wheel
+  ];
+
+  dependencies = [
+    arrow
+    beautifulsoup4
+    bibtexparser
+    deprecated
+    fake-useragent
+    free-proxy
+    httpx
+    python-dotenv
+    requests
+    selenium
+    sphinx-rtd-theme
+    typing-extensions
+  ];
+
+  optional-dependencies = {
+    tor = [ stem ];
+  };
+
+  nativeCheckInputs = lib.flatten (lib.attrValues optional-dependencies);
+
+  pythonImportsCheck = [ "scholarly" ];
+
+  meta = {
+    description = "Retrieve author and publication information from Google Scholar";
+    homepage = "https://scholarly.readthedocs.io/";
+    changelog = "https://github.com/scholarly-python-package/scholarly/releases/tag/${src.tag}";
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ getchoo ];
+  };
+}
--- a/pkgs/development/python-modules/text2digits/default.nix
+++ b/pkgs/development/python-modules/text2digits/default.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pypaInstallHook,
+  setuptoolsBuildHook,
+}:
+
+buildPythonPackage rec {
+  pname = "text2digits";
+  version = "0.1.0";
+  pyproject = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-oB2NyNVxediIulid9A4Ccw878t2JKrIsN1OOR5lyi7I=";
+  };
+
+  nativeBuildInputs = [
+    pypaInstallHook
+    setuptoolsBuildHook
+  ];
+
+  pythonImportsCheck = [ "text2digits" ];
+
+  meta = {
+    description = "Converts text such as 'twenty three' to number/digit '23' in any sentence";
+    homepage = "https://github.com/ShailChoksi/text2digits";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ getchoo ];
+  };
+}
--- a/pkgs/development/python-modules/urlobject/default.nix
+++ b/pkgs/development/python-modules/urlobject/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pypaInstallHook,
+  setuptoolsBuildHook,
+}:
+
+buildPythonPackage rec {
+  pname = "urlobject";
+  version = "2.4.3";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "zacharyvoase";
+    repo = "urlobject";
+    tag = "v${version}";
+    hash = "sha256-4UuQZTkVre8jXlchW7/TjeaADYvLnGMpGbJR/sdeKv4=";
+  };
+
+  nativeBuildInputs = [
+    pypaInstallHook
+    setuptoolsBuildHook
+  ];
+
+  # Tests use `nose`
+  doInstallCheck = false;
+
+  pythonImportsCheck = [ "urlobject" ];
+
+  meta = {
+    description = "Python library for manipulating URLs (and some URIs) in a more natural way";
+    homepage = "http://zacharyvoase.github.com/urlobject";
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ getchoo ];
+  };
+}
--- a/pkgs/development/python-modules/wordninja/default.nix
+++ b/pkgs/development/python-modules/wordninja/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  setuptools-scm,
+  wheel,
+}:
+
+buildPythonPackage rec {
+  pname = "wordninja";
+  version = "2.0.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-GhzH7BRq0Z1vcZQe6CrvPTEiFwDw2L+EQTbPjfedKBo=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+    wheel
+  ];
+
+  pythonImportsCheck = [ "wordninja" ];
+
+  meta = {
+    description = "Probabilistically split concatenated words using NLP based on English Wikipedia unigram frequencies";
+    homepage = "https://github.com/keredson/wordninja";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ getchoo ];
+  };
+}
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -16,8 +16,8 @@ let
      hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
    };
    "10" = {
-      version = "10.6.5";
-      hash = "sha256-R8i8pCtLSFNLWxso1XPFBnc5N7AvaOUpkvvYJpExxcg=";
+      version = "10.7.0";
+      hash = "sha256-NcqyaVO/kIR+eYg521jJoqgtUmt68Xn9KhA8GCQsrcY=";
    };
  };

--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/pkgs/development/tools/profiling/systemtap/default.nix
@@ -11,7 +11,7 @@
  gnumake,
  python3,
  nixosTests,
-  withStap ? true, # avoid cyclic dependency with glib
+  withStap ? true, # avoid cyclic dependency with glib, reduce closure size substantially
 }:

 let
--- a/pkgs/servers/nextcloud/packages/apps/recognize.nix
+++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix
@@ -16,6 +16,11 @@
 }:
 let
  latestVersionForNc = {
+    "31" = {
+      version = "9.0.0";
+      appHash = "sha256-hhHWCzaSfV41Ysuq4WXjy63mflgEsb2qdGapHE8fuA8=";
+      modelHash = "sha256-WzK9StICup/YuRcuM575DiPYHsvXGt9CRrAoBVGbXHI=";
+    };
    "30" = {
      version = "8.2.0";
      appHash = "sha256-CAORqBdxNQ0x+xIVY2zI07jvsKHaa7eH0jpVuP0eSW4=";
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11780,9 +11780,9 @@ with pkgs;

  jitsi-videobridge = callPackage ../servers/jitsi-videobridge { };

-  kanidm_1_3 = callPackage ../by-name/ka/kanidm/1_3.nix { };
-  kanidm_1_4 = callPackage ../by-name/ka/kanidm/1_4.nix { };
-  kanidm_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix { };
+  kanidm_1_3 = callPackage ../by-name/ka/kanidm/1_3.nix { kanidm = kanidm_1_3; };
+  kanidm_1_4 = callPackage ../by-name/ka/kanidm/1_4.nix { kanidm = kanidm_1_4; };
+  kanidm_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix { kanidm = kanidm_1_5; };

  kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_4;

--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2575,6 +2575,8 @@ self: super: with self; {

  cometblue-lite = callPackage ../development/python-modules/cometblue-lite { };

+  comicapi = callPackage ../development/python-modules/comicapi { };
+
  comicon = callPackage ../development/python-modules/comicon { };

  comm = callPackage ../development/python-modules/comm { };
@@ -4731,6 +4733,8 @@ self: super: with self; {

  flask-cors = callPackage ../development/python-modules/flask-cors { };

+  flask-dance = callPackage ../development/python-modules/flask-dance { };
+
  flask-dramatiq = callPackage ../development/python-modules/flask-dramatiq { };

  flask-elastic = callPackage ../development/python-modules/flask-elastic { };
@@ -10021,6 +10025,8 @@ self: super: with self; {

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

+  netifaces-plus = callPackage ../development/python-modules/netifaces-plus { };
+
  netifaces2 = callPackage ../development/python-modules/netifaces2 { };

  netio = callPackage ../development/python-modules/netio { };
@@ -15318,6 +15324,8 @@ self: super: with self; {

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

+  scholarly = callPackage ../development/python-modules/scholarly { };
+
  schwifty = callPackage ../development/python-modules/schwifty { };

  scienceplots = callPackage ../development/python-modules/scienceplots { };
@@ -16894,6 +16902,8 @@ self: super: with self; {

  text-unidecode = callPackage ../development/python-modules/text-unidecode { };

+  text2digits = callPackage ../development/python-modules/text2digits { };
+
  textacy = callPackage ../development/python-modules/textacy { };

  textdistance = callPackage ../development/python-modules/textdistance { };
@@ -17746,6 +17756,8 @@ self: super: with self; {

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

+  urlobject = callPackage ../development/python-modules/urlobject { };
+
  urlpy = callPackage ../development/python-modules/urlpy { };

  urwid = callPackage ../development/python-modules/urwid { };
@@ -18219,6 +18231,8 @@ self: super: with self; {

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

+  wordninja = callPackage ../development/python-modules/wordninja { };
+
  world-bank-data = callPackage ../development/python-modules/world-bank-data { };

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