Merge master into staging-next

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

@@ -95,6 +95,8 @@
 
 - `nodePackages.webpack-dev-server` has been removed, as it should be installed in projects that use it instead.
 
+- `nodePackages.copy-webpack-plugin` has been removed, as it should be installed in projects that use it instead.
+
 - `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead.
 
 - `ente-auth` now uses the name `enteauth` for its binary. The previous name was `ente_auth`.

nixos/modules/services/networking/wireguard-networkd.nix

@@ -14,7 +14,12 @@ let
     mapAttrsToList
     nameValuePair
     ;
-  inherit (lib.lists) concatMap concatLists filter;
+  inherit (lib.lists)
+    concatMap
+    concatLists
+    filter
+    flatten
+    ;
   inherit (lib.modules) mkIf;
   inherit (lib.options) literalExpression mkOption;
   inherit (lib.strings) hasInfix;
@@ -215,7 +220,9 @@ in
 
     systemd.timers = mapAttrs' generateRefreshTimer refreshEnabledInterfaces;
     systemd.services = (mapAttrs' generateRefreshService refreshEnabledInterfaces) // {
-      systemd-networkd.serviceConfig.LoadCredential = mapAttrsToList interfaceCredentials cfg.interfaces;
+      systemd-networkd.serviceConfig.LoadCredential = flatten (
+        mapAttrsToList interfaceCredentials cfg.interfaces
+      );
     };
   };
 }

nixos/tests/kernel-generic.nix

@@ -41,6 +41,7 @@ let
       linux_6_1_hardened
       linux_6_6_hardened
       linux_6_11_hardened
+      linux_6_12_hardened
       linux_rt_5_4
       linux_rt_5_10
       linux_rt_5_15

pkgs/applications/editors/neovim/tests/default.nix

@@ -170,12 +170,24 @@ in
   '';
 
   nvim_with_autoconfigure = pkgs.neovim.overrideAttrs(oa: {
-    plugins = [ vimPlugins.unicode-vim ];
+    plugins = [
+      vimPlugins.unicode-vim
+      vimPlugins.fzf-hoogle-vim
+    ];
     autoconfigure = true;
     # legacy wrapper sets it to false
     wrapRc = true;
   });
 
+  nvim_with_runtimeDeps = pkgs.neovim.overrideAttrs({
+    plugins = [
+      pkgs.vimPlugins.hex-nvim
+    ];
+    autowrapRuntimeDeps = true;
+    # legacy wrapper sets it to false
+    wrapRc = true;
+  });
+
   nvim_with_ftplugin = let
     # this plugin checks that it's ftplugin/vim.tex is loaded before $VIMRUNTIME/ftplugin/vim.tex
     # $VIMRUNTIME/ftplugin/vim.tex sources $VIMRUNTIME/ftplugin/initex.vim which sets b:did_ftplugin
@@ -334,19 +346,25 @@ in
     ${nvim_with_opt_plugin}/bin/nvim -i NONE +quit! -e
   '';
 
-  inherit nvim-with-luasnip;
 
   autoconfigure = runTest nvim_with_autoconfigure ''
       assertFileContains \
         "$luarc" \
         '${vimPlugins.unicode-vim.passthru.initLua}'
   '';
 
+  autowrap_runtime_deps = runTest nvim_with_runtimeDeps ''
+      assertFileContains \
+        "${nvim_with_runtimeDeps}/bin/nvim" \
+        '${pkgs.xxd}/bin'
+  '';
+
+  inherit nvim-with-luasnip;
   # check that bringing in one plugin with lua deps makes those deps visible from wrapper
   # for instance luasnip has a dependency on jsregexp
   can_require_transitive_deps =
     runTest nvim-with-luasnip ''
-    cat ${nvim-with-luasnip}/bin/nvim
+    cat ${nvim-with-luasnip}/nvim
     ${nvim-with-luasnip}/bin/nvim -i NONE --cmd "lua require'jsregexp'" -e +quitall!
   '';
 

pkgs/applications/editors/neovim/wrapper.nix

@@ -24,6 +24,10 @@ let
     # to work with nix.
     # if true, the wrapper automatically appends those snippets when necessary
     , autoconfigure ? false
+
+    # append to PATH runtime deps of plugins
+    , autowrapRuntimeDeps ? false
+
     # should contain all args but the binary. Can be either a string or list
     , wrapperArgs ? []
     , withPython2 ? false
@@ -120,7 +124,15 @@ let
     wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs;
 
     generatedWrapperArgs = let
-      binPath = lib.makeBinPath (lib.optional finalAttrs.withRuby rubyEnv ++ lib.optional finalAttrs.withNodeJs nodejs);
+      op = acc: normalizedPlugin: acc ++ normalizedPlugin.plugin.runtimeDeps or [];
+
+      runtimeDeps = lib.foldl' op [] pluginsNormalized;
+
+      binPath = lib.makeBinPath (
+           lib.optional finalAttrs.withRuby rubyEnv
+        ++ lib.optional finalAttrs.withNodeJs nodejs
+        ++ lib.optionals finalAttrs.autowrapRuntimeDeps runtimeDeps
+        );
     in
 
       # vim accepts a limited number of commands so we join them all
@@ -167,7 +179,7 @@ let
       __structuredAttrs = true;
       dontUnpack = true;
       inherit viAlias vimAlias withNodeJs withPython3 withPerl withRuby;
-      inherit autoconfigure wrapRc providerLuaRc packpathDirs;
+      inherit autoconfigure autowrapRuntimeDeps wrapRc providerLuaRc packpathDirs;
       inherit python3Env rubyEnv;
       inherit wrapperArgs generatedWrapperArgs;
       luaRcContent = rcContent;

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

@@ -1292,9 +1292,7 @@ in
   };
 
   hex-nvim = super.hex-nvim.overrideAttrs {
-    postPatch = ''
-      substituteInPlace lua/hex.lua --replace xxd ${xxd}/bin/xxd
-    '';
+    runtimeDeps = [ xxd ];
     nvimRequireCheck = "hex";
   };
 

pkgs/applications/editors/vscode/extensions/default.nix

@@ -1579,8 +1579,8 @@ let
           # semver scheme, contrary to preview versions which are listed on
           # the VSCode Marketplace and use a calver scheme. We should avoid
           # using preview versions, because they expire after two weeks.
-          version = "15.6.0";
-          hash = "sha256-s6ur76DyNhwuZOYma2zPfYEs3lMliRuhdmZhITCSCPE=";
+          version = "16.0.5";
+          hash = "sha256-9xvArjUXxgofGuEg+XcrI5cX32gd9CvPZxWlj4eKavo=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";

pkgs/by-name/az/azurehound/package.nix

@@ -0,0 +1,41 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+buildGoModule rec {
+  pname = "azurehound";
+  version = "2.2.1";
+
+  src = fetchFromGitHub {
+    owner = "SpecterOps";
+    repo = "AzureHound";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-DqoEtL0uyLsP/2PJdOpAmXryEZQDlyGWPQHThF+3gJA=";
+  };
+
+  vendorHash = "sha256-FG3207OTzkMEoSvQsTH7Ky9T3ur7glG7k0ERfd12SO0=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=github.com/bloodhoundad/azurehound/v2/constants.Version=${version}"
+  ];
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = {
+    description = "Azure Data Exporter for BloodHound";
+    homepage = "https://github.com/SpecterOps/AzureHound";
+    changelog = "https://github.com/SpecterOps/AzureHound/releases/tag/v${version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "azurehound";
+  };
+}

pkgs/by-name/ca/cardinal/package.nix

@@ -28,11 +28,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cardinal";
-  version = "24.09";
+  version = "24.12";
 
   src = fetchurl {
     url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz";
-    hash = "sha256-vJxKtZ0rVjf0RJfTNRxpzps1F2k0hHuiPnd1OwpULhQ=";
+    hash = "sha256-iXurkftPCfTL3a2zH1RSGIyMISFiUhDawyndNhY8Ynk=";
   };
 
   prePatch = ''

pkgs/by-name/ma/manicode/package.nix → pkgs/by-name/co/codebuff/package.nix

@@ -5,15 +5,15 @@
 }:
 
 buildNpmPackage rec {
-  pname = "manicode";
-  version = "1.0.99";
+  pname = "codebuff";
+  version = "1.0.119";
 
   src = fetchzip {
-    url = "https://registry.npmjs.org/manicode/-/manicode-${version}.tgz";
-    hash = "sha256-LVTh8yOfP92zGSdxLpThC+U9E8cBjoL0+iMQOldNO8A=";
+    url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz";
+    hash = "sha256-nIjNwvEhlgmfj3d0XEyMBWWNy+kh8iS4SEOZ9u8PWZQ=";
   };
 
-  npmDepsHash = "sha256-MAm/FE8M6BBDZD5Fy2k6GcM5Qv35jNeUwHcemmbUj/A=";
+  npmDepsHash = "sha256-fO4rjRY31hOWuBnAeDKMSM5wbpPxLa93QQ3DPRCe/ig=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json
@@ -25,10 +25,10 @@ buildNpmPackage rec {
 
   meta = {
     description = "Use natural language to edit your codebase and run commands from your terminal faster";
-    homepage = "https://manicode.ai";
-    downloadPage = "https://www.npmjs.com/package/manicode";
+    homepage = "https://codebuff.ai";
+    downloadPage = "https://www.npmjs.com/package/codebuff";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.malo ];
-    mainProgram = "manicode";
+    mainProgram = "codebuff";
   };
 }

pkgs/by-name/ma/manicode/update.sh → pkgs/by-name/co/codebuff/update.sh

@@ -3,13 +3,13 @@
 
 set -euo pipefail
 
-version=$(npm view manicode version)
+version=$(npm view codebuff version)
 
 # Generate updated lock file
 cd "$(dirname "${BASH_SOURCE[0]}")"
-npm i --package-lock-only manicode@$version
+npm i --package-lock-only codebuff@"$version"
 rm -f package.json
 
 # Update version and hases
 cd -
-nix-update manicode --version "$version"
+nix-update codebuff --version "$version"

pkgs/by-name/co/containerd/package.nix

@@ -16,7 +16,7 @@
 
 buildGoModule rec {
   pname = "containerd";
-  version = "2.0.0";
+  version = "2.0.1";
 
   outputs = [
     "out"
@@ -27,7 +27,7 @@ buildGoModule rec {
     owner = "containerd";
     repo = "containerd";
     rev = "refs/tags/v${version}";
-    hash = "sha256-DFAP+zjBYP2SpyD8KXGvI3i/PUZ6d4jdzGyFfr1lzj4=";
+    hash = "sha256-gD0XRZThU/T8qxLyyboyE6GsX911ylt7hH59S+rB7vQ=";
   };
 
   postPatch = "patchShebangs .";