Unverified Commit 88084c2d authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents b7fc388a 6ee883b5

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

+0 −6
Original line number Diff line number Diff line
@@ -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

+3 −3
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+3 −3
Original line number Diff line number Diff line
@@ -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

+3 −3
Original line number Diff line number Diff line
@@ -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"