Merge master into staging-next

2026-09-30 20:00:10 +00:00 · 2026-09-11 12:13:59 +00:00
parent 4cc88e9a73 38b366e606
commit 1bf22e836f
17 changed files with 78 additions and 59 deletions
--- a/nixos/modules/system/boot/nix-store-veritysetup.nix
+++ b/nixos/modules/system/boot/nix-store-veritysetup.nix
@@ -7,6 +7,8 @@

 let
  cfg = config.boot.initrd.nix-store-veritysetup;
+
+  json = pkgs.formats.json { };
 in
 {
  meta.maintainers = with lib.maintainers; [ nikstur ];
@@ -27,6 +29,15 @@ in
      contents = {
        "/etc/systemd/system-generators/nix-store-veritysetup-generator".source =
          "${lib.getExe pkgs.nix-store-veritysetup-generator}";
+
+        "/etc/systemd/generator-environment.json".source =
+          json.generate "systemd-generator-environment.json"
+            {
+              SYSTEMD_VERITYSETUP_PATH = "${config.boot.initrd.systemd.package}/lib/systemd/systemd-veritysetup";
+            };
+
+        "/etc/systemd/system-environment-generators/env-generator".source =
+          "${config.system.nixos-init.package}/bin/env-generator";
      };

      storePaths = [
--- a/nixos/tests/vlm-screenshot-question.nix
+++ b/nixos/tests/vlm-screenshot-question.nix
@@ -54,13 +54,14 @@ let
            "Start your output with [output-start]."
            f" {question}"
            " Explain what you see, and your judgment."
-            " Then answer that question with exactly YES or NO, followed by [output-end]."
+            " On the final line, output exactly YES or NO."
+            " Then immediately output [output-end] with nothing else after it."
        )

        vlm_start = time.time()
        result = subprocess.run(
            [
-                "${lib.getExe llama-cpp}",
+                "${lib.getExe' llama-cpp "llama-cli"}",
                "--single-turn", "--no-display-prompt", "--log-verbosity", "0", "--jinja",
                "--simple-io",  # disables the spinner whose backspace chars would corrupt captured output
                "--reasoning", "off", "--temp", "0",
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1292,11 +1292,11 @@
    "vendorHash": "sha256-h3hQfJsyvq6yv/sQAjA+9kPHHrejaF+NyBHFdchLHoA="
  },
  "sysdiglabs_sysdig": {
-    "hash": "sha256-MfwzmTzikzZAg0U7W5Dmjww6Oadnr4Oq+uIQSZaRHEo=",
+    "hash": "sha256-uRsitd0GGeDLONVWae7WZAy8YivMDgJ5FMYPmHIEAnU=",
    "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
    "owner": "sysdiglabs",
    "repo": "terraform-provider-sysdig",
-    "rev": "v3.9.1",
+    "rev": "v3.9.2",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-HjrB7C0KaLJz9NVLfZdq5EZbNbF9lJPxSkQwnWUF978="
  },
@@ -1319,13 +1319,13 @@
    "vendorHash": "sha256-MySaED4kj+F2rYaYu1rpw5qUQFBx9u2Prpn+nqvqqA0="
  },
  "temporalio_temporalcloud": {
-    "hash": "sha256-crsCSIh2Xc7b6X+CxhC7fpp/3FCYEMKAbmq0QTszg0E=",
+    "hash": "sha256-xIyYQ6882s1e+0Th26Atzg07I27WDAOBmgeI2WU3v/g=",
    "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud",
    "owner": "temporalio",
    "repo": "terraform-provider-temporalcloud",
-    "rev": "v1.7.0",
+    "rev": "v1.9.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-kWwfjiWDm/voT95oxyNtCltRzeBJYR3gJo1USV0j/Uo="
+    "vendorHash": "sha256-t799EW0oXtzzHVjbOv5dPQ5V070wg7Y8MZohQ1O70Pk="
  },
  "tencentcloudstack_tencentcloud": {
    "hash": "sha256-nuzKpMtJT0y4OuSvYTKbAs1+FYTpnXnWYI9oEzdt1BM=",
--- a/pkgs/by-name/cl/cloudcompare/package.nix
+++ b/pkgs/by-name/cl/cloudcompare/package.nix
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch2,
  makeDesktopItem,
  copyDesktopItems,
  cmake,
@@ -15,39 +14,38 @@
  laszip,
  mpfr,
  pcl,
-  libsForQt5,
+  qt6Packages,
  nixosTests,
  onetbb,
  xercesc,
  wrapGAppsHook3,
+  pkg-config,
+  libusb1,
+  hidapi,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "cloudcompare";
-  version = "2.13.2";
+  version = "2.13.2-unstable-2026-08-21";
+
+  scriptDeps = true;
+  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "CloudCompare";
    repo = "CloudCompare";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-a/0lf3Mt5ZpLFRM8jAoqZer8pY1ROgPRY4dPt34Bk3E=";
+    rev = "be1fdb0fd05ec42d6922d7f18b22aab71c168ad6";
+    hash = "sha256-dlB3d6AE8R5SjjVUHvYv3D4FjlOnEHHLoDexejwUp6U=";
    fetchSubmodules = true;
  };

-  patches = [
-    # https://github.com/CloudCompare/CloudCompare/pull/2208
-    (fetchpatch2 {
-      url = "https://github.com/CloudCompare/CloudCompare/commit/8e1c0562a7c19fd26ccd0c23bb05fb7c36980e0c.patch?full_index=1";
-      hash = "sha256-DARxLiRjcBJEo63o92ujjxBU42Y8CY2c7px8Y9UD5A4=";
-    })
-  ];
-
  nativeBuildInputs = [
    cmake
-    eigen # header-only
-    wrapGAppsHook3
    copyDesktopItems
-    libsForQt5.wrapQtAppsHook
+    eigen # header-only
+    pkg-config
+    qt6Packages.wrapQtAppsHook
+    wrapGAppsHook3
  ];

  buildInputs = [
@@ -57,12 +55,13 @@ stdenv.mkDerivation (finalAttrs: {
    gdal
    gmp
    laszip
+    libusb1 # required together with hidapi for 3D-mouse support
    mpfr
-    pcl
-    libsForQt5.qtbase
-    libsForQt5.qtsvg
-    libsForQt5.qttools
    onetbb
+    pcl
+    qt6Packages.qtbase
+    qt6Packages.qtsvg
+    qt6Packages.qttools
    xercesc
  ];

@@ -123,7 +122,10 @@ stdenv.mkDerivation (finalAttrs: {

  # fix file dialogs crashing on non-NixOS (and avoid double wrapping)
  preFixup = ''
-    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+    qtWrapperArgs+=(
+      "''${gappsWrapperArgs[@]}"
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ hidapi ]}
+    )
  '';

  desktopItems = [
--- a/pkgs/by-name/gr/gradle-completion/package.nix
+++ b/pkgs/by-name/gr/gradle-completion/package.nix
@@ -8,13 +8,13 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "gradle-completion";
-  version = "9.6.1";
+  version = "9.7.1";

  src = fetchFromGitHub {
    owner = "gradle";
    repo = "gradle-completion";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-bazehfRFvrcKOd5ZCUeKl/Ru/NtlVVS8LoZio+kI7+8=";
+    hash = "sha256-TB8xd7K4S2yh0SHHVrHqFrop78EEZfEMj2Oq/onRJAs=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/li/libtorrent-rakshasa/package.nix
+++ b/pkgs/by-name/li/libtorrent-rakshasa/package.nix
@@ -14,7 +14,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libtorrent-rakshasa";
-  version = "0.16.21";
+  version = "0.16.22";

  __structuredAttrs = true;

@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "rakshasa";
    repo = "libtorrent";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Fszco68NOnvMNKAXWVAmFXhc45A249+Ix+BISZrPjuM=";
+    hash = "sha256-8di26VhRaa9wrkHCmEE7eWKJjwPzm6ma9yKAJCQaQ+A=";
  };

  strictDeps = true;
--- a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
+++ b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
@@ -8,23 +8,22 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "nix-store-veritysetup-generator";
-  version = "1.0.1";
+  version = "1.1.0";

  src = fetchFromGitHub {
    owner = "nikstur";
    repo = "nix-store-veritysetup-generator";
-    rev = finalAttrs.version;
-    hash = "sha256-4VIPyhvPKRlEgX7roUMIyhSBqfrWPbbsdhyccxH8EIM=";
+    tag = finalAttrs.version;
+    hash = "sha256-xZNUqbI6a+RJfaJXBQYf5pAJNIiQdJ1PybeDR0TAfjk=";
  };

  sourceRoot = "${finalAttrs.src.name}/rust";

-  cargoHash = "sha256-nL9GiluLV12J/Kwkq2gAYmOWtPr6sG4ELoLj3UCgDtg=";
+  cargoHash = "sha256-ZTTHeScm4bSWfKHNgmfsxuBS6zTgn7OpFGiBYo0vcfY=";

-  env = {
-    SYSTEMD_VERITYSETUP_PATH = "${systemd}/lib/systemd/systemd-veritysetup";
-    SYSTEMD_ESCAPE_PATH = "${systemd}/bin/systemd-escape";
-  };
+  nativeCheckInputs = [
+    systemd
+  ];

  # Use a fake path in tests so that they are not dependent on specific Nix
  # Store paths and thus don't break on different Nixpkgs invocations. This is
@@ -42,6 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  meta = {
    description = "Systemd unit generator for a verity protected Nix Store";
    homepage = "https://github.com/nikstur/nix-store-veritysetup-generator";
+    changelog = "https://github.com/nikstur/nix-store-veritysetup-generator/blob/${finalAttrs.version}/CHANGELOG.md";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ nikstur ];
    mainProgram = "nix-store-veritysetup-generator";
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -40,7 +40,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rerun";
-  version = "0.37.1";
+  version = "0.37.2";

  __structuredAttrs = true;

@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "rerun-io";
    repo = "rerun";
    tag = finalAttrs.version;
-    hash = "sha256-KeAYvm6TnC7Ex9k/qVdCKuL4C5P2qxGLPFn8UAHXe8M=";
+    hash = "sha256-NgRAZs+SEvBOlMcjyY2i4x+1moqfqxSMuWp34zXjSwM=";
  };

  # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@@ -62,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
      --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
  '';

-  cargoHash = "sha256-iMMQQsdB2iPoSEayBPHrzgo1PII65tDOMGLM63cAIkk=";
+  cargoHash = "sha256-czgvVVRDtaW0CZGznDiSw2AmgljzC69WV9GNnbyXa68=";

  cargoBuildFlags = [
    "--package"
--- a/pkgs/by-name/rt/rtorrent/package.nix
+++ b/pkgs/by-name/rt/rtorrent/package.nix
@@ -23,7 +23,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rtorrent";
-  version = "0.16.20";
+  version = "0.16.22";

  __structuredAttrs = true;

@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "rakshasa";
    repo = "rtorrent";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-fwMyzRBMO45djYXGAE8RcadM/lMJ5m9yi9DEomzO1Es=";
+    hash = "sha256-6N3yERua4mGUKzix8xcnn1yu35EY/bIUfLIyF8B+zHQ=";
  };

  outputs = [
--- a/pkgs/by-name/sg/sgt-puzzles/package.nix
+++ b/pkgs/by-name/sg/sgt-puzzles/package.nix
@@ -18,11 +18,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "sgt-puzzles";
-  version = "20260905.43eefe8";
+  version = "20260911.428913c";

  src = fetchurl {
    url = "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${finalAttrs.version}.tar.gz";
-    hash = "sha256-h85bgljdDGJwtDg9YyXIlKd1lzN/h0zrLlFjIQtiZv8=";
+    hash = "sha256-/Ei3Swv47sJv/fDMAZ/9uSmySZhrKUuvrN7P6/tOGQ0=";
  };

  sgt-puzzles-menu = fetchurl {
--- a/pkgs/by-name/to/topgrade/package.nix
+++ b/pkgs/by-name/to/topgrade/package.nix
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "topgrade";
-  version = "17.9.0";
+  version = "17.10.0";

  src = fetchFromGitHub {
    owner = "topgrade-rs";
    repo = "topgrade";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-7QTQprtqTcOBeGh0j9NQXoS7GXCp95kGVaSnHYGCz7A=";
+    hash = "sha256-tzza9uFeyhdk6GoFfqPrkutWUZz5bJV26gAfHf5bVyA=";
  };

-  cargoHash = "sha256-yz/ptZ/j3UCuDjXXIF2ssPUqD4K9L2N9V0O2U96ZNIw=";
+  cargoHash = "sha256-DBRYrWE0Qidtt3CDfjDaIAHT0gq+XHunrm8eqybVQuk=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/development/python-modules/bambi/default.nix
+++ b/pkgs/development/python-modules/bambi/default.nix
@@ -22,13 +22,14 @@
  # tests
  blackjax,
  numpyro,
+  pytest-mock,
  pytestCheckHook,
  writableTmpDirAsHomeHook,
 }:

 buildPythonPackage (finalAttrs: {
  pname = "bambi";
-  version = "0.20.0";
+  version = "0.21.0";
  pyproject = true;
  __structuredAttrs = true;

@@ -36,7 +37,7 @@ buildPythonPackage (finalAttrs: {
    owner = "bambinos";
    repo = "bambi";
    tag = finalAttrs.version;
-    hash = "sha256-eTqqcVP+ucQ2Sv9mTyMOUdmYYX0pkrsH76DGQKPGO0k=";
+    hash = "sha256-1+NtsjGjVJLVqKD84IqpOoS2btON3hpHM2YI/pqmEN8=";
  };

  build-system = [
@@ -70,6 +71,7 @@ buildPythonPackage (finalAttrs: {
    # bayeux-ml
    blackjax
    numpyro
+    pytest-mock
    pytestCheckHook
    writableTmpDirAsHomeHook
  ];
--- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
+++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
@@ -9,13 +9,13 @@

 buildPythonPackage (finalAttrs: {
  pname = "llama-index-graph-stores-neo4j";
-  version = "0.7.0";
+  version = "0.8.0";
  pyproject = true;

  src = fetchPypi {
    pname = "llama_index_graph_stores_neo4j";
    inherit (finalAttrs) version;
-    hash = "sha256-q+S7NIxlIAXR75cN7IUS2uZYLFDYO7r1nOLVMDHmYSA=";
+    hash = "sha256-QEazL/0J/mzJw4XvEZOqm6Qaujadw1iruDW1o6Ph58A=";
  };

  pythonRelaxDeps = [ "neo4j" ];
--- a/pkgs/development/python-modules/nomadnet/default.nix
+++ b/pkgs/development/python-modules/nomadnet/default.nix
@@ -12,14 +12,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "nomadnet";
-  version = "1.4.1";
+  version = "1.4.2";
  pyproject = true;

  __structuredAttrs = true;

  src = fetchPypi {
    inherit (finalAttrs) version pname;
-    hash = "sha256-7sbmRBmjW01vH2x5+nPUFswRElO8Q/+/p2++Nf1X90c=";
+    hash = "sha256-d3fueyrzCpB66c4CZiH6AyIEFZq75Vu/TA9QTW3xnZE=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/rerun-notebook/default.nix
+++ b/pkgs/development/python-modules/rerun-notebook/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
    inherit (finalAttrs) version;
    format = "wheel";
    python = "py2.py3";
-    hash = "sha256-L18jkB2fVREacJvKiWrNobUf7hTgLc0FEtjcfcFYWKY=";
+    hash = "sha256-le/ebYTdJbqaQEOKBiTP28Yvrwvseg0EVr4b+8n2iQM=";
  };

  pythonRelaxDeps = [
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -14,14 +14,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "rns";
-  version = "1.5.2";
+  version = "1.5.3";
  pyproject = true;
  __structuredAttrs = true;

  src = fetchPypi {
    pname = "rns";
    version = finalAttrs.version;
-    hash = "sha256-p/jw1EUxL+4cSt5BF49SJP56+L15CnnRSGlmWdgcyGI=";
+    hash = "sha256-2WjnzyHyPHkmF8coh6w8WMeI9k8jAPvmA0ZqAQpjYDk=";
  };

  patches = [
--- a/pkgs/development/rocq-modules/equations/default.nix
+++ b/pkgs/development/rocq-modules/equations/default.nix
@@ -17,6 +17,7 @@
      case = case: out: { inherit case out; };
    in
    lib.switch coq.coq-version [
+      (case "9.3" "1.3.2+9.3")
      (case "9.2" "1.3.2+9.2")
      (case "9.1" "1.3.1+9.1")
      (case "9.0" "1.3.1+9.0")
@@ -86,6 +87,8 @@
  release."1.3.1+9.1".hash = "sha256-LtYbAR3jt+JbYcqP+m1n3AZhAWSMIeOZtmdSJwg7L1A=";
  release."1.3.2+9.2".rev = "v1.3.2-9.2";
  release."1.3.2+9.2".hash = "sha256-wpl6Uxy3M2xYuBZPLdsvkvBfXqzplHRrNjyePgLi2X4=";
+  release."1.3.2+9.3".rev = "v1.3.2-9.3";
+  release."1.3.2+9.3".hash = "sha256-V7uHxLkd5rqmu5IqI7KPAGU9rtH2fbroYvwcDuOm3vw=";

  mlPlugin = true;