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

Merge master into staging-nixos

parents 438071d6 015d12a4

nixos/modules/services/web-apps/cloudlog.nix

+1 −0
Original line number Diff line number Diff line
@@ -518,4 +518,5 @@ in 
      group = config.services.nginx.group;

    };

  };

  meta.maintainers = pkgs.cloudlog.meta.maintainers;

}

nixos/tests/collectd.nix

+1 −1
Original line number Diff line number Diff line 
{ pkgs, ... }:

{

  name = "collectd";

  meta = { };

  meta.maintainers = pkgs.cloudlog.meta.maintainers;



  nodes.machine =

    { pkgs, lib, ... }:

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

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


  plugins = callPackage ./generated.nix {

    inherit buildVimPlugin;

    inherit (neovimUtils) buildNeovimPlugin;

  };



  corePlugins = callPackage ./corePlugins.nix { };

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

+238 −241

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/editors/vim/plugins/utils/update.py

+1 −1
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ class VimEditor(nixpkgs_plugin_update.Editor): 
                {

                  lib,

                  buildVimPlugin,

                  buildNeovimPlugin,

                  fetchFromGitHub,

                  fetchgit,

                }:



                final: prev: {