Unverified Commit 8c0c955a authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'master' into staging-next

parents e2c4ab09 d080edeb

maintainers/maintainer-list.nix

+10 −0
Original line number Diff line number Diff line
@@ -21545,6 +21545,16 @@ 
      fingerprint = "DA03 D6C6 3F58 E796 AD26  E99B 366A 2940 479A 06FC";

    }];

  };

  willbush = {

    email = "git@willbush.dev";

    matrix = "@willbush:matrix.org";

    github = "willbush";

    githubId = 2023546;

    name = "Will Bush";

    keys = [{

      fingerprint = "4441 422E 61E4 C8F3 EBFE  5E33 3823 864B 54B1 3BDA";

    }];

  };

  willcohen = {

    github = "willcohen";

    githubId = 5185341;

nixos/doc/manual/release-notes/rl-2405.section.md

+2 −0
Original line number Diff line number Diff line
@@ -573,6 +573,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 
  and `services.kavita.settings.IpAddresses`. The file at `services.kavita.tokenKeyFile` now needs to contain a secret with

  512+ bits instead of 128+ bits.



- `kavita` has been updated to 0.8.0, requiring a manual forced library scan on all libraries for migration. Refer to upstream's [release notes](https://github.com/Kareadita/Kavita/releases/tag/v0.8.0) for details.



- The `krb5` module has been rewritten and moved to `security.krb5`, moving all options but `security.krb5.enable` and `security.krb5.package` into `security.krb5.settings`.



- `services.soju` now has a wrapper for the `sojuctl` command, pointed at the service config file. It also has the new option `adminSocket.enable`, which creates a unix admin socket at `/run/soju/admin`.

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

+12 −0
Original line number Diff line number Diff line
@@ -17213,5 +17213,17 @@ final: prev: 
    meta.homepage = "https://github.com/jhradilek/vim-snippets/";

  };













  gitignore-nvim = buildVimPlugin {













    pname = "gitignore-nvim";













    version = "2024-03-25";













    src = fetchFromGitHub {













      owner = "wintermute-cell";













      repo = "gitignore.nvim";













      rev = "2455191ec94da8ed222806a4fe3aa358eac1e558";













      sha256 = "sha256-p6k0NP3Vne6Kl98YodzSruVmJwxyrXziJj8N7u79o1w=";













    };













    meta.homepage = "https://github.com/wintermute-cell/gitignore.nvim/";













  };









































}

























pkgs/applications/editors/vim/plugins/vim-plugin-names



+1
−0






























Original line number
Diff line number
Diff line








@@ -338,6 +338,7 @@ https://github.com/f-person/git-blame.nvim/,,













https://github.com/akinsho/git-conflict.nvim/,HEAD,















https://github.com/rhysd/git-messenger.vim/,,















https://github.com/ThePrimeagen/git-worktree.nvim/,,













https://github.com/wintermute-cell/gitignore.nvim/,HEAD,















https://github.com/vim-scripts/gitignore.vim/,,















https://github.com/ruifm/gitlinker.nvim/,,















https://github.com/lewis6991/gitsigns.nvim/,,

































pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix



+2
−2






























Original line number
Diff line number
Diff line















{















  lib,













  nodePackages,













  pyright,















  vscode-utils,















}:

























@@ -12,7 +12,7 @@ vscode-utils.buildVscodeMarketplaceExtension {













    hash = "sha256-xJU/j5r/Idp/0VorEfciT4SFKRBpMCv9Z0LKO/++1Gk=";















  };





























  buildInputs = [ nodePackages.pyright ];













  buildInputs = [ pyright ];































  meta = {















    changelog = "https://marketplace.visualstudio.com/items/ms-python.vscode-pylance/changelog";