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

Merge master into staging-next

parents 7f805fae f2b808eb

maintainers/maintainer-list.nix

+2 −3
Original line number Diff line number Diff line
@@ -7047,11 +7047,10 @@ 
    name = "Dzmitry Lahoda";

  };

  e-v-o-l-v-e = {

    name = "Ivanoe Megnin-Preiss";

    email = "megninpreiss.ivanoe@gmail.com";

    email = "oss@imp-network.com";

    github = "e-v-o-l-v-e";

    githubId = 84813895;

    matrix = "@evolve:matrix.imp-network.com";

    name = "Ivanoe Megnin-Preiss";

  };

  e1mo = {

    email = "nixpkgs@e1mo.de";

pkgs/applications/editors/vim/plugins/generated.nix

+546 −547

File changed.

Preview size limit exceeded, changes collapsed.

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

+138 −116

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/editors/vim/plugins/overrides.nix

+19 −3
Original line number Diff line number Diff line
@@ -2823,6 +2823,13 @@ in 


  otter-nvim = super.otter-nvim.overrideAttrs {

    dependencies = [ self.nvim-lspconfig ];

    nvimSkipModules = [

      # requires config setup

      "otter.keeper"

      "otter.lsp.handlers"

      "otter.lsp.init"

      "otter.diagnostics"

    ];

  };



  outline-nvim = super.outline-nvim.overrideAttrs {
@@ -2949,6 +2956,15 @@ in 
    ];

  };



  python-mode = super.python-mode.overrideAttrs {

    postPatch = ''

      # NOTE: Fix broken symlink - the pytoolconfig directory was moved to src/

      # https://github.com/python-mode/python-mode/pull/1189#issuecomment-3109528360

      rm -f pymode/libs/pytoolconfig

      ln -sf ../../submodules/pytoolconfig/src/pytoolconfig pymode/libs/pytoolconfig

    '';

  };



  pywal-nvim = super.pywal-nvim.overrideAttrs {

    # Optional feline integration

    nvimSkipModules = "pywal.feline";
@@ -2977,9 +2993,9 @@ in 
      nvim-lspconfig

      otter-nvim

    ];

  };



  quicker-nvim = super.quicker-nvim.overrideAttrs {

    nvimSkipModules = [

      "quarto.runner.init"

    ];

  };



  range-highlight-nvim = super.range-highlight-nvim.overrideAttrs {

pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix

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

mkLibretroCore {

  core = "mednafen-pce-fast";

  version = "0-unstable-2025-06-27";

  version = "0-unstable-2025-07-18";



  src = fetchFromGitHub {

    owner = "libretro";

    repo = "beetle-pce-fast-libretro";

    rev = "04a6f2e85c7b4e79bb1bb402a8ea7d8f55132ad3";

    hash = "sha256-xA2owDEe9o0+roxZ+GBM4LD7sBDGC9ZY5atwWVA8HC8=";

    rev = "71675959c7df0f4235a90e6eeb271bf7c1bde019";

    hash = "sha256-4pHPNRc34IEj+4YkKsXuUWK5yZri3+AJasn0aSOpfYY=";

  };



  makefile = "Makefile";