From 44265977260c5ce24c6a7d3d1fd00c7788ef99d4 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Thu, 5 Mar 2026 14:35:02 +0200 Subject: [PATCH 1/4] mattermost-desktop: 6.0.4 -> 6.1.0 --- pkgs/by-name/ma/mattermost-desktop/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix index 12cc985b3f44..a224695795c8 100644 --- a/pkgs/by-name/ma/mattermost-desktop/package.nix +++ b/pkgs/by-name/ma/mattermost-desktop/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, buildNpmPackage, - electron_38, + electron_40, makeWrapper, testers, mattermost-desktop, @@ -10,21 +10,21 @@ }: let - electron = electron_38; + electron = electron_40; in buildNpmPackage rec { pname = "mattermost-desktop"; - version = "6.0.4"; + version = "6.1.0"; src = fetchFromGitHub { owner = "mattermost"; repo = "desktop"; tag = "v${version}"; - hash = "sha256-9/HDkcQEyvcflHMk/M4181jT6xUzMUcD5GHRxqfgxSg="; + hash = "sha256-5sVYDnz5RPkHfCpA3I1+Lm7z7YLa3fOFYOTEI6Sbxz8="; }; - npmDepsHash = "sha256-ug7PSLj/AB5krMVJAhCpJHOOKkAootG6oPeMHoW6E0A="; + npmDepsHash = "sha256-YdpF/wuH2H+ouBDzCUcTQWLB8s8wa9L12UiGj4MnurQ="; npmBuildScript = "build-prod"; makeCacheWritable = true; From 4a168cd694fa978e9e1589da25a1d7fea0cdd15e Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 8 Mar 2026 19:22:11 +0100 Subject: [PATCH 2/4] music-assistant: 2.7.9 -> 2.7.11 https://github.com/music-assistant/server/releases/tag/2.7.10 https://github.com/music-assistant/server/releases/tag/2.7.11 diff: https://github.com/music-assistant/server/compare/2.7.9...2.7.11 --- pkgs/by-name/mu/music-assistant/package.nix | 6 +++--- pkgs/by-name/mu/music-assistant/providers.nix | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 1d486ac6cfc2..da451012f6aa 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -47,14 +47,14 @@ assert python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.7.9"; + version = "2.7.11"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; tag = version; - hash = "sha256-c6WTalpjaZcUvppyYaTP03ErX5b+k7fUbphj58FVBS8="; + hash = "sha256-HLd7PAYdBzpzdfCRPc4elPq3KfzusIXYXTV8fRmo1lU="; }; patches = [ @@ -107,6 +107,7 @@ python.pkgs.buildPythonApplication rec { "cryptography" "getmac" "mashumaro" + "numpy" "orjson" "pillow" "podcastparser" @@ -130,7 +131,6 @@ python.pkgs.buildPythonApplication rec { aiortc aiorun aiosqlite - aiovban awesomeversion brotli certifi diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index 21995efc72b2..caac5bb1170b 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,7 +1,7 @@ # Do not edit manually, run ./update-providers.py { - version = "2.7.9"; + version = "2.7.11"; providers = { airplay = ps: with ps; [ @@ -183,8 +183,10 @@ ]; universal_group = ps: [ ]; - vban_receiver = ps: [ - ]; + vban_receiver = + ps: with ps; [ + aiovban + ]; ytmusic = ps: with ps; [ bgutil-ytdlp-pot-provider From 9a25c8c85efd6733406d311690cb4db4ab17e27d Mon Sep 17 00:00:00 2001 From: teto <886074+teto@users.noreply.github.com> Date: Wed, 11 Mar 2026 01:19:46 +0100 Subject: [PATCH 3/4] neovim: move provider configuration to initrc instead of wrapping arguments when possible. As an attempt to simplify configuration: instead of having wrapping arguments + an optional neovim configuration let's always generate a neovim configuration. The change should be transparent for most users, and require intervention for users that fulfill both conditions: - using remote plugins (rare already) - that set `wrapRc = false` in wrapNeovimUnstable without loading later the generated luaRcContent The fix is then to pass as wrapping arguments the wrapper's generated config via (wrapNeovimUnstable neovim-unwrapped { } ).overrideAttrs(oa: { wrapperArgs = oa.wrapperArgs ++ [ ''--cmd "lua dofile('${writeText "init.lua" oa.luaRcContent}')"'' ]; }) --- doc/release-notes/rl-2605.section.md | 2 + pkgs/applications/editors/neovim/wrapper.nix | 48 ++++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 91cf656d2938..8e6eaccf150f 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -242,6 +242,8 @@ - `openrgb` was updated to 1.0rc2, which now uses Plugin API version 4. Some existing OpenRGB plugins may be incompatible or require updates. +- the `neovim` wrapper sets provider-related configuration in its generated config rather than as wrapper arguments. It should not affect configuration unless you set `wrapRc` to false. + - We now use the upstream wrapper script for Gradle, supporting both the `JAVA_HOME` and `GRADLE_OPTS` environment variables. - the `autossh-ng` NixOS module was introduced as a simpler alternative to the existing `autossh` module. diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 5fba635a2c48..f76410f6aa50 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -105,13 +105,16 @@ let packpathDirs.myNeovimPackages = vimPackageInfo.vimPackage; finalPackdir = neovimUtils.packDir packpathDirs; - rcContent = '' - ${luaRcContent} - '' - + lib.optionalString (neovimRcContent' != "") '' - vim.cmd.source "${writeText "init.vim" neovimRcContent'}" - '' - + lib.optionalString autoconfigure (lib.concatStringsSep "\n" vimPackageInfo.pluginAdvisedLua); + rcContent = lib.concatStringsSep "\n" ( + [ + providerLuaRc + ] + ++ lib.optional (luaRcContent != "") luaRcContent + ++ lib.optional (neovimRcContent' != "") '' + vim.cmd.source "${writeText "init.vim" neovimRcContent'}" + '' + ++ lib.optionals autoconfigure vimPackageInfo.pluginAdvisedLua + ); python3Env = lib.warnIf (attrs ? python3Env) @@ -126,12 +129,7 @@ let wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; - generatedWrapperArgs = [ - # vim accepts a limited number of commands so we join all the provider ones - "--add-flags" - ''--cmd "lua ${providerLuaRc}"'' - ] - ++ + generatedWrapperArgs = lib.optionals ( finalAttrs.packpathDirs.myNeovimPackages.start != [ ] @@ -143,17 +141,17 @@ let "--add-flags" ''--cmd "set rtp^=${finalPackdir}"'' ] - ++ lib.optionals finalAttrs.withRuby [ - "--set" - "GEM_HOME" - "${rubyEnv}/${rubyEnv.ruby.gemPath}" - ] - ++ lib.optionals (finalAttrs.runtimeDeps != [ ]) [ - "--suffix" - "PATH" - ":" - (lib.makeBinPath finalAttrs.runtimeDeps) - ]; + ++ lib.optionals finalAttrs.withRuby [ + "--set" + "GEM_HOME" + "${rubyEnv}/${rubyEnv.ruby.gemPath}" + ] + ++ lib.optionals (finalAttrs.runtimeDeps != [ ]) [ + "--suffix" + "PATH" + ":" + (lib.makeBinPath finalAttrs.runtimeDeps) + ]; providerLuaRc = let @@ -201,7 +199,7 @@ let ++ lib.optionals finalAttrs.wrapRc [ "--set-default" "VIMINIT" - "lua dofile('${writeText "init.lua" rcContent}')" + "lua dofile('${writeText "init.lua" finalAttrs.luaRcContent}')" ] ++ finalAttrs.generatedWrapperArgs; From 4d7ec078bd08e84e258a3bd04130160161e7023a Mon Sep 17 00:00:00 2001 From: teto <886074+teto@users.noreply.github.com> Date: Thu, 19 Feb 2026 17:10:44 +0100 Subject: [PATCH 4/4] neovim: restore provider configuration in legacy mode We used to unconditionnally wrap the provider configuration. https://github.com/NixOS/nixpkgs/pull/487390 "smartly" embeds it into init.lua depending on `wrapRc` but that breaks neovim legacy behavior in some cases since `legacyWrapper` sets `wrapRc` to false in absence of some of user configuration. One day we will get rid of the legacy wrapper but until then keep that behavior. Most of the changes come from linter. --- doc/release-notes/rl-2605.section.md | 2 +- pkgs/applications/editors/neovim/utils.nix | 3 +- pkgs/applications/editors/neovim/wrapper.nix | 30 +++++++++++++------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 8e6eaccf150f..537164f40301 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -242,7 +242,7 @@ - `openrgb` was updated to 1.0rc2, which now uses Plugin API version 4. Some existing OpenRGB plugins may be incompatible or require updates. -- the `neovim` wrapper sets provider-related configuration in its generated config rather than as wrapper arguments. It should not affect configuration unless you set `wrapRc` to false. +- `wrapNeovimUnstable` now sets provider-related configuration in its generated config rather than as wrapper arguments. It should not affect configuration unless you set `wrapRc` to false or are using the `legacyWrapper`. - We now use the upstream wrapper script for Gradle, supporting both the `JAVA_HOME` and `GRADLE_OPTS` environment variables. diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index df9411ca269d..57ab04f98308 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -223,7 +223,8 @@ let res // { wrapperArgs = lib.escapeShellArgs res.wrapperArgs + " " + extraMakeWrapperArgs; - wrapRc = (configure != { }); + wrapRc = configure != { }; + legacyWrapper = true; } ); diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index f76410f6aa50..c3ec13eec25d 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -130,17 +130,25 @@ let wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; generatedWrapperArgs = - lib.optionals - ( - finalAttrs.packpathDirs.myNeovimPackages.start != [ ] - || finalAttrs.packpathDirs.myNeovimPackages.opt != [ ] - ) - [ - "--add-flags" - ''--cmd "set packpath^=${finalPackdir}"'' - "--add-flags" - ''--cmd "set rtp^=${finalPackdir}"'' - ] + + # neovimUtils.legacyWrapper adds a `legacyWrapper` attribute to let us know we run in "legacy" mode + lib.optionals (attrs ? legacyWrapper) [ + # vim accepts a limited number of commands so we join all the provider ones + "--add-flags" + ''--cmd "lua ${providerLuaRc}"'' + ] + ++ + lib.optionals + ( + finalAttrs.packpathDirs.myNeovimPackages.start != [ ] + || finalAttrs.packpathDirs.myNeovimPackages.opt != [ ] + ) + [ + "--add-flags" + ''--cmd "set packpath^=${finalPackdir}"'' + "--add-flags" + ''--cmd "set rtp^=${finalPackdir}"'' + ] ++ lib.optionals finalAttrs.withRuby [ "--set" "GEM_HOME"