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

Merge master into staging-nixos

parents 47e85717 35740f00

lib/types.nix

+1 −1
Original line number Diff line number Diff line
@@ -1185,7 +1185,7 @@ rec { 
    name = "optionType";

    description = "optionType";

    descriptionClass = "noun";

    check = value: value._type or null == "option-type";

    check = isType "option-type";

    merge =

      loc: defs:

      if length defs == 1 then

nixos/tests/kafka/base.nix

+1 −0
Original line number Diff line number Diff line
@@ -121,5 +121,6 @@ with pkgs; 
  };

  kafka_4_0 = makeKafkaTest "kafka_4_0" { kafkaPackage = apacheKafka_4_0; };

  kafka_4_1 = makeKafkaTest "kafka_4_1" { kafkaPackage = apacheKafka_4_1; };

  kafka_4_2 = makeKafkaTest "kafka_4_2" { kafkaPackage = apacheKafka_4_2; };

  kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; };

}

pkgs/applications/editors/neovim/module.nix

+14 −0
Original line number Diff line number Diff line
@@ -93,6 +93,14 @@ in 
      '';

    };



    luaDependencies = lib.mkOption {

      readOnly = true;

      type = lib.types.listOf (lib.types.nullOr lib.types.package);

      example = lib.literalExpression "[ (lp: [ lp.mpack ]) ]";

      description = ''

        Lua dependencies required by the plugins.

      '';

    };

  };



  config =
@@ -122,5 +130,11 @@ in 
      ) [ ] pluginsNormalized;



      pluginPython3Packages = map (plugin: plugin.python3Dependencies or (_: [ ])) pluginsNormalized;



      luaDependencies =

        let

          op = acc: p: acc ++ (p.plugin.requiredLuaModules or [ ]);

        in

        lib.foldl' op [ ] pluginsNormalized;

    };

}

pkgs/applications/editors/neovim/utils.nix

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ let 
        runtimeDeps

        pluginAdvisedLua

        pluginPython3Packages

        luaDependencies

        ;



      # A Vim "package", see ':h packages'

pkgs/applications/editors/neovim/wrapper.nix

+3 −5
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ let 


        luaPathLuaRc =

          let

            luaEnv = lua.withPackages extraLuaPackages;

            luaEnv = lua.withPackages (lp: extraLuaPackages lp ++ vimPackageInfo.luaDependencies);



            # getLuaPath / getLuaCPath are not interpreter dependant at the moment and might thus cause

            # errors between luajit/Puc lua
@@ -122,10 +122,8 @@ let 
          '';



        rcContent = lib.concatStringsSep "\n" (

          [

            luaPathLuaRc

            providerLuaRc

          ]

          lib.optional (extraLuaPackages lua.pkgs != [ ]) luaPathLuaRc

          ++ [ providerLuaRc ]

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

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

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