Merge remote-tracking branch 'origin/master' into staging-next

2021-05-08 14:43:43 +02:00
parent 0388b1a029 b28f0d640f
commit 9651084620
657 changed files with 2572 additions and 1628 deletions
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -20,7 +20,7 @@
 , dasht
 , direnv
 , fzf
-, gnome3
+, gnome
 , khard
 , languagetool
 , llvmPackages
@@ -515,7 +515,7 @@ self: super: {

  vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: {
    # on linux can use either Zenity or Yad.
-    propagatedBuildInputs = [ gnome3.zenity ];
+    propagatedBuildInputs = [ gnome.zenity ];
    meta = {
      description = "Simple color selector/picker plugin";
      license = lib.licenses.publicDomain;