Merge staging-next into staging

2026-01-12 02:40:31 +08:00 · 2025-01-23 12:06:51 +00:00
parent 858cdc95a4 773f59ce7f
commit ecb2ab8582
11 changed files with 156 additions and 143 deletions
--- a/ci/pinned-nixpkgs.json
+++ b/ci/pinned-nixpkgs.json
@@ -1,4 +1,4 @@
 {
-  "rev": "929116e316068c7318c54eb4d827f7d9756d5e9c",
-  "sha256": "1am61kcakn9j47435k4cgsarvypb8klv4avszxza0jn362hp3ck8"
+  "rev": "5757bbb8bd7c0630a0cc4bb19c47e588db30b97c",
+  "sha256": "0px0lr7ad2zrws400507c9w5nnaffz9mp9hqssm64icdm6f6h0fz"
 }
--- a/pkgs/by-name/al/altair/package.nix
+++ b/pkgs/by-name/al/altair/package.nix
@@ -7,11 +7,11 @@

 let
  pname = "altair";
-  version = "8.0.5";
+  version = "8.1.3";

  src = fetchurl {
    url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
-    sha256 = "sha256-iQK+oZdNFywDSuL7AzS/8I17QH0m9ehQj7c1D0TnwTU=";
+    sha256 = "sha256-1NNm4HUWb6Imz9dV23fmoR77rBiJD8zI83Pm4CCvfe4=";
  };

  appimageContents = appimageTools.extract { inherit pname version src; };
--- a/pkgs/by-name/ch/chatterino2/package.nix
+++ b/pkgs/by-name/ch/chatterino2/package.nix
@@ -3,42 +3,48 @@
  callPackage,
  fetchFromGitHub,
  nix-update-script,
+  boost186,
 }:

-(callPackage ./common.nix { }).overrideAttrs (finalAttrs: _: {
-  pname = "chatterino2";
-  version = "2.5.2";
+(callPackage ./common.nix {
+  boost = boost186;
+}).overrideAttrs
+  (
+    finalAttrs: _: {
+      pname = "chatterino2";
+      version = "2.5.2";

-  src = fetchFromGitHub {
-    owner = "Chatterino";
-    repo = "chatterino2";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-nrw4dQ7QjPPMbZXMC+p3VgUQKwc1ih6qS13D9+9oNuw=";
-    fetchSubmodules = true;
-  };
+      src = fetchFromGitHub {
+        owner = "Chatterino";
+        repo = "chatterino2";
+        tag = "v${finalAttrs.version}";
+        hash = "sha256-nrw4dQ7QjPPMbZXMC+p3VgUQKwc1ih6qS13D9+9oNuw=";
+        fetchSubmodules = true;
+      };

-  passthru = {
-    buildChatterino = args: callPackage ./common.nix args;
-    updateScript = nix-update-script { };
-  };
+      passthru = {
+        buildChatterino = args: callPackage ./common.nix args;
+        updateScript = nix-update-script { };
+      };

-  meta = {
-    description = "Chat client for Twitch chat";
-    mainProgram = "chatterino";
-    longDescription = ''
-      Chatterino is a chat client for Twitch chat. It aims to be an
-      improved/extended version of the Twitch web chat. Chatterino 2 is
-      the second installment of the Twitch chat client series
-      "Chatterino".
-    '';
-    homepage = "https://github.com/Chatterino/chatterino2";
-    changelog = "https://github.com/Chatterino/chatterino2/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [
-      rexim
-      supa
-      marie
-    ];
-  };
-})
+      meta = {
+        description = "Chat client for Twitch chat";
+        mainProgram = "chatterino";
+        longDescription = ''
+          Chatterino is a chat client for Twitch chat. It aims to be an
+          improved/extended version of the Twitch web chat. Chatterino 2 is
+          the second installment of the Twitch chat client series
+          "Chatterino".
+        '';
+        homepage = "https://github.com/Chatterino/chatterino2";
+        changelog = "https://github.com/Chatterino/chatterino2/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+        license = lib.licenses.mit;
+        platforms = lib.platforms.unix;
+        maintainers = with lib.maintainers; [
+          rexim
+          supa
+          marie
+        ];
+      };
+    }
+  )
--- a/pkgs/by-name/ch/chatterino7/package.nix
+++ b/pkgs/by-name/ch/chatterino7/package.nix
@@ -3,10 +3,12 @@
  chatterino2,
  fetchFromGitHub,
  nix-update-script,
+  boost186,
 }:

 (chatterino2.buildChatterino {
  enableAvifSupport = true;
+  boost = boost186;
 }).overrideAttrs
  (
    finalAttrs: _: {
--- a/pkgs/by-name/ku/kubedog/package.nix
+++ b/pkgs/by-name/ku/kubedog/package.nix
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "kubedog";
-  version = "0.12.3";
+  version = "0.13.0";

  src = fetchFromGitHub {
    owner = "werf";
    repo = "kubedog";
    rev = "v${version}";
-    hash = "sha256-dk6ieIUoS1N2UtiLig5dFq0476xh69bjueN05ZKjcLg=";
+    hash = "sha256-xBTz1Ux2W0A0leOPNu0yONiz55LiYcYiviKEi8xsUTU=";
  };

-  vendorHash = "sha256-lLyIVA7Mkj1bfA/u8VMTwmKmhNfibYpT+dgIWFdOiPs=";
+  vendorHash = "sha256-kCS7nMFskBw6LTV5EgPSufxo78OyfW9Zdqe5rZytgKE=";

  subPackages = [ "cmd/kubedog" ];

--- a/pkgs/by-name/li/librime/package.nix
+++ b/pkgs/by-name/li/librime/package.nix
@@ -30,13 +30,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "librime";
-  version = "1.12.0";
+  version = "1.13.0";

  src = fetchFromGitHub {
    owner = "rime";
    repo = pname;
    rev = version;
-    sha256 = "sha256-NwtWpH1FxIZP/+oOJbsaEmySLxXlxkCCIG+SEGo242Q=";
+    sha256 = "sha256-vkliraMsBLX05gae834R0LX4uT+XaxrfHmDkFPh1XIQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/my/mysqltuner/package.nix
+++ b/pkgs/by-name/my/mysqltuner/package.nix
@@ -4,24 +4,24 @@
  fetchFromGitHub,
  perl,
 }:
-
 stdenv.mkDerivation rec {
  pname = "mysqltuner";
-  version = "1.8.3";
+  version = "2.6.0";

  src = fetchFromGitHub {
    owner = "major";
    repo = "MySQLTuner-perl";
-    rev = version;
-    sha256 = "sha256-ezF0zjQB/KWD5rUcbXx2uwiNLsIJ7ZKMoqkclP7oc98=";
+    rev = "v${version}";
+    hash = "sha256-JIO/auY8E6at9OCIqgKbBz9OhOeZMtQvUoUYPMEVtCg=";
  };

  postPatch = ''
    substituteInPlace mysqltuner.pl \
-      --replace '/usr/share' "$out/share"
+      --replace-fail '/usr/share' "$out/share"
  '';

  buildInputs = [ perl ];
+  dontBuild = true;

  installPhase = ''
    runHook preInstall
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -7,19 +7,19 @@
 }:
 let
  pname = "open-webui";
-  version = "0.5.5";
+  version = "0.5.6";

  src = fetchFromGitHub {
    owner = "open-webui";
    repo = "open-webui";
    tag = "v${version}";
-    hash = "sha256-4g+dt1dbN/ulERW3WLjTJ0++JD5NLREXjGu6ngPdxAI=";
+    hash = "sha256-9HRUFG8knKJx5Fr0uxLPMwhhbNnQ7CSywla8LGZu8l4=";
  };

  frontend = buildNpmPackage {
    inherit pname version src;

-    npmDepsHash = "sha256-cIocYy91JfcZM35ZiT6onEsz89qAZ+7jCjpjg6lV4pc=";
+    npmDepsHash = "sha256-copQjrFgVJ6gZ8BwPiIsHEKSZDEiuVU3qygmPFv5Y1A=";

    # Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
    # Until this is solved, running python packages from the browser will not work.
@@ -46,6 +46,8 @@ python312.pkgs.buildPythonApplication rec {
  inherit pname version src;
  pyproject = true;

+  build-system = with python312.pkgs; [ hatchling ];
+
  # Not force-including the frontend build directory as frontend is managed by the `frontend` derivation above.
  postPatch = ''
    substituteInPlace pyproject.toml \
@@ -62,92 +64,93 @@ python312.pkgs.buildPythonApplication rec {
    "pytest-docker"
  ];

-  dependencies = with python312.pkgs; [
-    aiocache
-    aiofiles
-    aiohttp
-    alembic
-    anthropic
-    apscheduler
-    argon2-cffi
-    async-timeout
-    authlib
-    bcrypt
-    beautifulsoup4
-    black
-    boto3
-    chromadb
-    colbert-ai
-    docx2txt
-    duckduckgo-search
-    einops
-    extract-msg
-    fake-useragent
-    fastapi
-    faster-whisper
-    flask
-    flask-cors
-    fpdf2
-    ftfy
-    gcp-storage-emulator
-    google-api-python-client
-    google-auth-httplib2
-    google-auth-oauthlib
-    google-cloud-storage
-    google-generativeai
-    googleapis-common-protos
-    iso-639
-    langchain
-    langchain-community
-    langdetect
-    langfuse
-    ldap3
-    markdown
-    moto
-    nltk
-    openai
-    opencv-python-headless
-    openpyxl
-    opensearch-py
-    pandas
-    passlib
-    peewee
-    peewee-migrate
-    pgvector
-    psutil
-    psycopg2-binary
-    pydub
-    pyjwt
-    pymdown-extensions
-    pymilvus
-    pymongo
-    pymysql
-    pypandoc
-    pypdf
-    python-dotenv
-    python-jose
-    python-multipart
-    python-pptx
-    python-socketio
-    pytube
-    pyxlsb
-    qdrant-client
-    rank-bm25
-    rapidocr-onnxruntime
-    redis
-    requests
-    sentence-transformers
-    soundfile
-    tiktoken
-    transformers
-    unstructured
-    uvicorn
-    validators
-    xlrd
-    youtube-transcript-api
-  ];
-
-  build-system = with python312.pkgs; [ hatchling ];
+  dependencies =
+    with python312.pkgs;
+    [
+      aiocache
+      aiofiles
+      aiohttp
+      alembic
+      anthropic
+      apscheduler
+      argon2-cffi
+      async-timeout
+      authlib
+      bcrypt
+      beautifulsoup4
+      black
+      boto3
+      chromadb
+      colbert-ai
+      docx2txt
+      duckduckgo-search
+      einops
+      extract-msg
+      fake-useragent
+      fastapi
+      faster-whisper
+      flask
+      flask-cors
+      fpdf2
+      ftfy
+      gcp-storage-emulator
+      google-api-python-client
+      google-auth-httplib2
+      google-auth-oauthlib
+      google-cloud-storage
+      google-generativeai
+      googleapis-common-protos
+      iso-639
+      langchain
+      langchain-community
+      langdetect
+      langfuse
+      ldap3
+      markdown
+      moto
+      nltk
+      openai
+      opencv-python-headless
+      openpyxl
+      opensearch-py
+      pandas
+      passlib
+      peewee
+      peewee-migrate
+      pgvector
+      psutil
+      psycopg2-binary
+      pydub
+      pyjwt
+      pymdown-extensions
+      pymilvus
+      pymongo
+      pymysql
+      pypandoc
+      pypdf
+      python-dotenv
+      python-jose
+      python-multipart
+      python-pptx
+      python-socketio
+      pytube
+      pyxlsb
+      qdrant-client
+      rank-bm25
+      rapidocr-onnxruntime
+      redis
+      requests
+      sentence-transformers
+      soundfile
+      tiktoken
+      transformers
+      unstructured
+      uvicorn
+      validators
+      xlrd
+      youtube-transcript-api
+    ]
+    ++ moto.optional-dependencies.s3;

  pythonImportsCheck = [ "open_webui" ];

--- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
+++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "raspberrypi-eeprom";
-  version = "2024.11.12-2712";
+  version = "2025.01.22-2712";

  src = fetchFromGitHub {
    owner = "raspberrypi";
    repo = "rpi-eeprom";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-6HyaEdMEBIFilZJJ9yPBHqdp0g+kLbbpr/5RsLZLI3U=";
+    hash = "sha256-NQr+10yEAq8skBBE1qveFJr0MJAWlQj24p/beu/RglE=";
  };

  buildInputs = [ python3 ];
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -4,7 +4,9 @@
  fetchFromGitLab,
  gitUpdater,
  testers,
-  boost,
+  # dbus-cpp not compatible with Boost 1.87
+  # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/8
+  boost186,
  cmake,
  cmake-extras,
  dbus,
@@ -58,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs =
    [
-      boost
+      boost186
      cmake-extras
      dbus
      dbus-cpp
--- a/pkgs/development/python-modules/vector/default.nix
+++ b/pkgs/development/python-modules/vector/default.nix
@@ -24,14 +24,14 @@

 buildPythonPackage rec {
  pname = "vector";
-  version = "1.6.0";
+  version = "1.6.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "scikit-hep";
    repo = "vector";
    tag = "v${version}";
-    hash = "sha256-W10j1oQdmJ7GE0dCsAPtIsEPy4L2CIvVEZZqm7aHxII=";
+    hash = "sha256-EHvdz6Tv3qJr6yUAw3/TuoMSrOCAQpsFBF1sS5I2p2k=";
  };

  build-system = [