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

Merge master into staging-nixos

parents b55b2eff 63a07ef0

maintainers/maintainer-list.nix

+18 −0
Original line number Diff line number Diff line
@@ -11352,6 +11352,12 @@ 
    githubId = 3948275;

    name = "Harikrishnan R";

  };

  ilosariph = {

    email = "simon@simon-wick.ch";

    github = "Ilosariph";

    githubId = 71074737;

    name = "Simon Wick";

  };

  ilya-epifanov = {

    email = "mail@ilya.network";

    github = "ilya-epifanov";
@@ -22883,6 +22889,12 @@ 
    githubId = 4196789;

    name = "Nathan Ringo";

  };

  remix7531 = {

    email = "remix7531@mailbox.org";

    github = "remix7531";

    githubId = 131352678;

    name = "remix7531";

  };

  remko = {

    github = "remko";

    githubId = 12300;
@@ -27664,6 +27676,12 @@ 
    githubId = 74688871;

    name = "Tochukwu Ahanonu";

  };

  toelke = {

    name = "Philipp Riederer";

    email = "philipp@riederer.email";

    github = "toelke";

    githubId = 183276;

  };

  tom94 = {

    email = "nix@94.me";

    github = "Tom94";

nixos/modules/services/monitoring/vlagent.nix

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ let 
    "-remoteWrite.basicAuth.username=${cfg.remoteWrite.basicAuthUsername}"

  ]

  ++ lib.optionals (cfg.remoteWrite.maxDiskUsagePerUrl != null) [

    "-remoteWrite.maxDiskUsagePerUrl=${cfg.remoteWrite.maxDiskUsagePerUrl}"

    "-remoteWrite.maxDiskUsagePerURL=${cfg.remoteWrite.maxDiskUsagePerUrl}"

  ];

in

{

pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix

+6 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
  neovim,

  neovimUtils,

  runCommand,

  runCommandLocal,

  vimPlugins,

  writableTmpDirAsHomeHook,

}:
@@ -22,7 +23,11 @@ let 
      requires ? [ ],

    }:

    vimUtils.toVimPlugin (

      runCommand "nvim-treesitter-queries-${language}"

      # Just mkdir + ln -s; cheaper to build than to substitute (and not

      # on cache.nixos.org anyway since release.nix doesn't recurse into

      # passthru.queries). With ~300 languages under withAllGrammars,

      # round-tripping each to a remote builder is very slow.

      runCommandLocal "nvim-treesitter-queries-${language}"

        {

          passthru = {

            inherit language requires;

pkgs/applications/emulators/libretro/cores/dosbox-pure.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
}:

mkLibretroCore {

  core = "dosbox-pure";

  version = "0-unstable-2026-02-17";

  version = "0-unstable-2026-04-17";



  src = fetchFromGitHub {

    owner = "schellingb";

    repo = "dosbox-pure";

    rev = "f587236b2d016f4f16d672e9ce2829bdf507bf9b";

    hash = "sha256-OS6iY8b8pvqkJpDQO9DHRUh7ckjov5t1GZldOR+qg0Y=";

    rev = "93cf48bb22b30a9bc657511658cf4dbcd9a727eb";

    hash = "sha256-QW1wIE4uuyCiI7eJjHsKh6PJd6QJwrBUQa4wkhPyRSE=";

  };



  hardeningDisable = [ "format" ];

pkgs/applications/emulators/libretro/cores/gambatte.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
}:

mkLibretroCore {

  core = "gambatte";

  version = "0-unstable-2026-04-03";

  version = "0-unstable-2026-04-11";



  src = fetchFromGitHub {

    owner = "libretro";

    repo = "gambatte-libretro";

    rev = "483a1f13f7e8a1c2b3076eb8bfc38e668e640c17";

    hash = "sha256-efpehssNF3FmSbJAqRS1PkYWTs1v0y0KTdBiRV8K/WY=";

    rev = "ac3d17d07a1119df5eb124494dfa90e47ae2e5ff";

    hash = "sha256-5240slUbHUYb6Xp65xPvvCopdciyGK+Z8mdk7i0ALIQ=";

  };



  meta = {