Merge staging-next into staging

2025-01-23 06:05:26 +00:00
parent 9e56333a3b a2c1eeec37
commit dbd63f1910
53 changed files with 485 additions and 202 deletions
@@ -232,6 +232,8 @@

 - `minetest` has been renamed to `luanti` to match the upstream name change but aliases have been added. The new name hasn't resulted in many changes as of yet but older references to minetest should be sunset. See the [new name announcement](https://blog.minetest.net/2024/10/13/Introducing-Our-New-Name/) for more details.

+- `poac` has been renamed to `cabinpkg` to match the upstream name change but an alias has been added. See the [new name announcement](https://github.com/orgs/cabinpkg/discussions/1052) for more details.
+
 - `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead.

 - `rofi` has been updated from 1.7.5 to 1.7.6 which introduces some breaking changes to binary plugins, and also contains a lot of new features and bug fixes. This is highlighted because the patch version bump does not indicate the volume of changes by itself. See the [upstream release notes](https://github.com/davatorium/rofi/releases/tag/1.7.6) for the full list of changes.
@@ -9,7 +9,7 @@ let
  cfg = config.programs.cardboard;
 in
 {
-  meta.maintainers = with lib.maintainers; [ AndersonTorres ];
+  meta.maintainers = with lib.maintainers; [ ];

  options.programs.cardboard = {
    enable = lib.mkEnableOption "cardboard";
@@ -9,7 +9,7 @@ let
  cfg = config.programs.labwc;
 in
 {
-  meta.maintainers = with lib.maintainers; [ AndersonTorres ];
+  meta.maintainers = with lib.maintainers; [ ];

  options.programs.labwc = {
    enable = lib.mkEnableOption "labwc";
@@ -16,7 +16,7 @@ let
  enableIwd = cfg.wifi.backend == "iwd";
 in
 {
-  meta.maintainers = with lib.maintainers; [ AndersonTorres ];
+  meta.maintainers = with lib.maintainers; [ ];

  imports = [
    (lib.mkRenamedOptionModule [ "networking" "connman" ] [ "services" "connman" ])
@@ -23,7 +23,7 @@ let
 in
 {
  meta = {
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
  };

  options.services.earlyoom = {
@@ -43,6 +43,5 @@ in

  meta.maintainers = with lib.maintainers; [
    vancluever
-    AndersonTorres
  ];
 }
@@ -5,7 +5,6 @@ import ./make-test-python.nix (
    meta = {
      maintainers = with lib.maintainers; [
        ncfavier
-        AndersonTorres
        oxalica
      ];
    };
@@ -4,7 +4,6 @@ import ./make-test-python.nix (
    name = "pass-secret-service";
    meta.maintainers = with lib.maintainers; [
      vancluever
-      AndersonTorres
    ];

    nodes = {
@@ -9,7 +9,6 @@
  f,
  fetchFromGitHub,
  git,
-  gitUpdater,
  melpaBuild,
  package-build,
  s,
@@ -59,10 +58,6 @@ melpaBuild (finalAttrs: {
    install -D -t $out/bin bin/cask
  '';

-  passthru.updateScript = gitUpdater {
-    rev-prefix = "v";
-  };
-
  meta = {
    homepage = "https://github.com/cask/cask";
    description = "Project management for Emacs";
@@ -73,6 +68,6 @@ melpaBuild (finalAttrs: {
    '';
    license = lib.licenses.gpl3Plus;
    mainProgram = "cask";
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
  };
 })
@@ -2,7 +2,6 @@
  lib,
  fetchFromGitHub,
  melpaBuild,
-  unstableGitUpdater,
 }:

 melpaBuild {
@@ -19,12 +18,10 @@ melpaBuild {
  # https://github.com/NixOS/nixpkgs/issues/335408
  ignoreCompilationError = true;

-  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
-
  meta = {
    homepage = "http://ethanschoonover.com/solarized";
    description = "Precision colors for machines and people; Emacs implementation";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
  };
 }
@@ -4,7 +4,6 @@
  libffi,
  melpaBuild,
  pkg-config,
-  unstableGitUpdater,
 }:

 melpaBuild {
@@ -29,8 +28,6 @@ melpaBuild {
    make CXX=$CXX
  '';

-  passthru.updateScript = unstableGitUpdater { };
-
  meta = {
    homepage = "https://github.com/skeeto/elisp-ffi";
    description = "Emacs Lisp Foreign Function Interface";
@@ -41,6 +38,6 @@ melpaBuild {
      values on to Emacs.
    '';
    license = lib.licenses.unlicense;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
  };
 }
@@ -2,7 +2,6 @@
  lib,
  fetchFromGitHub,
  melpaBuild,
-  unstableGitUpdater,
 }:

 melpaBuild {
@@ -17,12 +16,10 @@ melpaBuild {
    hash = "sha256-er+knxqAejgKAtOnhqHfsGN286biHFdeMIUlbW7JyYw=";
  };

-  passthru.updateScript = unstableGitUpdater { };
-
  meta = {
    homepage = "https://github.com/emacsmirror/font-lock-plus";
    description = "Enhancements to standard library font-lock.el";
    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
  };
 }
@@ -2,7 +2,6 @@
  lib,
  fetchFromGitHub,
  melpaBuild,
-  unstableGitUpdater,
 }:

 melpaBuild {
@@ -16,12 +15,10 @@ melpaBuild {
    hash = "sha256-3QDw4W3FbFvb2zpkDHAo9BJKxs3LaehyvUVJPKqS9RE=";
  };

-  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
-
  meta = {
    homepage = "https://github.com/ichernyshovvv/grid.el";
    description = "Library to put text data into boxes and manipulate them";
    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
  };
 }
@@ -2,7 +2,6 @@
  lib,
  fetchFromGitHub,
  melpaBuild,
-  unstableGitUpdater,
 }:

 melpaBuild {
@@ -16,12 +15,10 @@ melpaBuild {
    hash = "sha256-pH4FQuAnYf8eNiwiLl+OOOxzdecrncay6TcHjNG16sk=";
  };

-  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
-
  meta = {
    homepage = "https://emacswiki.org/emacs/Icicles";
    description = "Emacs library that enhances minibuffer completion";
    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
  };
 }
@@ -30,9 +30,6 @@ melpaBuild {
    homepage = "https://github.com/idris-community/idris2-mode";
    description = "Emacs mode for editing Idris 2 code";
    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      wuyoli
-      AndersonTorres
-    ];
+    maintainers = with lib.maintainers; [ wuyoli ];
  };
 }
@@ -23,9 +23,6 @@ melpaBuild {
    homepage = "https://www.emacswiki.org/emacs/IsearchPlus";
    description = "Extensions to isearch";
    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [
-      leungbk
-      AndersonTorres
-    ];
+    maintainers = with lib.maintainers; [ leungbk ];
  };
 }
@@ -22,9 +22,6 @@ melpaBuild {
    homepage = "https://www.emacswiki.org/emacs/IsearchPlus";
    description = "Search text- or overlay-property contexts";
    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [
-      leungbk
-      AndersonTorres
-    ];
+    maintainers = with lib.maintainers; [ leungbk ];
  };
 }
@@ -34,6 +34,6 @@ rustPlatform.buildRustPackage {
    homepage = "https://github.com/zbelial/lspce";
    description = "LSP Client for Emacs implemented as a module using Rust";
    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
  };
 }
@@ -4,7 +4,6 @@
  f,
  markdown-mode,
  melpaBuild,
-  nix-update-script,
  yasnippet,
 }:

@@ -26,9 +25,5 @@ melpaBuild {

  passthru = {
    inherit lspce-module;
-    updateScript = nix-update-script {
-      attrPath = "emacsPackages.lspce.lspce-module";
-      extraArgs = [ "--version=branch" ];
-    };
  };
 }
@@ -2,7 +2,6 @@
  lib,
  melpaBuild,
  fetchFromGitHub,
-  gitUpdater,
 }:

 let
@@ -19,12 +18,10 @@ melpaBuild {
    hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM=";
  };

-  passthru.updateScript = gitUpdater { };
-
  meta = {
    homepage = "http://emacswiki.org/emacs/RectangleMark";
    description = "Mark a rectangle of text with highlighting";
    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
  };
 }
@@ -2,7 +2,6 @@
  lib,
  melpaBuild,
  fetchFromGitHub,
-  unstableGitUpdater,
 }:

 melpaBuild {
@@ -17,13 +16,11 @@ melpaBuild {
    hash = "sha256-D36qiRi5OTZrBtJ/bD/javAWizZ8NLlC/YP4rdLCSsw=";
  };

-  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
-
  meta = {
    homepage = "https://github.com/sunrise-commander/sunrise-commander/";
    description = "Orthodox (two-pane) file manager for Emacs";
    license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.AndersonTorres ];
+    maintainers = [ ];
    platforms = lib.platforms.all;
  };
 }
@@ -13,7 +13,6 @@
  melpaBuild,
  nav-flash,
  porthole,
-  unstableGitUpdater,
  yasnippet,
  el-patch,
 }:
@@ -49,12 +48,10 @@ melpaBuild {
    el-patch
  ];

-  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
-
  meta = {
    homepage = "https://github.com/jcaw/voicemacs/";
    description = "Set of utilities for controlling Emacs by voice";
    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
  };
 }
@@ -54,7 +54,7 @@ mkDerivation rec {
    mainProgram = "yabause";
    homepage = "https://yabause.org/";
    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
  };
 }
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://www.netsurf-browser.org/";
    description = "NetSurf browser shared build system";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
    platforms = lib.platforms.unix;
  };
 })
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/masneyb/gftp";
    description = "GTK-based multithreaded FTP client for *nix-based machines";
    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.unix;
  };
 }
@@ -1,43 +1,69 @@
-
+from functools import partial
 import json
+from multiprocessing import Pool
 import os
+from pathlib import Path
 import subprocess

-with open(os.environ["NIX_ATTRS_JSON_FILE"], "r") as f:
-  closures = json.load(f)["closure"]

-os.chdir(os.environ["out"])
+def dropPrefix(path, nixPrefix):
+    return path[len(nixPrefix + "/") :]

-nixPrefix = os.environ["NIX_STORE"] # Usually /nix/store

-with open("nix-cache-info", "w") as f:
-  f.write("StoreDir: " + nixPrefix + "\n")
+def processItem(item, nixPrefix, outDir):
+    narInfoHash = dropPrefix(item["path"], nixPrefix).split("-")[0]

-def dropPrefix(path):
-  return path[len(nixPrefix + "/"):]
+    xzFile = outDir / "nar" / f"{narInfoHash}.nar.xz"
+    with open(xzFile, "wb") as f:
+        subprocess.run(
+            f"nix-store --dump {item['path']} | xz -c",
+            stdout=f,
+            shell=True,
+            check=True,
+        )

-for item in closures:
-  narInfoHash = dropPrefix(item["path"]).split("-")[0]
+    fileHash = (
+        subprocess.run(
+            ["nix-hash", "--base32", "--type", "sha256", "--flat", xzFile],
+            capture_output=True,
+            check=True,
+        )
+        .stdout.decode()
+        .strip()
+    )
+    fileSize = os.path.getsize(xzFile)

-  xzFile = "nar/" + narInfoHash + ".nar.xz"
-  with open(xzFile, "w") as f:
-    subprocess.run("nix-store --dump %s | xz -c" % item["path"], stdout=f, shell=True)
+    finalXzFileName = Path("nar") / f"{fileHash}.nar.xz"
+    os.rename(xzFile, outDir / finalXzFileName)

-  fileHash = subprocess.run(["nix-hash", "--base32", "--type", "sha256", "--flat", xzFile], capture_output=True).stdout.decode().strip()
-  fileSize = os.path.getsize(xzFile)
+    with open(outDir / f"{narInfoHash}.narinfo", "wt") as f:
+        f.write(f"StorePath: {item['path']}\n")
+        f.write(f"URL: {finalXzFileName}\n")
+        f.write("Compression: xz\n")
+        f.write(f"FileHash: sha256:{fileHash}\n")
+        f.write(f"FileSize: {fileSize}\n")
+        f.write(f"NarHash: {item['narHash']}\n")
+        f.write(f"NarSize: {item['narSize']}\n")
+        f.write(f"References: {' '.join(dropPrefix(ref, nixPrefix) for ref in item['references'])}\n")

-  # Rename the .nar.xz file to its own hash to match "nix copy" behavior
-  finalXzFile = "nar/" + fileHash + ".nar.xz"
-  os.rename(xzFile, finalXzFile)

-  with open(narInfoHash + ".narinfo", "w") as f:
-    f.writelines((x + "\n" for x in [
-      "StorePath: " + item["path"],
-      "URL: " + finalXzFile,
-      "Compression: xz",
-      "FileHash: sha256:" + fileHash,
-      "FileSize: " + str(fileSize),
-      "NarHash: " + item["narHash"],
-      "NarSize: " + str(item["narSize"]),
-      "References: " + " ".join(dropPrefix(ref) for ref in item["references"]),
-    ]))
+def main():
+    outDir = Path(os.environ["out"])
+    nixPrefix = os.environ["NIX_STORE"]
+    numWorkers = int(os.environ.get("NIX_BUILD_CORES", "4"))
+
+    with open(os.environ["NIX_ATTRS_JSON_FILE"], "r") as f:
+        closures = json.load(f)["closure"]
+
+    os.makedirs(outDir / "nar", exist_ok=True)
+
+    with open(outDir / "nix-cache-info", "w") as f:
+        f.write(f"StoreDir: {nixPrefix}\n")
+
+    with Pool(processes=numWorkers) as pool:
+        worker = partial(processItem, nixPrefix=nixPrefix, outDir=outDir)
+        pool.map(worker, closures)
+
+
+if __name__ == "__main__":
+    main()
@@ -15,19 +15,19 @@ let
    owner = "ToruNiina";
    repo = "toml11";
    version = "4.2.0";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    sha256 = "sha256-NUuEgTpq86rDcsQnpG0IsSmgLT0cXhd1y32gT57QPAw=";
  };
 in
 stdenv.mkDerivation rec {
-  pname = "poac";
-  version = "0.10.1";
+  pname = "cabinpkg";
+  version = "0.11.0";

  src = fetchFromGitHub {
-    owner = "poac-dev";
-    repo = pname;
-    rev = "refs/tags/${version}";
-    sha256 = "sha256-uUVNM70HNJwrr38KB+44fNvLpWihoKyDpRj7d7kbo7k=";
+    owner = "cabinpkg";
+    repo = "cabin";
+    tag = version;
+    sha256 = "sha256-LIP99Shxu/lOdZ31KVA8RYawZ6dRLtXEGKZs1mUFCus=";
  };

  strictDeps = true;
@@ -44,30 +44,34 @@ stdenv.mkDerivation rec {
    curl
  ];

+  # Skip git cloning toml11
  preConfigure = ''
-    #Skip git clone toml11
    substituteInPlace Makefile \
-       --replace-fail "git clone" "\#git clone"
-    substituteInPlace Makefile \
-       --replace-fail "git -C" "\#git -c"
+       --replace-fail "git clone https://github.com/ToruNiina/toml11.git \$@" ":" \
+       --replace-fail "git -C \$@ reset --hard v4.2.0" ":"
  '';

  preBuild = ''
-    mkdir -p build-out/DEPS/
-    cp -rf ${toml11} build-out/DEPS/toml11
+    mkdir -p build/DEPS/
+    cp -rf ${toml11} build/DEPS/toml11
  '';

-  makeFlags = [ "RELEASE=1" ];
+  makeFlags = [
+    "RELEASE=1"
+    "COMMIT_HASH="
+    "COMMIT_SHORT_HASH="
+    "COMMIT_DATE="
+  ];

  installFlags = [ "PREFIX=${placeholder "out"}" ];

  meta = {
    broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);
-    homepage = "https://poac.dev";
+    homepage = "https://cabinpkg.com";
    description = "A package manager and build system for C++";
    license = lib.licenses.asl20;
    maintainers = [ lib.maintainers.qwqawawow ];
    platforms = lib.platforms.unix;
-    mainProgram = "poac";
+    mainProgram = "cabin";
  };
 }
@@ -6,14 +6,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-hack";
-  version = "0.6.33";
+  version = "0.6.34";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-/O05q4osyQ30rHKe84oBQJTFuVmPGB5KKy6UM/TzY5Q=";
+    hash = "sha256-FAcKzLr835FxgcnWmAe1JirzlRc3fvxGXMKxnSmgCzA=";
  };

-  cargoHash = "sha256-vkvna8+1+qQh+ZXtQ/HJa8UnstuH1sKlFc4CEUZYc5E=";
+  cargoHash = "sha256-zWIXIoKgLVu7EZLe1IrR3Rl5szrN0zbyKJWK2BvD7kQ=";

  # some necessary files are absent in the crate version
  doCheck = false;
@@ -7,11 +7,11 @@

 buildGraalvmNativeImage rec {
  pname = "clj-kondo";
-  version = "2024.11.14";
+  version = "2025.01.16";

  src = fetchurl {
    url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
-    sha256 = "sha256-/pzRKx6fqcbVwp+Eif3a1mh/awmwhhLVtFldRYibp/g=";
+    sha256 = "sha256-3MWDrtEWBOxhZ3iD/7buszEMNHgbjY0k973VUOMBgu8=";
  };

  graalvmDrv = graalvmPackages.graalvm-ce;
@@ -6,11 +6,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "clzip";
-  version = "1.14";
+  version = "1.15";

  src = fetchurl {
    url = "mirror://savannah/lzip/clzip/clzip-${finalAttrs.version}.tar.gz";
-    hash = "sha256-9j/hJFuDL+B/9nnpubhofpN5q2E6Jr+wrKN1TIsWLXM=";
+    hash = "sha256-KH6FFSaP+NFiRIeODi4tczwD2S3SsrhJFdde9N5sJh8=";
  };

  meta = with lib; {
@@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "flake-checker";
-  version = "0.2.3";
+  version = "0.2.4";

  src = fetchFromGitHub {
    owner = "DeterminateSystems";
    repo = "flake-checker";
    rev = "v${version}";
-    hash = "sha256-kWjq25+VKL4ANqFG5UyVv/TqO2i5q400mqaUVbKg4GE=";
+    hash = "sha256-K5E1sarWIUl4QavHBoS8sPr5Cp8ZndWjLYDLm++d7v0=";
  };

-  cargoHash = "sha256-E2hjHTEflcSjDazSR2KBRn7jMhXhksRL/vNdWbyRsxM=";
+  cargoHash = "sha256-TPF4usEIhgkGUJ16pxq0OhQoJJHLzeRXNQvbP8isWM4=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
    Security
@@ -20,13 +20,13 @@

 stdenv.mkDerivation rec {
  pname = "libdeltachat";
-  version = "1.154.1";
+  version = "1.154.3";

  src = fetchFromGitHub {
    owner = "deltachat";
    repo = "deltachat-core-rust";
    tag = "v${version}";
-    hash = "sha256-knlfcuZw7gPalLc/BSNvKmdweZAfd/QeBRNFX4OkOV8=";
+    hash = "sha256-SjNFgvg6sHW40v13OuR3BL3+JdDxntDCKtbe/C/04as=";
  };

  patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
  cargoDeps = rustPlatform.fetchCargoVendor {
    pname = "deltachat-core-rust";
    inherit version src;
-    hash = "sha256-Wbuz03gNlnQCu3p9rRdeZTCtIJqFUK71e8CmEOousFI=";
+    hash = "sha256-kbSRGuyCJlTxzKr/C+MLczqT7WNTqZ2/Z42psbBFW+w=";
  };

  nativeBuildInputs = [
@@ -16,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "libosmocore";
-  version = "1.10.0";
+  version = "1.10.1";

  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "libosmocore";
    rev = version;
-    hash = "sha256-qP5vGBgPs5y3InE3qgkVHiZgH3AW3mNyLIixgARAVRc=";
+    hash = "sha256-CIbmCZJA/F86L1v3J1mpB15kHVDFUbhFUxaYFys8xCQ=";
  };

  postPatch = ''
@@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "namespace-cli";
-  version = "0.0.399";
+  version = "0.0.400";

  src = fetchFromGitHub {
    owner = "namespacelabs";
    repo = "foundation";
    rev = "v${version}";
-    hash = "sha256-n1dnJOrrpfDlwdkuh7fcudZz3/W4+8Cg5E7/ecetr3U=";
+    hash = "sha256-fsvyMel2OJZNkRJoBBZ4ibP6nX0r8ypFXGNA3A8YJ+M=";
  };

  vendorHash = "sha256-b8er/iF7Dqq+BAulzE/tUebNeKmTMilc+a0yCAJ5E/0=";
@@ -13,16 +13,16 @@

 buildGoModule rec {
  pname = "nwg-look";
-  version = "0.2.7";
+  version = "1.0.2";

  src = fetchFromGitHub {
    owner = "nwg-piotr";
    repo = "nwg-look";
    rev = "v${version}";
-    hash = "sha256-qUNTJkNHWoJisLH0SU23UQuamEL27MMRnxw0kBxzWLk=";
+    hash = "sha256-fvL7AGplIGlSEXlV3lCrBogAu2rD2XZKYTfHKK6Ztjc=";
  };

-  vendorHash = "sha256-qHWy9OCxENrrWk00YoRveSjqYWIy/fe4Fyc8tc4n34E=";
+  vendorHash = "sha256-J9Wc5MCgztzzYnjm3lAREmYLGPyuCX9Xr+qhAwf9Fzg=";

  ldflags = [ "-s" "-w" ];

@@ -64,7 +64,7 @@ buildGoModule rec {

  meta = with lib; {
    homepage = "https://github.com/nwg-piotr/nwg-look";
-    description = "Nwg-look is a GTK3 settings editor, designed to work properly in wlroots-based Wayland environment";
+    description = "GTK settings editor, designed to work properly in wlroots-based Wayland environment";
    license = licenses.mit;
    platforms = platforms.linux;
    maintainers = with maintainers; [ max-amb ];
@@ -6,12 +6,12 @@

 let
  pname = "polypane";
-  version = "22.1.1";
+  version = "23.0.0";

  src = fetchurl {
    url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
    name = "${pname}-${version}.AppImage";
-    sha256 = "sha256-QPKbiecwh0eqbQ5PaGf+yBPUbRR4CfgxN12UOWx+Z9U=";
+    sha256 = "sha256-YGNv3J1nAzj7BtJUxtgYQqlqisqzrGN9SpFs9RnaEh0=";
  };

  appimageContents = appimageTools.extractType2 {
@@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rapidfuzz-cpp";
-  version = "3.3.0";
+  version = "3.3.1";

  src = fetchFromGitHub {
    owner = "rapidfuzz";
    repo = "rapidfuzz-cpp";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-rCA4Rbf7VAcJmRH0KM0gfc3tZPSCBANf7znvoIlD9sk=";
+    hash = "sha256-m8VSqvKF7oRZeVJHRebPePc9iOreXhdmV2rAtB3frKI=";
  };

  nativeBuildInputs = [
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "spicetify-cli";
-  version = "2.38.3";
+  version = "2.38.7";

  src = fetchFromGitHub {
    owner = "spicetify";
    repo = "cli";
    rev = "v${version}";
-    hash = "sha256-la0zNYWzsU49Z6OKTefocN3xzoyNceaPAzG+CAFKMPc=";
+    hash = "sha256-2fsHFl5t/Xo7W5IHGc5FWY92JvXjkln6keEn4BZerw4=";
  };

-  vendorHash = "sha256-BT/zmeNKr2pNBSCaRtT/Dxm3uCshd1j4IW0xU7b9Yz4=";
+  vendorHash = "sha256-a6lAVBUoSTqHnAKKvW+egmtupsuy0uB/XGtBaljju1I=";

  ldflags = [
    "-s -w"
@@ -41,7 +41,7 @@ dependencies = [

 [[package]]
 name = "aim-downloader"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "async-stream",
 "clap",
@@ -1541,6 +1541,12 @@ dependencies = [
 "url",
 ]

+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
 [[package]]
 name = "globset"
 version = "0.4.14"
@@ -1722,7 +1728,7 @@ dependencies = [

 [[package]]
 name = "hash-ids"
-version = "0.22.0"
+version = "0.23.0"

 [[package]]
 name = "hashbrown"
@@ -1906,7 +1912,7 @@ dependencies = [

 [[package]]
 name = "http-api-bindings"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "anyhow",
 "async-openai",
@@ -2117,7 +2123,7 @@ dependencies = [
 "iana-time-zone-haiku",
 "js-sys",
 "wasm-bindgen",
- "windows-core",
+ "windows-core 0.52.0",
 ]

 [[package]]
@@ -2307,7 +2313,7 @@ dependencies = [
 "base64 0.21.7",
 "js-sys",
 "pem",
- "ring",
+ "ring 0.17.8",
 "serde",
 "serde_json",
 "simple_asn1",
@@ -2514,9 +2520,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"

 [[package]]
 name = "libgit2-sys"
@@ -2599,7 +2605,7 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"

 [[package]]
 name = "llama-cpp-server"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "anyhow",
 "async-openai",
@@ -3128,7 +3134,7 @@ dependencies = [

 [[package]]
 name = "ollama-api-bindings"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "anyhow",
 "async-stream",
@@ -3240,9 +3246,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e"
 dependencies = [
 "opentelemetry_api",
- "opentelemetry_sdk",
+ "opentelemetry_sdk 0.18.0",
 ]

+[[package]]
+name = "opentelemetry"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab70038c28ed37b97d8ed414b6429d343a8bbf44c9f79ec854f3a643029ba6d7"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "js-sys",
+ "pin-project-lite",
+ "thiserror",
+ "tracing",
+]
+
+[[package]]
+name = "opentelemetry-otlp"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91cf61a1868dacc576bf2b2a1c3e9ab150af7272909e80085c3173384fe11f76"
+dependencies = [
+ "async-trait",
+ "futures-core",
+ "http 1.1.0",
+ "opentelemetry 0.27.1",
+ "opentelemetry-proto",
+ "opentelemetry_sdk 0.27.1",
+ "prost",
+ "thiserror",
+ "tokio",
+ "tonic",
+ "tracing",
+]
+
+[[package]]
+name = "opentelemetry-proto"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6e05acbfada5ec79023c85368af14abd0b307c015e9064d249b2a950ef459a6"
+dependencies = [
+ "opentelemetry 0.27.1",
+ "opentelemetry_sdk 0.27.1",
+ "prost",
+ "tonic",
+]
+
+[[package]]
+name = "opentelemetry-semantic-conventions"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc1b6902ff63b32ef6c489e8048c5e253e2e4a803ea3ea7e783914536eb15c52"
+
 [[package]]
 name = "opentelemetry_api"
 version = "0.18.0"
@@ -3276,6 +3333,26 @@ dependencies = [
 "thiserror",
 ]

+[[package]]
+name = "opentelemetry_sdk"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "231e9d6ceef9b0b2546ddf52335785ce41252bc7474ee8ba05bfad277be13ab8"
+dependencies = [
+ "async-trait",
+ "futures-channel",
+ "futures-executor",
+ "futures-util",
+ "glob",
+ "opentelemetry 0.27.1",
+ "percent-encoding",
+ "rand 0.8.5",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+]
+
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -3655,6 +3732,29 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8bccbff07d5ed689c4087d20d7307a52ab6141edeedf487c3876a55b86cf63df"

+[[package]]
+name = "prost"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3"
+dependencies = [
+ "anyhow",
+ "itertools 0.13.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "psm"
 version = "0.1.21"
@@ -3995,6 +4095,21 @@ dependencies = [
 "thiserror",
 ]

+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin 0.5.2",
+ "untrusted 0.7.1",
+ "web-sys",
+ "winapi",
+]
+
 [[package]]
 name = "ring"
 version = "0.17.8"
@@ -4006,7 +4121,7 @@ dependencies = [
 "getrandom 0.2.15",
 "libc",
 "spin 0.9.8",
- "untrusted",
+ "untrusted 0.9.0",
 "windows-sys 0.52.0",
 ]

@@ -4130,6 +4245,18 @@ dependencies = [
 "windows-sys 0.52.0",
 ]

+[[package]]
+name = "rustls"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
+dependencies = [
+ "log",
+ "ring 0.16.20",
+ "sct",
+ "webpki",
+]
+
 [[package]]
 name = "rustls"
 version = "0.22.4"
@@ -4137,7 +4264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
 dependencies = [
 "log",
- "ring",
+ "ring 0.17.8",
 "rustls-pki-types",
 "rustls-webpki",
 "subtle",
@@ -4152,7 +4279,7 @@ checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
 dependencies = [
 "log",
 "once_cell",
- "ring",
+ "ring 0.17.8",
 "rustls-pki-types",
 "rustls-webpki",
 "subtle",
@@ -4206,9 +4333,9 @@ version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
- "ring",
+ "ring 0.17.8",
 "rustls-pki-types",
- "untrusted",
+ "untrusted 0.9.0",
 ]

 [[package]]
@@ -4262,6 +4389,16 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"

+[[package]]
+name = "sct"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+dependencies = [
+ "ring 0.17.8",
+ "untrusted 0.9.0",
+]
+
 [[package]]
 name = "sdd"
 version = "0.2.0"
@@ -4798,6 +4935,18 @@ dependencies = [
 "url",
 ]

+[[package]]
+name = "sqlx-migrate-validate"
+version = "0.23.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "sqlx",
+ "sqlx-rt",
+ "thiserror",
+ "tokio",
+]
+
 [[package]]
 name = "sqlx-mysql"
 version = "0.7.4"
@@ -4878,6 +5027,17 @@ dependencies = [
 "whoami",
 ]

+[[package]]
+name = "sqlx-rt"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024"
+dependencies = [
+ "once_cell",
+ "tokio",
+ "tokio-rustls 0.23.4",
+]
+
 [[package]]
 name = "sqlx-sqlite"
 version = "0.7.4"
@@ -5067,17 +5227,16 @@ checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"

 [[package]]
 name = "sysinfo"
-version = "0.29.11"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666"
+checksum = "948512566b1895f93b1592c7574baeb2de842f224f2aab158799ecadb8ebbb46"
 dependencies = [
- "cfg-if",
 "core-foundation-sys",
 "libc",
+ "memchr",
 "ntapi",
- "once_cell",
 "rayon",
- "winapi",
+ "windows 0.57.0",
 ]

 [[package]]
@@ -5103,7 +5262,7 @@ dependencies = [

 [[package]]
 name = "tabby"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "anyhow",
 "assert-json-diff",
@@ -5124,6 +5283,10 @@ dependencies = [
 "llama-cpp-server",
 "nvml-wrapper",
 "openssl",
+ "opentelemetry 0.27.1",
+ "opentelemetry-otlp",
+ "opentelemetry-semantic-conventions",
+ "opentelemetry_sdk 0.27.1",
 "regex",
 "reqwest",
 "reqwest-eventsource",
@@ -5145,6 +5308,7 @@ dependencies = [
 "tokio",
 "tower-http 0.5.2",
 "tracing",
+ "tracing-opentelemetry 0.28.0",
 "tracing-subscriber",
 "utoipa",
 "utoipa-swagger-ui",
@@ -5154,7 +5318,7 @@ dependencies = [

 [[package]]
 name = "tabby-common"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -5182,7 +5346,7 @@ dependencies = [

 [[package]]
 name = "tabby-crawler"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "anyhow",
 "async-stream",
@@ -5201,7 +5365,7 @@ dependencies = [

 [[package]]
 name = "tabby-db"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "anyhow",
 "assert_matches",
@@ -5212,6 +5376,7 @@ dependencies = [
 "serde",
 "sql_query_builder",
 "sqlx",
+ "sqlx-migrate-validate",
 "tabby-db-macros",
 "tokio",
 "uuid",
@@ -5219,7 +5384,7 @@ dependencies = [

 [[package]]
 name = "tabby-db-macros"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "quote",
 "syn 2.0.66",
@@ -5227,7 +5392,7 @@ dependencies = [

 [[package]]
 name = "tabby-download"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "aim-downloader",
 "anyhow",
@@ -5239,7 +5404,7 @@ dependencies = [

 [[package]]
 name = "tabby-git"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "anyhow",
 "assert_matches",
@@ -5260,7 +5425,7 @@ dependencies = [

 [[package]]
 name = "tabby-index"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "anyhow",
 "async-stream",
@@ -5302,7 +5467,7 @@ dependencies = [

 [[package]]
 name = "tabby-index-cli"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "anyhow",
 "clap",
@@ -5314,7 +5479,7 @@ dependencies = [

 [[package]]
 name = "tabby-inference"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "anyhow",
 "async-openai",
@@ -5332,7 +5497,7 @@ dependencies = [

 [[package]]
 name = "tabby-schema"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "anyhow",
 "async-openai",
@@ -5359,7 +5524,7 @@ dependencies = [

 [[package]]
 name = "tabby-webserver"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "anyhow",
 "argon2",
@@ -5556,7 +5721,7 @@ dependencies = [
 "fnv",
 "futures",
 "humantime",
- "opentelemetry",
+ "opentelemetry 0.18.0",
 "pin-project",
 "rand 0.8.5",
 "serde",
@@ -5567,7 +5732,7 @@ dependencies = [
 "tokio-serde",
 "tokio-util",
 "tracing",
- "tracing-opentelemetry",
+ "tracing-opentelemetry 0.18.0",
 ]

 [[package]]
@@ -5772,6 +5937,17 @@ dependencies = [
 "tokio",
 ]

+[[package]]
+name = "tokio-rustls"
+version = "0.23.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
+dependencies = [
+ "rustls 0.20.9",
+ "tokio",
+ "webpki",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.25.0"
@@ -5807,9 +5983,9 @@ dependencies = [

 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
 "futures-core",
 "pin-project-lite",
@@ -5879,6 +6055,36 @@ dependencies = [
 "winnow",
 ]

+[[package]]
+name = "tonic"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "axum",
+ "base64 0.22.1",
+ "bytes",
+ "h2",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.3.1",
+ "hyper-timeout",
+ "hyper-util",
+ "percent-encoding",
+ "pin-project",
+ "prost",
+ "socket2",
+ "tokio",
+ "tokio-stream",
+ "tower 0.4.13",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "tower"
 version = "0.4.13"
@@ -5887,9 +6093,13 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
 "futures-core",
 "futures-util",
+ "indexmap 1.9.3",
 "pin-project",
 "pin-project-lite",
+ "rand 0.8.5",
+ "slab",
 "tokio",
+ "tokio-util",
 "tower-layer",
 "tower-service",
 "tracing",
@@ -6021,12 +6231,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de"
 dependencies = [
 "once_cell",
- "opentelemetry",
+ "opentelemetry 0.18.0",
 "tracing",
 "tracing-core",
 "tracing-subscriber",
 ]

+[[package]]
+name = "tracing-opentelemetry"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97a971f6058498b5c0f1affa23e7ea202057a7301dbff68e968b2d578bcbd053"
+dependencies = [
+ "js-sys",
+ "once_cell",
+ "opentelemetry 0.27.1",
+ "opentelemetry_sdk 0.27.1",
+ "smallvec",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+ "tracing-subscriber",
+ "web-time",
+]
+
 [[package]]
 name = "tracing-subscriber"
 version = "0.3.18"
@@ -6345,6 +6573,12 @@ dependencies = [
 "void",
 ]

+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -6675,6 +6909,16 @@ dependencies = [
 "wasm-bindgen",
 ]

+[[package]]
+name = "webpki"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
+dependencies = [
+ "ring 0.17.8",
+ "untrusted 0.9.0",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.26.3"
@@ -6752,7 +6996,17 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
- "windows-core",
+ "windows-core 0.52.0",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+dependencies = [
+ "windows-core 0.57.0",
 "windows-targets 0.52.5",
 ]

@@ -6765,6 +7019,49 @@ dependencies = [
 "windows-targets 0.52.5",
 ]

+[[package]]
+name = "windows-core"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-result",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -31,7 +31,7 @@ let
  # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix

  pname = "tabby";
-  version = "0.22.0";
+  version = "0.23.0";

  availableAccelerations = flatten [
    (optional cudaSupport "cuda")
@@ -120,7 +120,7 @@ rustPlatform.buildRustPackage {
    owner = "TabbyML";
    repo = "tabby";
    tag = "v${version}";
-    hash = "sha256-fzbJjoBJ6zOw1ABN9PitbW2usm4NgqVfMWSAvRAVHj0=";
+    hash = "sha256-wIrYQqnt6Uuoxqs7QpCU+WQufk5dQuwKR3+fjF+97nM=";
    fetchSubmodules = true;
  };

@@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "taskflow";
-  version = "3.8.0";
+  version = "3.9.0";

  src = fetchFromGitHub {
    owner = "taskflow";
    repo = "taskflow";
-    rev = "v${version}";
-    hash = "sha256-gim1QQKtzMXz8BmNg5YeN4mcveiid5MrS8IrTaTtZ1Y=";
+    tag = "v${version}";
+    hash = "sha256-omon02xgf4vV7JzpLFtHgf2MXxR6JowI+pDyAswXMUY=";
  };

  patches = [
@@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "weaviate";
-  version = "1.28.2";
+  version = "1.28.3";

  src = fetchFromGitHub {
    owner = "weaviate";
    repo = "weaviate";
    rev = "v${version}";
-    hash = "sha256-yIa8AHyoT1z/M/tyPtlNtSMgOhU3XyWtw9OsqrDjO7A=";
+    hash = "sha256-PV1KRPcxhGm0q4+g36MAsAPAV1IdcAD+MjOOkDcQn3Q=";
  };

-  vendorHash = "sha256-u1pfPsc1NuzONyuXPVNO5UcA6vekChnBkLT3MHa2xcc=";
+  vendorHash = "sha256-OYLHHIOZWmkAxVethJNJfJOz3kDIXefu/aAUJ/rvxeQ=";

  subPackages = [ "cmd/weaviate-server" ];

@@ -11,13 +11,13 @@

 buildGoModule rec {
  pname = "yubikey-touch-detector";
-  version = "1.12.4";
+  version = "1.12.5";

  src = fetchFromGitHub {
    owner = "maximbaz";
    repo = "yubikey-touch-detector";
    rev = version;
-    hash = "sha256-AUy/QvNQ3d0b17wcrL3kyhzaEFgS403NR/IBXnJwWwk=";
+    hash = "sha256-eNRwDGTNxBtDepQvf2TXCH/5fb4kRYBn80tzvI4fzME=";
  };
  vendorHash = "sha256-x8Fmhsk6MtgAtLxgH/V3KusM0BXAOaSU+2HULR5boJQ=";

@@ -146,7 +146,6 @@ stdenv.mkDerivation rec {
    ];
    mainProgram = "cbqn";
    maintainers = with lib.maintainers; [
-      AndersonTorres
      detegr
      shnarazk
      sternenseemann
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
    description =
      "APL implementation in Java" + lib.optionalString buildNativeImage ", compiled as a native image";
    license = licenses.mit;
-    maintainers = with maintainers; [ AndersonTorres ];
+    maintainers = with maintainers; [ ];
    inherit (jdk.meta) platforms;
    broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dapl-native.x86_64-darwin
  };
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
      freely copy a database between 32-bit and 64-bit systems or between
      big-endian and little-endian architectures.
    '';
-    maintainers = with maintainers; [ AndersonTorres ];
+    maintainers = with maintainers; [ ];
    license = licenses.bsd2;
  };
 }
@@ -15,14 +15,14 @@

 buildPythonPackage rec {
  pname = "apispec";
-  version = "6.8.0";
+  version = "6.8.1";
  pyproject = true;

  disabled = pythonOlder "3.9";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-hhzKgrvAZSyprOqJaSGyVJRFgDQv3oSfhvbawazGypY=";
+    hash = "sha256-9JFsu3vhVpY7GPWSmg5CvSNJE1g0toCoGxJDK8+qmjk=";
  };

  nativeBuildInputs = [ flit-core ];
@@ -19,7 +19,7 @@

 buildPythonPackage rec {
  pname = "rapidfuzz";
-  version = "3.11.0";
+  version = "3.12.0";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
    owner = "maxbachmann";
    repo = "RapidFuzz";
    tag = "v${version}";
-    hash = "sha256-wsY0JCY8unLIMs01SLgQMOu9RQ0qTdPAZ71e6TigTVQ=";
+    hash = "sha256-BNhdN6nKAIIA2PXrpvdy35udklotoBAu2ghQFNwGvWE=";
  };

  postPatch = ''
@@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-tarpaulin";
-  version = "0.31.4";
+  version = "0.31.5";

  src = fetchFromGitHub {
    owner = "xd009642";
    repo = "tarpaulin";
    rev = version;
-    hash = "sha256-OMGqahssvzTGBk4HoMNnF0EtDi00xJFg6x83Qt54QME=";
+    hash = "sha256-7RSwRKLfNEZQczMriaeXH8uMMqR5Drdmtc68RCO2xTA=";
  };

-  cargoHash = "sha256-TNZDbuG97rHaBkMRXEFz+02RpYMznRhHdAF4Z4Vsggc=";
+  cargoHash = "sha256-O7AhHkL59/B6cbjfyeWbbevJHxOLcQfNQ3mbLAnQwQk=";

  nativeBuildInputs = [
    pkg-config
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
    description = "Sokoban-like game";
    mainProgram = "npush";
    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
+    maintainers = with maintainers; [ ];
    platforms = with platforms; unix;
  };
 }
@@ -42,7 +42,7 @@ mkDerivation rec {
    homepage = "https://github.com/martynets/dialogbox/";
    description = "Qt-based scriptable engine providing GUI dialog boxes";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.unix;
    mainProgram = "dialogbox";
  };
@@ -22,11 +22,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "openvpn";
-  version = "2.6.12";
+  version = "2.6.13";

  src = fetchurl {
    url = "https://swupdate.openvpn.net/community/releases/openvpn-${finalAttrs.version}.tar.gz";
-    hash = "sha256-HGEP3etobjTxNnw0fgJ+QY4HUjoQ9NjOSiwq8vYaGSk=";
+    hash = "sha256-GvELhpIr18mYJ8wPFR3+loQze45evbOXU5FyhBrCSmo=";
  };

  nativeBuildInputs = [ pkg-config ];
@@ -1073,6 +1073,7 @@ mapAliases {
  pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead.";
  pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17
  pltScheme = racket; # just to be sure
+  poac = cabinpkg; # Added 2025-01-22
  poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03
  powerdns = pdns; # Added 2022-03-28