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

Merge master into staging-next

parents 099c1ef3 5d286bae

maintainers/maintainer-list.nix

+11 −0
Original line number Diff line number Diff line
@@ -7644,6 +7644,12 @@ 
    name = "Zhenbo Li";

    matrix = "@zhenbo:matrix.org";

  };

  enkarterisi = {

    name = "xNefas";

    email = "enkarterisi@proton.me";

    github = "xNefas";

    githubId = 199727225;

  };

  enorris = {

    name = "Eric Norris";

    email = "erictnorris@gmail.com";
@@ -9392,6 +9398,11 @@ 
    githubId = 5549373;

    name = "Jochen Kiemes";

  };

  ginkogruen = {

    name = "Jasper Wolter";

    github = "ginkogruen";

    githubId = 93037574;

  };

  giodamelio = {

    name = "Giovanni d'Amelio";

    email = "gio@damelio.net";

nixos/tests/renovate.nix

+8 −8
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
      services.renovate = {

        enable = true;

        settings = {

          platform = "gitea";

          platform = "forgejo";

          endpoint = "http://localhost:3000";

          autodiscover = true;

          gitAuthor = "Renovate <renovate@example.com>";
@@ -34,24 +34,24 @@ 
    };



  testScript = ''

    def gitea(command):

      return machine.succeed(f"cd /var/lib/forgejo && sudo --user=forgejo GITEA_WORK_DIR=/var/lib/forgejo GITEA_CUSTOM=/var/lib/forgejo/custom gitea {command}")

    def forgejo(command):

      return machine.succeed(f"cd /var/lib/forgejo && sudo --user=forgejo FORGEJO_WORK_DIR=/var/lib/forgejo FORGEJO_CUSTOM=/var/lib/forgejo/custom forgejo {command}")



    machine.wait_for_unit("forgejo.service")

    machine.wait_for_open_port(3000)



    machine.systemctl("stop forgejo.service")



    gitea("admin user create --username meow --email meow@example.com --password meow")

    forgejo("admin user create --username meow --email meow@example.com --password meow")



    machine.systemctl("start forgejo.service")

    machine.wait_for_unit("forgejo.service")

    machine.wait_for_open_port(3000)



    accessToken = gitea("admin user generate-access-token --raw --username meow --scopes all | tr -d '\n'")

    accessToken = forgejo("admin user generate-access-token --raw --username meow --scopes all | tr -d '\n'")



    machine.succeed(f"tea login add --name default --user meow --token '{accessToken}' --password meow --url http://localhost:3000")

    machine.succeed("tea repo create --name kitty --init")

    machine.succeed("tea repo create --login default --name kitty --init")

    machine.succeed("git config --global user.name Meow")

    machine.succeed("git config --global user.email meow@example.com")

    machine.succeed(f"git clone http://meow:{accessToken}@localhost:3000/meow/kitty.git /tmp/kitty")
@@ -63,8 +63,8 @@ 
    machine.succeed(f"echo '{accessToken}' > /etc/renovate-token")

    machine.systemctl("start --wait renovate.service")



    machine.succeed("tea pulls list --repo meow/kitty | grep 'Configure Renovate'")

    machine.succeed("tea pulls merge --repo meow/kitty 1")

    machine.succeed("tea pulls list --login default --repo meow/kitty | grep 'Configure Renovate'")

    machine.succeed("tea pulls merge --login default --repo meow/kitty 1")



    machine.systemctl("start --wait renovate.service")

  '';

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

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ mapAliases ( 
    blueballs-neovim = throw "`blueballs-neovim` has been removed"; # added 2025-06-17

    BufOnly = BufOnly-vim;

    calendar = calendar-vim;

    coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # addedd 2025-10-01

    coffee-script = vim-coffee-script;

    coffeeScript = vim-coffee-script; # backwards compat, added 2014-10-18

    Solarized = vim-colors-solarized;

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

+6 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  coc-clangd,

  coc-css,

  coc-diagnostic,

  coc-docker,

  coc-pyright,

  coc-toml,

}:
@@ -28,6 +29,11 @@ final: prev: { 
    src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic";

  };



  coc-docker = buildVimPlugin {

    inherit (coc-docker) pname version meta;

    src = "${coc-docker}/lib/node_modules/coc-docker";

  };



  coc-pyright = buildVimPlugin {

    pname = "coc-pyright";

    inherit (coc-pyright) version meta;

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

+3 −3
Original line number Diff line number Diff line
@@ -12834,12 +12834,12 @@ final: prev: { 














  project-nvim = buildVimPlugin {















    pname = "project.nvim";













    version = "2025-09-26";













    version = "2025-10-01";















    src = fetchFromGitHub {















      owner = "DrKJeff16";















      repo = "project.nvim";













      rev = "8010402e3b10264eb832f5ebbeb853decaa97433";













      sha256 = "0lfyv2hl453pxm3kkmb2d6gq2a7g5c5kycvhhnc1kkgznvr5872z";













      rev = "7008545417848450c6dad83fcc6b3e58f0450990";













      sha256 = "sha256-ZGKC/r+1/TcAqZvkzTHPtpcBC7eRfvuuMNTVeMR4qLQ=";















    };















    meta.homepage = "https://github.com/DrKJeff16/project.nvim/";















    meta.hydraPlatforms = [ ];