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

Merge master into staging-nixos

parents 66aad3fc 8e9acba6

doc/release-notes/rl-2605.section.md

+2 −0
Original line number Diff line number Diff line
@@ -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.



- `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.



- the `autossh-ng` NixOS module was introduced as a simpler alternative to the existing `autossh` module.

pkgs/applications/editors/neovim/utils.nix

+2 −1
Original line number Diff line number Diff line
@@ -223,7 +223,8 @@ let 
      res

      // {

        wrapperArgs = lib.escapeShellArgs res.wrapperArgs + " " + extraMakeWrapperArgs;

        wrapRc = (configure != { });

        wrapRc = configure != { };

        legacyWrapper = true;

      }

    );

pkgs/applications/editors/neovim/wrapper.nix

+42 −36
Original line number Diff line number Diff line
@@ -105,13 +105,16 @@ let 
        packpathDirs.myNeovimPackages = vimPackageInfo.vimPackage;

        finalPackdir = neovimUtils.packDir packpathDirs;



        rcContent = ''

          ${luaRcContent}

        ''

        + lib.optionalString (neovimRcContent' != "") ''

        rcContent = lib.concatStringsSep "\n" (

          [

            providerLuaRc

          ]

          ++ lib.optional (luaRcContent != "") luaRcContent

          ++ lib.optional (neovimRcContent' != "") ''

            vim.cmd.source "${writeText "init.vim" neovimRcContent'}"

          ''

        + lib.optionalString autoconfigure (lib.concatStringsSep "\n" vimPackageInfo.pluginAdvisedLua);

          ++ lib.optionals autoconfigure vimPackageInfo.pluginAdvisedLua

        );



        python3Env =

          lib.warnIf (attrs ? python3Env)
@@ -126,7 +129,10 @@ let 


        wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs;



        generatedWrapperArgs = [

        generatedWrapperArgs =



          # 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}"''
@@ -201,7 +207,7 @@ let 
        ++ lib.optionals finalAttrs.wrapRc [

          "--set-default"

          "VIMINIT"

          "lua dofile('${writeText "init.lua" rcContent}')"

          "lua dofile('${writeText "init.lua" finalAttrs.luaRcContent}')"

        ]

        ++ finalAttrs.generatedWrapperArgs;

pkgs/by-name/ma/mattermost-desktop/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -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;

pkgs/by-name/mu/music-assistant/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -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