Merge staging-next into staging

nixos/lib/make-options-doc/mergeJSON.py

@@ -52,12 +52,6 @@ for arg in sys.argv[1:]:
 options = pivot(json.load(open(sys.argv[1 + optOffset], 'r')))
 overrides = pivot(json.load(open(sys.argv[2 + optOffset], 'r')))
 
-# fix up declaration paths in lazy options, since we don't eval them from a full nixpkgs dir
-for (k, v) in options.items():
-    # The _module options are not declared in nixos/modules
-    if v.value['loc'][0] != "_module":
-        v.value['declarations'] = list(map(lambda s: f'nixos/modules/{s}' if isinstance(s, str) else s, v.value['declarations']))
-
 # merge both descriptions
 for (k, v) in overrides.items():
     cur = options.setdefault(k, v).value

pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix

@@ -12,12 +12,12 @@
   pkgs,
 }:
 let
-  version = "0.0.27-unstable-2025-08-14";
+  version = "0.0.27-unstable-2025-09-11";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    rev = "be0937a459624ce1170f158f9d8660d0ade47eb4";
-    hash = "sha256-1NzzyWW2Tp91wa+Ujv2cDTv/Cb/HgA6LiDuwxVWdJwU=";
+    rev = "56951378f10b25f8bb0f5bb516b8d778a1e498a7";
+    hash = "sha256-jLAzTLvhQLyG1zeTGBE02CwVCjtrC7V1LZhGUjNgD8w=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";

pkgs/by-name/al/allure/package.nix

@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "allure";
-  version = "2.35.0";
+  version = "2.35.1";
 
   src = fetchurl {
     url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz";
-    hash = "sha256-LUbwg2jOORIqHbw5EritSBHbsVJgRYyc1cFMuAy3nAg=";
+    hash = "sha256-tAxvH4L4uUXYsUVL6x5kHxlgBCQehyApmu6GIhi9rKY=";
   };
 
   dontConfigure = true;

pkgs/by-name/an/anyrun/package.nix

@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "anyrun";
-  version = "25.9.0";
+  version = "25.9.2";
 
   src = fetchFromGitHub {
     owner = "anyrun-org";
     repo = "anyrun";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-01XBO8U2PyhhYXo3oZAu7dghqXkxdemeG82MqnNp4wE=";
+    hash = "sha256-eSB62Y9QboWMF1aX+KMHc+HkGOMcw4X6gFZu6mQXlgk=";
   };
 
-  cargoHash = "sha256-Xh+RWrAxa1cg0z6IGr7apzoAIlhDl8ZMpQTfoBAZXRk=";
+  cargoHash = "sha256-8LTeRhjU0z06BSOhRKeEC7HssFv2lcM6dIJqfHpIo9w=";
 
   strictDeps = true;
   enableParallelBuilding = true;

pkgs/by-name/co/cosign/package.nix

@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cosign";
-  version = "2.5.3";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = "cosign";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EpCG20SSZFNc/oMgyUP/oARNTrpkzNsTvsA0Wx+zI00=";
+    hash = "sha256-0Wl/+tSYGkp/UNByyQ396gxUSQ4lmC51v3t28gDwNnE=";
   };
 
   buildInputs = lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite);
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
     installShellFiles
   ];
 
-  vendorHash = "sha256-YwSi1TqtcGE1sV9NLJ3lxA8kk0gL+9kTgcJzvIJRanE=";
+  vendorHash = "sha256-1axjX8s1z6awjKLNYffOmLgltFZkbMFBBeFFigYWB9I=";
 
   subPackages = [
     "cmd/cosign"

pkgs/by-name/fa/fastchess/package.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastchess";
-  version = "1.4.0-alpha";
+  version = "1.5.0-alpha";
 
   src = fetchFromGitHub {
     owner = "Disservin";
     repo = "fastchess";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fzNpanfeXk7eKftzcs5MIaDBvzumaMQIhhQ8IDFjwPQ=";
+    hash = "sha256-hpp10ioAh063LpZa5t2HCX+Fsr8Z6fhPIaTzMgtT1go=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ki/kine/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kine";
-  version = "0.13.19";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "k3s-io";
     repo = "kine";
     rev = "v${version}";
-    hash = "sha256-UL1HhN5qWgtzltY4eAU9SlnK80tKUHBORMFHunDCi+Q=";
+    hash = "sha256-/sI9ofYTqnEW5bzkrorWOhs4Z+U6+8yP0F+Za2s/MCE=";
   };
 
   vendorHash = "sha256-1Dwu1b6y1ibGt7w6Iu3lKWItwVn9H/TQFbTL2z2rVoc=";

pkgs/by-name/me/metee/package.nix

@@ -7,12 +7,12 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "metee";
-  version = "6.0.1";
+  version = "6.0.2";
   src = fetchFromGitHub {
     owner = "intel";
     repo = "metee";
     tag = finalAttrs.version;
-    hash = "sha256-PwIadjg1D7WumqVgkpfnXkdUzIOjzA+b3Jjk30epAE8=";
+    hash = "sha256-eQpw0VdO+JGtgW4FGduoxY0Gji4hFPSONcEzDRcgWGU=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/by-name/od/odhcp6c/package.nix

@@ -0,0 +1,34 @@
+{
+  lib,
+  stdenv,
+  fetchgit,
+  cmake,
+  unstableGitUpdater,
+}:
+
+stdenv.mkDerivation {
+  pname = "odhcp6c";
+  version = "0-unstable-2025-02-06";
+
+  src = fetchgit {
+    url = "https://git.openwrt.org/project/odhcp6c.git";
+    rev = "8aa8b706727a6a6a841be42ef35a629ed635db3e";
+    hash = "sha256-cFDiT8EC8/2yuLM6dTWTzwxSbFpc7zuUKx2SHbR4PfQ=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_PREFIX=$out"
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Embedded DHCPv6-client for OpenWrt";
+    homepage = "https://openwrt.org/packages/pkgdata/odhcp6c";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ felbinger ];
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/wo/wootility/package.nix

@@ -7,10 +7,10 @@
 
 let
   pname = "wootility";
-  version = "5.0.6";
+  version = "5.1.0";
   src = fetchurl {
     url = "https://wootility-updates.ams3.cdn.digitaloceanspaces.com/wootility-linux/Wootility-${version}.AppImage";
-    sha256 = "sha256-9DFt8Hx39B7hgIQn22TPDva1mpxBYFtddNG+WNeqgF8=";
+    sha256 = "sha256-y65aqHBAGkzjobUMoBPQNkfh19rNVarPctcxmNFxlho=";
   };
 in
 

pkgs/by-name/wr/wrangler/package.nix

@@ -105,6 +105,12 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
+
+  preFixup = ''
+    # fixupPhase spends a lot of time trying to strip text files, which is especially slow on Darwin
+    stripExclude+=("*.js" "*.ts" "*.map" "*.json" "*.md")
+  '';
+
   meta = {
     description = "Command-line interface for all things Cloudflare Workers";
     homepage = "https://github.com/cloudflare/workers-sdk#readme";

pkgs/by-name/zi/zizmor/package.nix

@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zizmor";
-  version = "1.12.1";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "zizmorcore";
     repo = "zizmor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GnKSbcsVYzbhsrwIUAEArltzQe0IE2tiIr2CqsMQyzk=";
+    hash = "sha256-D4SJFueWUUABkJeKpgVywoJcQETVKCFA9dYisFIh11I=";
   };
 
-  cargoHash = "sha256-wLJlaV59sAo97KI6Ekw42aaG6hVkul1wFvcC+71+Zp4=";
+  cargoHash = "sha256-7MKTw1XeZk4VYRA3q24iEGD/gXs+Uy0XC090kx+/Z5I=";
 
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     installShellFiles

pkgs/development/compilers/openjdk/17/source.json

@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-4fpph2tOLh3Ml8pm2a1ZqLS7R84hQnKCLM4tdg628SI=",
+  "hash": "sha256-YN9mPfi3oMGjeRIren2cdWWySpYXsIcOnP29Zh3ym8c=",
   "owner": "openjdk",
   "repo": "jdk17u",
-  "rev": "refs/tags/jdk-17.0.15+6"
+  "rev": "refs/tags/jdk-17.0.16+8"
 }

pkgs/development/python-modules/cirq-rigetti/default.nix

@@ -1,50 +0,0 @@
-{
-  buildPythonPackage,
-  cirq-core,
-  setuptools,
-  pyquil,
-  qcs-sdk-python,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "cirq-rigetti";
-  pyproject = true;
-  inherit (cirq-core) version src;
-
-  sourceRoot = "${src.name}/${pname}";
-
-  pythonRelaxDeps = [
-    "pyquil"
-    "qcs-sdk-python"
-  ];
-
-  postPatch = ''
-    # Remove outdated test
-    rm cirq_rigetti/service_test.py
-  '';
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    cirq-core
-    pyquil
-    qcs-sdk-python
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  disabledTestPaths = [
-    # No need to test the version number
-    "cirq_rigetti/_version_test.py"
-  ];
-
-  # cirq's importlib hook doesn't work here
-  #pythonImportsCheck = [ "cirq_rigetti" ];
-
-  meta = {
-    inherit (cirq-core.meta) changelog license maintainers;
-    description = "Cirq package to simulate and connect to Rigetti quantum computers and Quil QVM";
-    homepage = "https://github.com/quantumlib/Cirq/tree/main/cirq-rigetti";
-  };
-}

pkgs/development/python-modules/cirq/default.nix

@@ -10,7 +10,6 @@
   cirq-google,
   cirq-ionq,
   cirq-pasqal,
-  cirq-rigetti,
   cirq-web,
 
   # tests
@@ -30,7 +29,6 @@ buildPythonPackage {
     cirq-google
     cirq-ionq
     cirq-pasqal
-    cirq-rigetti
     cirq-web
   ];
 
@@ -44,7 +42,6 @@ buildPythonPackage {
     "cirq-google"
     "cirq-ionq"
     "cirq-pasqal"
-    "cirq-rigetti"
     "cirq-web"
     "dev_tools"
   ];

pkgs/development/python-modules/openstacksdk/default.nix

@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "openstacksdk";
-  version = "4.7.0";
+  version = "4.7.1";
   pyproject = true;
 
   outputs = [
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7muFOJez7vNH+lBCGHF0AmrRgalf9uaTOEH1+caXsb0=";
+    hash = "sha256-IzSKppxsxsHtDo8D+0KxVlGe2M/NFD54PvXB3YAK2fE=";
   };
 
   postPatch = ''

pkgs/development/python-modules/pillow-heif/default.nix

@@ -74,17 +74,9 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  preCheck = ''
-    # https://github.com/bigcat88/pillow_heif/issues/325
-    rm tests/images/heif_other/L_xmp_latin1.heic
-    rm tests/images/heif/L_xmp.heif
-  '';
-
   disabledTests = [
-    # Time based
+    # Time sensitive speed test, not reproducible
     "test_decode_threads"
-    # Missing EXIF info on WEBP-AVIF variant
-    "test_exif_from_pillow"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # https://github.com/bigcat88/pillow_heif/issues/89
@@ -110,6 +102,9 @@ buildPythonPackage rec {
       bsd3
       lgpl3
     ];
-    maintainers = with lib.maintainers; [ dandellion ];
+    maintainers = with lib.maintainers; [
+      dandellion
+      kuflierl
+    ];
   };
 }

pkgs/development/python-modules/pyblu/default.nix

@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyblu";
-  version = "2.0.4";
+  version = "2.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "LouisChrist";
     repo = "pyblu";
     tag = "v${version}";
-    hash = "sha256-nzTqakEMl9gywIQpC9OR0xiqZzawU5RxOx3NQT+CiFc=";
+    hash = "sha256-Cmc0GXucoSSBWii+Xkx2jhG81kO+UeQUX3fKHUgLNS4=";
   };
 
   pythonRelaxDeps = [ "aiohttp" ];

pkgs/development/python-modules/quil/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "quil";
-  version = "0.16.0";
+  version = "0.17.0";
   pyproject = true;
 
   # error: the configured Python interpreter version (3.13) is newer than PyO3's maximum supported version (3.12)
@@ -21,12 +21,12 @@ buildPythonPackage rec {
     owner = "rigetti";
     repo = "quil-rs";
     tag = "quil-py/v${version}";
-    hash = "sha256-sj+JjE6y+toIjHO1J2g+3gzQMcfSa6zzQeOySATU48w=";
+    hash = "sha256-sQvHar52IFVUM+AssPEtBcSGVEma9e909K/5c8H0WQw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-0KZikbCJgg4prR9XxfCJcZOTiV2Hcob2zLurxqCkH6I=";
+    hash = "sha256-3qFrsevaVP2tPf0OV0hW6HhhWsj2BM/2sZUvdq1Aa4k=";
   };
 
   buildAndTestSubdir = "quil-py";
@@ -50,6 +50,10 @@ buildPythonPackage rec {
     syrupy
   ];
 
+  pytestFlags = [
+    "quil-py/tests_py"
+  ];
+
   meta = {
     changelog = "https://github.com/rigetti/quil-rs/blob/${src.tag}/quil-py/CHANGELOG.md";
     description = "Python package for building and parsing Quil programs";

pkgs/development/python-modules/reptor/default.nix

@@ -6,6 +6,7 @@
   deepl,
   django,
   fetchFromGitHub,
+  fetchpatch,
   gql,
   pytestCheckHook,
   pyyaml,
@@ -34,6 +35,14 @@ buildPythonPackage rec {
     hash = "sha256-nNG4rQHloOqcPZPnvw3hbw0+wCbB2XAdQ5/XnJtCHnE=";
   };
 
+  patches = [
+    # https://github.com/Syslifters/reptor/pull/221
+    (fetchpatch {
+      url = "https://github.com/Syslifters/reptor/commit/0fc43c246e2f99aaac9e78af818f360a3a951980.patch";
+      hash = "sha256-eakbI7hMJdshD0OA6n7dEO4+qPB21sYl09uZgepiWu0=";
+    })
+  ];
+
   pythonRelaxDeps = true;
 
   build-system = [ setuptools ];
@@ -69,15 +78,9 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "reptor" ];
 
-  disabledTestPaths = [
-    # Tests want to use pip install dependencies
-    "reptor/plugins/importers/GhostWriter/tests/test_ghostwriter.py"
-  ];
-
-  disabledTests = [
+  disabledTestMarks = [
     # Tests need network access
-    "TestDummy"
-    "TestIntegration"
+    "integration"
   ];
 
   meta = with lib; {

pkgs/development/python-modules/session-info2/default.nix

@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "session-info2";
-  version = "0.2.1";
+  version = "0.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scverse";
     repo = "session-info2";
     tag = "v${version}";
-    hash = "sha256-d56aIKKBiktOepN/SXwuSaFjSelJ9QiTcbO0OvbkNW4=";
+    hash = "sha256-C/+0XxgaEznyWr7LYJ89YHozpKvf5QjFmcr4B/44LNU=";
   };
 
   build-system = [

pkgs/development/python-modules/tinygrad/default.nix

@@ -107,8 +107,8 @@ buildPythonPackage rec {
     + lib.optionalString cudaSupport ''
       substituteInPlace tinygrad/runtime/support/compiler_cuda.py \
         --replace-fail \
-        ', "-I/usr/local/cuda/include", "-I/usr/include", "-I/opt/cuda/include/"' \
-        ', "-I${lib.getDev cudaPackages.cuda_cudart}/include/"'
+        '"-I/usr/local/cuda/include", "-I/usr/include", "-I/opt/cuda/include"' \
+        '"-I${lib.getDev cudaPackages.cuda_cudart}/include/"'
     ''
     + lib.optionalString rocmSupport ''
       substituteInPlace tinygrad/runtime/autogen/hip.py \

pkgs/servers/home-assistant/custom-components/yandex-station/package.nix

@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
   owner = "AlexxIT";
   domain = "yandex_station";
-  version = "3.19.1";
+  version = "3.20.0";
 
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "YandexStation";
     tag = "v${version}";
-    hash = "sha256-O+LHD9wKnXaNX/aVrt5lOuuqi1ymF+YqEJP+24NVBhw=";
+    hash = "sha256-dGMq/uJBr30K9J4C5rFbX99ykf3WttPMLEHf6674THk=";
   };
 
   dependencies = [
@@ -39,6 +39,7 @@ buildHomeAssistantComponent rec {
   ++ (home-assistant.getPackages "stream" home-assistant.python.pkgs);
 
   meta = {
+    changelog = "https://github.com/AlexxIT/YandexStation/releases/tag/${src.tag}";
     description = "Controlling Yandex.Station and other smart home devices with Alice from Home Assistant";
     homepage = "https://github.com/AlexxIT/YandexStation";
     license = lib.licenses.mit;

pkgs/tools/package-management/nix/modular/packaging/components.nix

@@ -156,6 +156,10 @@ let
       // lib.optionalAttrs (
         stdenv.isLinux
         && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")
+        && !(
+          stdenv.buildPlatform.config != stdenv.hostPlatform.config
+          && stdenv.hostPlatform.system == "powerpc64-linux"
+        )
         && !(stdenv.system == "loongarch64-linux")
         && !(stdenv.hostPlatform.useLLVM or false)
       ) { LDFLAGS = "-fuse-ld=gold"; };

pkgs/top-level/python-aliases.nix

@@ -149,6 +149,7 @@ mapAliases ({
   chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
   class-registry = phx-class-registry; # added 2021-10-05
   cirq-ft = throw "cirq-ft is not longer provieded by cirq upstream"; # added 2024-08-31
+  cirq-rigetti = throw "cirq-rigetti was removed because it is no longer provided by upstream"; # added 2025-09-13
   ciscoconfparse = throw "ciscoconfparse was archived by upstream, use ciscoconfparse2"; # added 2025-03-08
   cld2-cffi = throw "cld2-cffi has been removed, as the last release was in 2016"; # added 2024-05-20
   clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26

pkgs/top-level/python-packages.nix

@@ -2580,8 +2580,6 @@ self: super: with self; {
 
   cirq-pasqal = callPackage ../development/python-modules/cirq-pasqal { };
 
-  cirq-rigetti = callPackage ../development/python-modules/cirq-rigetti { };
-
   cirq-web = callPackage ../development/python-modules/cirq-web { };
 
   ciscoconfparse2 = callPackage ../development/python-modules/ciscoconfparse2 { };