Merge master into staging-next

2023-07-23 06:01:17 +00:00 · 2023-07-23 06:01:17 +00:00 · a0c327d315
commit a0c327d315
parent 86a73bdb86 af8cd5ded7
42 changed files with 560 additions and 366 deletions
--- a/nixos/modules/programs/hyprland.nix
+++ b/nixos/modules/programs/hyprland.nix
@ -6,10 +6,10 @@
 with lib; let
  cfg = config.programs.hyprland;

-  defaultHyprlandPackage = pkgs.hyprland.override {
-    enableXWayland = cfg.xwayland.enable;
-    hidpiXWayland = cfg.xwayland.hidpi;
-    nvidiaPatches = cfg.nvidiaPatches;
+  finalPortalPackage = cfg.portalPackage.override {
+    hyprland-share-picker = pkgs.hyprland-share-picker.override {
+      hyprland = cfg.finalPackage;
+    };
  };
 in
 {
@ -25,24 +25,25 @@ in
      '';
    };

-    package = mkOption {
-      type = types.path;
-      default = defaultHyprlandPackage;
-      defaultText = literalExpression ''
-        pkgs.hyprland.override {
-          enableXWayland = config.programs.hyprland.xwayland.enable;
-          hidpiXWayland = config.programs.hyprland.xwayland.hidpi;
-          nvidiaPatches = config.programs.hyprland.nvidiaPatches;
-        }
-      '';
-      example = literalExpression "<Hyprland flake>.packages.<system>.default";
+    package = mkPackageOptionMD pkgs "hyprland" { };
+
+    finalPackage = mkOption {
+      type = types.package;
+      readOnly = true;
+      default = cfg.package.override {
+        enableXWayland = cfg.xwayland.enable;
+        hidpiXWayland = cfg.xwayland.hidpi;
+        nvidiaPatches = cfg.nvidiaPatches;
+      };
+      defaultText = literalExpression
+        "`wayland.windowManager.hyprland.package` with applied configuration";
      description = mdDoc ''
-        The Hyprland package to use.
-        Setting this option will make {option}`programs.hyprland.xwayland` and
-        {option}`programs.hyprland.nvidiaPatches` not work.
+        The Hyprland package after applying configuration.
      '';
    };

+    portalPackage = mkPackageOptionMD pkgs "xdg-desktop-portal-hyprland" { };
+
    xwayland = {
      enable = mkEnableOption (mdDoc "XWayland") // { default = true; };
      hidpi = mkEnableOption null // {
@ -57,7 +58,7 @@ in
  };

  config = mkIf cfg.enable {
-    environment.systemPackages = [ cfg.package ];
+    environment.systemPackages = [ cfg.finalPackage ];

    fonts.enableDefaultFonts = mkDefault true;
    hardware.opengl.enable = mkDefault true;
@ -69,13 +70,11 @@ in

    security.polkit.enable = true;

-    services.xserver.displayManager.sessionPackages = [ cfg.package ];
+    services.xserver.displayManager.sessionPackages = [ cfg.finalPackage ];

    xdg.portal = {
      enable = mkDefault true;
-      extraPortals = [
-        pkgs.xdg-desktop-portal-hyprland
-      ];
+      extraPortals = [ finalPortalPackage ];
    };
  };
 }
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -173,24 +173,24 @@ final: prev:

  LazyVim = buildVimPluginFrom2Nix {
    pname = "LazyVim";
-    version = "2023-07-16";
+    version = "2023-07-21";
    src = fetchFromGitHub {
      owner = "LazyVim";
      repo = "LazyVim";
-      rev = "fb1f29c32c516601b4074d113202482769ef030e";
-      sha256 = "0df0q7r9bwyidaxhzgmysi6awhrra8a37pjiv9pykd1rnq5gdl99";
+      rev = "a184fc1c732e16b10ed0bb19f8e9789b2b20b71a";
+      sha256 = "0xhyf03ac0g30plsy7aridx30b3xx9c2afshjlzh0r22czi1wza2";
    };
    meta.homepage = "https://github.com/LazyVim/LazyVim/";
  };

  LeaderF = buildVimPluginFrom2Nix {
    pname = "LeaderF";
-    version = "2023-07-16";
+    version = "2023-07-21";
    src = fetchFromGitHub {
      owner = "Yggdroot";
      repo = "LeaderF";
-      rev = "ed13a2ff5fd6dfbbc9fdc15bea43ec03a6e8dbb6";
-      sha256 = "0cliyrfq4xf4zmg9innfbdvnz2g76ii71cqdb54gpfbgwmriljnl";
+      rev = "55778f0ba8d909dbe5a04e1f2f44ce6558b29a5c";
+      sha256 = "10fyp5r5521y8fyk8dala572da881m7cakwgnnz1mvi1f70ayy19";
    };
    meta.homepage = "https://github.com/Yggdroot/LeaderF/";
  };
@ -305,12 +305,12 @@ final: prev:

  SchemaStore-nvim = buildVimPluginFrom2Nix {
    pname = "SchemaStore.nvim";
-    version = "2023-07-17";
+    version = "2023-07-18";
    src = fetchFromGitHub {
      owner = "b0o";
      repo = "SchemaStore.nvim";
-      rev = "0682f56392ddc86cf5e6b2af76a63bc48ad4ed84";
-      sha256 = "12kcyk5gw103a9mxwwildjy4dicqjbgh89xgxbgs56gdpcg7gb80";
+      rev = "43b2ef9a1b716752dcdcb9fafddfdb871a59051f";
+      sha256 = "1byk3i0m779xcrc8fhvdma8x034nxvi1c9hkb8nqgi7d3439576x";
    };
    meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
  };
@ -449,12 +449,12 @@ final: prev:

  YouCompleteMe = buildVimPluginFrom2Nix {
    pname = "YouCompleteMe";
-    version = "2023-07-06";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "ycm-core";
      repo = "YouCompleteMe";
-      rev = "142a559acd70a4da190e36b1b05b9f1eec67acd0";
-      sha256 = "1mvw668wq30zqlx1adyx9ikw86wkswaf0m22dczfh7i793457lnl";
+      rev = "f09c2f69f7fe4d6adf64396a5daa2736714f67a0";
+      sha256 = "0rvaxcrbfm846zzph76fmnzkqxkjh9gzbaslg6ffr3b25yfljx8q";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@ -1037,18 +1037,6 @@ final: prev:
    meta.homepage = "https://github.com/LunarVim/bigfile.nvim/";
  };

-  bitbake-vim = buildVimPluginFrom2Nix {
-    pname = "bitbake.vim";
-    version = "2021-02-06";
-    src = fetchFromGitHub {
-      owner = "sblumentritt";
-      repo = "bitbake.vim";
-      rev = "faddca1e8768b10c80ee85221fb51a560df5ba45";
-      sha256 = "1hfly2vxhhvjdiwgfz58hr3523kf9z71i78vk168n3kdqp5vkwrp";
-    };
-    meta.homepage = "https://github.com/sblumentritt/bitbake.vim/";
-  };
-
  blamer-nvim = buildVimPluginFrom2Nix {
    pname = "blamer.nvim";
    version = "2021-11-17";
@ -1159,12 +1147,12 @@ final: prev:

  bufferline-nvim = buildVimPluginFrom2Nix {
    pname = "bufferline.nvim";
-    version = "2023-07-17";
+    version = "2023-07-18";
    src = fetchFromGitHub {
      owner = "akinsho";
      repo = "bufferline.nvim";
-      rev = "09b18b89ad2a2c2258a10bc06747f01bc1a42d0d";
-      sha256 = "0najr4nrgmik07xzrh30dz7yckr08mwbhhgz0z6anpyril45hq35";
+      rev = "d24378edc14a675c820a303b4512af3bbc5761e9";
+      sha256 = "0y2il1lpyb9dm8i5mz6gzlis1qf74bp81ks95k016lly6585f4nh";
    };
    meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
  };
@ -1243,12 +1231,12 @@ final: prev:

  chadtree = buildVimPluginFrom2Nix {
    pname = "chadtree";
-    version = "2023-07-17";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "chadtree";
-      rev = "193b4a53f2c2dc8bc61446f184ce55171ae1adf3";
-      sha256 = "104xdph0v2724qhkqc7jbwl90cafpswl14v19z560qxrc0y7fcir";
+      rev = "97090700510b791ae0937b46a78a8c2626c5aba2";
+      sha256 = "1jfmf317lpmrm8mnl6874vn6l48466v3q7id9j9aw1w1wdm8zhkw";
    };
    meta.homepage = "https://github.com/ms-jpq/chadtree/";
  };
@ -2027,8 +2015,8 @@ final: prev:
    src = fetchFromGitHub {
      owner = "Exafunction";
      repo = "codeium.vim";
-      rev = "e918c00ac5ace55b3ea7d7a3585343b02c227617";
-      sha256 = "0qjrildzh7zwxvlk5ac0n68w13m12gzdx0sf21rzmjhrqyfwmzkn";
+      rev = "fc31e6362f5a446919527b654869c4bc08a9e22b";
+      sha256 = "1fms3snn2pdgglv7nbvbhh8b4a0kpv53xj6iyjc9f61vmxz29ma4";
    };
    meta.homepage = "https://github.com/Exafunction/codeium.vim/";
  };
@ -2323,12 +2311,12 @@ final: prev:

  coq-artifacts = buildVimPluginFrom2Nix {
    pname = "coq.artifacts";
-    version = "2023-07-16";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq.artifacts";
-      rev = "5ee6d770bb7a305d72c77d83352a2ae494b45a8f";
-      sha256 = "09xs3qcq0l4agldgy4nb8vilgzna4r852hnnl5cxbyxpjmk3xx0w";
+      rev = "f47ef45647d237598b3ceead98a15a358bbf2e33";
+      sha256 = "0jk5ny867jf1y3qw2nw0i9035p8q7jqw6xaqzv27cpa6bs5h5pma";
    };
    meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
  };
@ -2359,12 +2347,12 @@ final: prev:

  coq_nvim = buildVimPluginFrom2Nix {
    pname = "coq_nvim";
-    version = "2023-07-17";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq_nvim";
-      rev = "9135326d588259cef9d5eb5d49d2a1b5ed76c25c";
-      sha256 = "1jfwh6jc3lmsrsqaarm8wcqw0wb4wiyznbj2v41wi5nw4pq32pif";
+      rev = "ac991666d3c6fef33bf07374d2f1e3d086e60530";
+      sha256 = "12ncwari1pmr1psnx106aqmr3lsh67mijfc42jvvgclh3af2bfj4";
    };
    meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
  };
@ -2491,12 +2479,12 @@ final: prev:

  dart-vim-plugin = buildVimPluginFrom2Nix {
    pname = "dart-vim-plugin";
-    version = "2023-06-05";
+    version = "2023-07-18";
    src = fetchFromGitHub {
      owner = "dart-lang";
      repo = "dart-vim-plugin";
-      rev = "0ba32c911178e6701d3f76d754c8138a7c7c2e6f";
-      sha256 = "0qz1d0immg9wc9ccqkn2i558jpv0v96g8zn7kd26dc3j1j64lpd4";
+      rev = "928302ec931caf0dcf21835cca284ccd2b192f7b";
+      sha256 = "0chfg23ckqyz5gr44arfvvs2b3h34n3d0jhmhfzaw4ylspxfx548";
    };
    meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/";
  };
@ -2611,24 +2599,24 @@ final: prev:

  denops-vim = buildVimPluginFrom2Nix {
    pname = "denops.vim";
-    version = "2023-07-11";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "vim-denops";
      repo = "denops.vim";
-      rev = "fece0a2b24655e42a3fd10dbbf2962d39b381e90";
-      sha256 = "12yj3wzz6qhf71zlmkxfxaqny4iyqp885iwhnr509cmcg0nynac8";
+      rev = "22e7ae3d712f190b3f46483e6b9dd50a99a9abbd";
+      sha256 = "15aqkxwaky7d0s0q9wqyaaxflin45ibsxci3qj830javih41hrqb";
    };
    meta.homepage = "https://github.com/vim-denops/denops.vim/";
  };

  deol-nvim = buildVimPluginFrom2Nix {
    pname = "deol.nvim";
-    version = "2023-07-04";
+    version = "2023-07-21";
    src = fetchFromGitHub {
      owner = "Shougo";
      repo = "deol.nvim";
-      rev = "6a471522fa69ec2cabc5fdbb55f5224fe10460a8";
-      sha256 = "1sm81lgwks2yakd4f511zxdn2gx817xw0qrn6jxhrkwhjy3zhgmh";
+      rev = "dc0b9d36d841e66783e6e38c011db450ddbae0fb";
+      sha256 = "14dipd0bcgz501g43d1gmlmw29br4aa79zajfnm3hh83kw3mhlww";
    };
    meta.homepage = "https://github.com/Shougo/deol.nvim/";
  };
@ -2913,12 +2901,12 @@ final: prev:

  diffview-nvim = buildVimPluginFrom2Nix {
    pname = "diffview.nvim";
-    version = "2023-07-08";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "sindrets";
      repo = "diffview.nvim";
-      rev = "b0cc22f5708f6b2b4f873b44fbc5eb93020f4e0c";
-      sha256 = "0hzpcwv02yvqxzf2ldhdx6icsffi93r24rjzpipm0b1i6bspg2mw";
+      rev = "e91110d2a7f8e2f667666aba6ea089ff823f8748";
+      sha256 = "1d19870i3nzb4fbz3vm6m3gdz0grh383fwkkiw36yrpaiz021nyj";
    };
    meta.homepage = "https://github.com/sindrets/diffview.nvim/";
  };
@ -2985,12 +2973,12 @@ final: prev:

  dropbar-nvim = buildVimPluginFrom2Nix {
    pname = "dropbar.nvim";
-    version = "2023-07-10";
+    version = "2023-07-21";
    src = fetchFromGitHub {
      owner = "Bekaboo";
      repo = "dropbar.nvim";
-      rev = "dd0a43d0bdd2918bef5ed7f42caacb1bbe5d7d92";
-      sha256 = "0cwlwgi4s4iggss7d1jcn4jaw8idn60yrzpjxqm8h930aa6b2zks";
+      rev = "90fc6aa051d31f22b512f967cd1485dc0d1cf32a";
+      sha256 = "1dzkrf3qak2s5bagh6w5gvq9xqd11s0z3gaawjlqnq2dpfamccah";
    };
    meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
  };
@ -3070,12 +3058,12 @@ final: prev:

  elixir-tools-nvim = buildVimPluginFrom2Nix {
    pname = "elixir-tools.nvim";
-    version = "2023-07-05";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "elixir-tools";
      repo = "elixir-tools.nvim";
-      rev = "e0c713f86333faf0484543b4c50d14ce8d1de1d2";
-      sha256 = "1nxydkvdypbb4q29sfq6axw1vc4554n02bmsv59h0kxlsyaa7hl1";
+      rev = "1c7452bd93cf77946cb838a39f0cbd02c782f1e6";
+      sha256 = "0k8j0wcm1xxwlsb5q6iww84yx2fkh76dk6dhj63vxyfpg473snzi";
    };
    meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/";
  };
@ -3167,12 +3155,12 @@ final: prev:

  eyeliner-nvim = buildVimPluginFrom2Nix {
    pname = "eyeliner.nvim";
-    version = "2023-06-29";
+    version = "2023-07-21";
    src = fetchFromGitHub {
      owner = "jinh0";
      repo = "eyeliner.nvim";
-      rev = "a6c05ed7f2a59640bd18ff0702694deda483a08e";
-      sha256 = "1clla449ab1r71hwi9f96vf7l7ixqizvmh9vapcl7605p6iy6mny";
+      rev = "70e1fb4f68bfdad2b9e2b53fcaf367ac86fc693f";
+      sha256 = "071n0dk0cn4gw12xsg6klzflp1ihl9di60xs8kljh4zjdnc6b7l9";
    };
    meta.homepage = "https://github.com/jinh0/eyeliner.nvim/";
  };
@ -3279,8 +3267,8 @@ final: prev:
    src = fetchFromGitHub {
      owner = "j-hui";
      repo = "fidget.nvim";
-      rev = "f1c375ba68839eaa4a65efdf2aa078c0da0548fe";
-      sha256 = "0bzlv846iz0dbvi166m5aj8ynxp86ba1ycwg0vjxawjcnkhvkdv4";
+      rev = "90c22e47be057562ee9566bad313ad42d622c1d3";
+      sha256 = "1ga6pxz89687km1mwisd4vfl1bpw6gg100v9xcfjks03zc1bywrp";
    };
    meta.homepage = "https://github.com/j-hui/fidget.nvim/";
  };
@ -3324,24 +3312,24 @@ final: prev:

  flash-nvim = buildVimPluginFrom2Nix {
    pname = "flash.nvim";
-    version = "2023-07-16";
+    version = "2023-07-21";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "flash.nvim";
-      rev = "c92ecbff98fdc8770c283aa3934349e6889195dd";
-      sha256 = "0pfc3fwhgj7kjf85pvhib0cp1qiq8rak63fb5nnkv2220nvdpb0c";
+      rev = "7ddeb57f60e2f19ee836aef5dc6cc1d91771f012";
+      sha256 = "1w6mklmzqyzyl314lc3y782vr4kl2dyx6bk4f71x222kxv49hfkj";
    };
    meta.homepage = "https://github.com/folke/flash.nvim/";
  };

  flatten-nvim = buildVimPluginFrom2Nix {
    pname = "flatten.nvim";
-    version = "2023-04-23";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "willothy";
      repo = "flatten.nvim";
-      rev = "d92c93959e9ac52a00002d6fd64c2d2ca5dd7192";
-      sha256 = "04p4cfvfb320bgsrhj9507z0s5hx1xi5fd0qs44qxws9aaqvx7c3";
+      rev = "c6f3950d1b0e40fb267366c356d99ed5ab10a15a";
+      sha256 = "1n8mviqg2xlafmfglhxhvr7mvfqm9kzrzp64wi0g5l69khs4sfdc";
    };
    meta.homepage = "https://github.com/willothy/flatten.nvim/";
  };
@ -3720,12 +3708,12 @@ final: prev:

  gitsigns-nvim = buildNeovimPlugin {
    pname = "gitsigns.nvim";
-    version = "2023-07-17";
+    version = "2023-07-18";
    src = fetchFromGitHub {
      owner = "lewis6991";
      repo = "gitsigns.nvim";
-      rev = "1e01b2958aebb79f1c33e7427a1bac131a678e0d";
-      sha256 = "0zci7smildfn9zs7wdqhyc094xz9fiijw4y1m97csb79425ccpq4";
+      rev = "adcf2c7f2f495f5df148683764bf7cba6a70f34c";
+      sha256 = "1lhcysi2v51l5hbv7x74wah0hsndfd6c8slg8q4avbyb46wycppr";
    };
    meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
  };
@ -3828,12 +3816,12 @@ final: prev:

  goto-preview = buildVimPluginFrom2Nix {
    pname = "goto-preview";
-    version = "2023-07-16";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "rmagatti";
      repo = "goto-preview";
-      rev = "c5fd9d8d90aef85a97f6abae6f9fe51d445e62b4";
-      sha256 = "0xvshq43326z3czqlqr56b9lybap27g0pswrmz7m9501svizb90v";
+      rev = "84532db88f8ee272bcd1c07cda55884e23fd9087";
+      sha256 = "0insrplfq6rwm9bgfj5adjk8c4mbvqhpzbd32lqq6bg4960m09vl";
    };
    meta.homepage = "https://github.com/rmagatti/goto-preview/";
  };
@ -4619,12 +4607,12 @@ final: prev:

  lazy-nvim = buildVimPluginFrom2Nix {
    pname = "lazy.nvim";
-    version = "2023-07-16";
+    version = "2023-07-21";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "lazy.nvim";
-      rev = "25beed5e2e935ebc00d7e3eed1dc502df3c40e39";
-      sha256 = "08f7ajqmd06bxpxmrqybqib1ixvq6k65y8lrsgiykjbwld59x2sk";
+      rev = "ed15f6b39422f46412212005f6d12c6f353b0293";
+      sha256 = "0vq8cjv21462ndgg39x7na2xgigm5j3b73jlh4x8wnrnsrnhw9ap";
    };
    meta.homepage = "https://github.com/folke/lazy.nvim/";
  };
@ -4643,12 +4631,12 @@ final: prev:

  lean-nvim = buildVimPluginFrom2Nix {
    pname = "lean.nvim";
-    version = "2023-07-10";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "Julian";
      repo = "lean.nvim";
-      rev = "891294bb7b5e4068a954b29f93556c1acb05393d";
-      sha256 = "1hx6shg720939zqdqh2f7liz6ais5wsch94xn230gcviqr06mjg8";
+      rev = "bb2ac98df0ca24b334d0d634a12c7ce90c8f4b4d";
+      sha256 = "0w7h0ilypwf3skqd750bpg66kxrzkv1i3av0k4zjwc1r6q9g24ap";
    };
    meta.homepage = "https://github.com/Julian/lean.nvim/";
  };
@ -5150,8 +5138,8 @@ final: prev:
    src = fetchFromGitHub {
      owner = "l3mon4d3";
      repo = "luasnip";
-      rev = "1f72e43a446961a1372c54038882c1d36e105cab";
-      sha256 = "10wlakfhjfmpgbp069ni7q81ksr0q1dpcm3yfb62jk4zx9hy8q6k";
+      rev = "0b4950a237ce441a6a3a947d501622453f6860ea";
+      sha256 = "062cfa2ckfca2i87l8p6k1lagrygb0lnbihp4y3dpxp4sbdppyl0";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@ -5351,12 +5339,12 @@ final: prev:

  mini-nvim = buildVimPluginFrom2Nix {
    pname = "mini.nvim";
-    version = "2023-07-17";
+    version = "2023-07-18";
    src = fetchFromGitHub {
      owner = "echasnovski";
      repo = "mini.nvim";
-      rev = "34acb9bd6d2f88c57d21f6a261ddba6a740651f7";
-      sha256 = "049szg72fa9ym3l2nsqfxp8p4qwrnvy2qm5pxhx292frpf5fsbr6";
+      rev = "78cf17f23dd5372154e1cc90dc3ae27da6368742";
+      sha256 = "11rm5nyr9qr6d5nwbjg05018lzs8im15vb86gyivsn0rzkgfywfj";
    };
    meta.homepage = "https://github.com/echasnovski/mini.nvim/";
  };
@ -5423,12 +5411,12 @@ final: prev:

  monokai-pro-nvim = buildVimPluginFrom2Nix {
    pname = "monokai-pro.nvim";
-    version = "2023-07-16";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "loctvl842";
      repo = "monokai-pro.nvim";
-      rev = "0f200f880eea0ffddfd4b24f6f9f2cf9c17a7efc";
-      sha256 = "1g7vawsx40fbl6h2y6ajycygmmd753wy2i4q9ix902p150rzrs4b";
+      rev = "cdad962b234580715bb3da4bf913c723280f9e5d";
+      sha256 = "1i05xil5nc3rr9x0vxr9pnqwbsbp01k9rl8rbhi6kv3cx8gs2q6y";
    };
    meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/";
  };
@ -5699,12 +5687,12 @@ final: prev:

  neo-tree-nvim = buildVimPluginFrom2Nix {
    pname = "neo-tree.nvim";
-    version = "2023-07-17";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "nvim-neo-tree";
      repo = "neo-tree.nvim";
-      rev = "293395c80224fd6f179dffc1c641430c85f999b0";
-      sha256 = "17blgl5fnr83mzkxv10xa0rhkr6yc65q43m48m8907l3m8252dmn";
+      rev = "3c68ae5968b75aea8d445b3bb024e007b0bd0b65";
+      sha256 = "04c3lirpywwc7qlwgh8r5d1x01ggnb5f1ma3m62q9xpqd04hxmaz";
    };
    meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
  };
@ -5747,12 +5735,12 @@ final: prev:

  neodev-nvim = buildVimPluginFrom2Nix {
    pname = "neodev.nvim";
-    version = "2023-07-17";
+    version = "2023-07-18";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "neodev.nvim";
-      rev = "17e89aabab209d7cdd3a205dce0678894fb3ffcd";
-      sha256 = "198mzx35xrhkwpacw93qcg5pvafilx7fl2gb7r20ds381w4jvbpk";
+      rev = "62515f64dfb196e8abe1263e17e2546559e41292";
+      sha256 = "1i9s3qvksabqbhllkl5l41fsj1vd0baqcnsbv31vz1mb6k8wrz8p";
    };
    meta.homepage = "https://github.com/folke/neodev.nvim/";
  };
@ -5783,12 +5771,12 @@ final: prev:

  neogit = buildVimPluginFrom2Nix {
    pname = "neogit";
-    version = "2023-07-17";
+    version = "2023-07-21";
    src = fetchFromGitHub {
      owner = "NeogitOrg";
      repo = "neogit";
-      rev = "bd7203e1f18ed72d1450688075f4d8f0b1c4f024";
-      sha256 = "0gibh9i6dk3cvj48vs7npc82h44xlx1qqcvx1552nisz9v4mrnxl";
+      rev = "94b5d98a3381594e91c445842192f1d2f1375b96";
+      sha256 = "1b5glxg63h32bwlf8p5p8qdadpxn308phypwgcrsi8h0isivz6j4";
    };
    meta.homepage = "https://github.com/NeogitOrg/neogit/";
  };
@ -5843,12 +5831,12 @@ final: prev:

  neorg = buildVimPluginFrom2Nix {
    pname = "neorg";
-    version = "2023-07-09";
+    version = "2023-07-18";
    src = fetchFromGitHub {
      owner = "nvim-neorg";
      repo = "neorg";
-      rev = "c801ae5165423f4c70841e548208c74da86acf72";
-      sha256 = "0gi9mmf24x8v97gg4f562pl9pn675lvwc2l1rdlrxk2w3ng28aad";
+      rev = "774f5dd80d15aa11d0221aba767da699f9533e32";
+      sha256 = "1q46i761h57hpcvaw37zdw5maia6mj3i81l1kfwa0b061drsr0yh";
    };
    meta.homepage = "https://github.com/nvim-neorg/neorg/";
  };
@ -6059,12 +6047,12 @@ final: prev:

  neotest-rspec = buildVimPluginFrom2Nix {
    pname = "neotest-rspec";
-    version = "2023-06-30";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "olimorris";
      repo = "neotest-rspec";
-      rev = "f5569be7d462585576eb19282aab83887ba84a6c";
-      sha256 = "174gj5kxvippr52qz4glij09dand627fy3q6l02fvfdir371q3sj";
+      rev = "754431f0ba41d058ba5d6c2d59908836e18ac355";
+      sha256 = "1jbd3i0zvjx7pknfg0xwk5g8742kpqbnk2z5vwnspwwf0y9ayk86";
    };
    meta.homepage = "https://github.com/olimorris/neotest-rspec/";
  };
@ -6335,12 +6323,12 @@ final: prev:

  noice-nvim = buildVimPluginFrom2Nix {
    pname = "noice.nvim";
-    version = "2023-07-17";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "noice.nvim";
-      rev = "bfd2368b3f1fdd5766885b0115238d1f47113c6d";
-      sha256 = "18dijmm8c49whkn1dlb8w6sj6f6999zzymv9ri416v4jamiwd3gj";
+      rev = "679740982682018a0805a5c813b19e4c7540f7a9";
+      sha256 = "1wk475y5pakffriz09kldj1p4kg05ryrkxzcj03c1slj8c7widgr";
    };
    meta.homepage = "https://github.com/folke/noice.nvim/";
  };
@ -6395,12 +6383,12 @@ final: prev:

  nui-nvim = buildVimPluginFrom2Nix {
    pname = "nui.nvim";
-    version = "2023-06-18";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "MunifTanjim";
      repo = "nui.nvim";
-      rev = "d146966a423e60699b084eeb28489fe3b6427599";
-      sha256 = "0cg0771dai5gsch36qfandx3i48gq2zhifnmgwarl174af8f8mrq";
+      rev = "9e3916e784660f55f47daa6f26053ad044db5d6a";
+      sha256 = "14a73dwl56kah9h36b40ir6iylvfs261ysz17qvi9vhp63vjq9cx";
    };
    meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
  };
@ -6647,12 +6635,12 @@ final: prev:

  nvim-coverage = buildVimPluginFrom2Nix {
    pname = "nvim-coverage";
-    version = "2023-07-17";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "andythigpen";
      repo = "nvim-coverage";
-      rev = "214997f42d4e00b0fe37cd826a0be43cbf326e74";
-      sha256 = "0b1dwpdf167xgqpzh0mvldmnrzbqm9lcqi98l6ykl00ik7qdnvx9";
+      rev = "4634dfb00961a86948518c7e6f85737c24364308";
+      sha256 = "0ry8b5945spz00scab6xxs8va56yg17q1dd6g90k3zm9gvdi0r79";
    };
    meta.homepage = "https://github.com/andythigpen/nvim-coverage/";
  };
@ -6683,12 +6671,12 @@ final: prev:

  nvim-dap-go = buildVimPluginFrom2Nix {
    pname = "nvim-dap-go";
-    version = "2023-07-17";
+    version = "2023-07-18";
    src = fetchFromGitHub {
      owner = "leoluz";
      repo = "nvim-dap-go";
-      rev = "64c622d5dd8c1dbfb78cdd637e6217da0f7facb9";
-      sha256 = "09ic1qlniwmzfikxcdk4zalnma7nhkly7nnzc4cvcxy6cw7w7i1p";
+      rev = "eab43d63cef832801a701812913e4d1d726725e5";
+      sha256 = "1r3i3zx11apsihv66f10x363aigml4kfb178kdblxxffn014n728";
    };
    meta.homepage = "https://github.com/leoluz/nvim-dap-go/";
  };
@ -6803,12 +6791,12 @@ final: prev:

  nvim-highlite = buildVimPluginFrom2Nix {
    pname = "nvim-highlite";
-    version = "2023-07-07";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "Iron-E";
      repo = "nvim-highlite";
-      rev = "67729d0c6218749937b9ec075650f336ad0a446b";
-      sha256 = "0w286h8y3bzk19gc5rshccp005pg8vb7yv7c0s815c9dp7lbg1va";
+      rev = "9e55fb7d6773fdeecddd87d7600ba6f3e4336e1e";
+      sha256 = "1584f90f6v0iky8xzp85yywilqxgqikrlfn6wc5bkvmm17k5bx3y";
    };
    meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
  };
@ -6875,12 +6863,12 @@ final: prev:

  nvim-lightbulb = buildVimPluginFrom2Nix {
    pname = "nvim-lightbulb";
-    version = "2023-07-12";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "kosayoda";
      repo = "nvim-lightbulb";
-      rev = "6166029a136afd56cf23384fc31e8ba203a6e102";
-      sha256 = "119zcfz7s6a6rnc342nhh1zdrfbrqgyx425r4qmzkqvq7a15bvc1";
+      rev = "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9";
+      sha256 = "0i0lppncxz7nmd683sz79063nr9yds46lyhkkxjxj853mskjisii";
    };
    meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
  };
@ -6899,12 +6887,12 @@ final: prev:

  nvim-lint = buildVimPluginFrom2Nix {
    pname = "nvim-lint";
-    version = "2023-07-17";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "mfussenegger";
      repo = "nvim-lint";
-      rev = "b401d64adb54c66de5a3c830beb3f6fced0831f1";
-      sha256 = "1gvaq9rhnz6m6qlkcyaljxjrl27i2d1sw208cv0022rara06j9nx";
+      rev = "606d1eb9506627253b98cba3fd7efad255e33ee4";
+      sha256 = "1hshhzvhfd033nq03h09jkl88m3b6zcssvr1xdzzxhgx3533a7yi";
    };
    meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
  };
@ -6935,12 +6923,12 @@ final: prev:

  nvim-lspconfig = buildVimPluginFrom2Nix {
    pname = "nvim-lspconfig";
-    version = "2023-07-17";
+    version = "2023-07-21";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvim-lspconfig";
-      rev = "ba3ec2527aa7aae9b989d69966174a22b7d1b1dd";
-      sha256 = "1wv6k3dp5sgg1bh1ww14kdgqjrzxpy5iqjdfb9w5847sxq0sgcnx";
+      rev = "dd11ba7b3c8f82d51b6d4dd7d68fce2d78bf78a0";
+      sha256 = "0qkb5bwd6l17j52pi405ma1iq0lidqz300m3322jv8z8fhagp8si";
    };
    meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
  };
@ -6995,12 +6983,12 @@ final: prev:

  nvim-metals = buildVimPluginFrom2Nix {
    pname = "nvim-metals";
-    version = "2023-07-04";
+    version = "2023-07-18";
    src = fetchFromGitHub {
      owner = "scalameta";
      repo = "nvim-metals";
-      rev = "cd50bfeae9915b827289141ee9914b79fc8887aa";
-      sha256 = "0rwzcq4lhq3qibn5p290yp3ly55cg0l64csw9y8xnjr73jc9l164";
+      rev = "92e2085f08da4598c6ae0c19c332c5c04b33a2c5";
+      sha256 = "1rv6lqr8pfa53v94l25srjmgjglxpvzxl8kxan03xyiayh5k5nbn";
    };
    meta.homepage = "https://github.com/scalameta/nvim-metals/";
  };
@ -7031,12 +7019,12 @@ final: prev:

  nvim-navic = buildVimPluginFrom2Nix {
    pname = "nvim-navic";
-    version = "2023-07-15";
+    version = "2023-07-21";
    src = fetchFromGitHub {
      owner = "smiteshp";
      repo = "nvim-navic";
-      rev = "e6da6f74d89de65258ea7e98e22103ff5de6dcf5";
-      sha256 = "00nhcfhqsvaaaa94a7yxm29ass92k7a7q4g7khm7v8bsm6prxi3x";
+      rev = "f30449ca11321cc6dc3634774f04b0c665756d2f";
+      sha256 = "0sh82p52ilzd2f71khl2q8zxclm415d8x733rxj82h6mi8rda2m6";
    };
    meta.homepage = "https://github.com/smiteshp/nvim-navic/";
  };
@ -7151,12 +7139,12 @@ final: prev:

  nvim-scrollview = buildVimPluginFrom2Nix {
    pname = "nvim-scrollview";
-    version = "2023-07-18";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "dstein64";
      repo = "nvim-scrollview";
-      rev = "5b9be248b214c0f2fcfcc1b64a147c12fe40cbe8";
-      sha256 = "0xj4d4g446gfbyzk5wy43m3ri4dkgnx444ijn9y638x78mcwx4cc";
+      rev = "f74fa963249f5924871f6aff6dddf180fc4a130d";
+      sha256 = "0dfdzdrsjvjsifaga47b0g11wi64wpmzj61h6hfc0krw3mjs0va5";
    };
    meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
  };
@ -7187,12 +7175,12 @@ final: prev:

  nvim-spectre = buildVimPluginFrom2Nix {
    pname = "nvim-spectre";
-    version = "2023-07-09";
+    version = "2023-07-18";
    src = fetchFromGitHub {
      owner = "nvim-pack";
      repo = "nvim-spectre";
-      rev = "6edac44e10b94b88bf3067fae937915172a3f825";
-      sha256 = "1l954rr5ckf6dr3qcpiambd8ikhrs80i75x9sdvsw99ccrjdfgph";
+      rev = "1ef252c1bf569b88e7e2fafde1eb0861d4f06aa3";
+      sha256 = "0z5yjxzm5psjgpwvl63y8lwnagk395xmmf5f2izwkgpfvxr33ipk";
    };
    meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
  };
@ -7271,12 +7259,12 @@ final: prev:

  nvim-treesitter = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter";
-    version = "2023-07-17";
+    version = "2023-07-21";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "44211e7f6e669b8a07e86abc533b292a30c32d62";
-      sha256 = "1255csfz0rvhafrljbilfnzwdq2ripnbvflxd862338fa1jflmlv";
+      rev = "a8ac8419c420f3564e5212ecbeba3283cfa9e78e";
+      sha256 = "0b4j40a4xbvfb9lkx3pjvp0hyns8kd93qrma05lbygd5ighbn3wg";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };
@ -7450,12 +7438,12 @@ final: prev:

  nvimdev-nvim = buildVimPluginFrom2Nix {
    pname = "nvimdev.nvim";
-    version = "2023-07-07";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvimdev.nvim";
-      rev = "e31cbf722290b640cbf80634792fcaa27dc7b699";
-      sha256 = "02krpnqg1k0hnvrhrvk2z7lb1lg38w355xs63p4i34nrmnc5fygp";
+      rev = "07f161a0252f7ad1cf22a1ba4a567b41d9aece97";
+      sha256 = "086qy6zqjjnjml8msxi34zx79cvqfmnv4lgg8gz32m3gpllazvkp";
    };
    meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
  };
@ -7559,24 +7547,24 @@ final: prev:

  onedark-vim = buildVimPluginFrom2Nix {
    pname = "onedark.vim";
-    version = "2023-05-02";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "joshdick";
      repo = "onedark.vim";
-      rev = "4e983447f0442dba1629cdaeddfd137793d71d28";
-      sha256 = "1vg5zfzyl9c93w9i3d4i22px558warma9gnpafgklrxkwq1hxq0h";
+      rev = "57b77747694ea5676c3ca0eeaf9567dc499730c0";
+      sha256 = "1yr3yywisqwdd3b7xbmcpc3dlq61mjcaspm30j2iqzs000ldbpxf";
    };
    meta.homepage = "https://github.com/joshdick/onedark.vim/";
  };

  onedarkpro-nvim = buildVimPluginFrom2Nix {
    pname = "onedarkpro.nvim";
-    version = "2023-07-05";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "olimorris";
      repo = "onedarkpro.nvim";
-      rev = "9454a13714cf771f6c61c2abb3094c0737d9d176";
-      sha256 = "12nbm4p421jcj17az0vmk4cj44ixm0v2i2i6p74llpwn7bzdza3f";
+      rev = "8e162186c85b97cc8439b3427d161c2aefa30aa8";
+      sha256 = "1aqgfnqqzxn0dvbklylzznvnk7cvah1a4qgx3dfp01l69f3pmfmy";
    };
    meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
  };
@ -7655,12 +7643,12 @@ final: prev:

  orgmode = buildVimPluginFrom2Nix {
    pname = "orgmode";
-    version = "2023-07-04";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "nvim-orgmode";
      repo = "orgmode";
-      rev = "6f73b461b9f887968d0f69ab3aee6b4ceebe3445";
-      sha256 = "0j3sms9f50nrp4g3brvrnzfa2nnyw03ghc5vrhn5qp213b66bgl2";
+      rev = "b5e12db00e88a9183fd19d9868698d85aec96aca";
+      sha256 = "0w016pgkdcrgjviz1banjnr85fp09kyx7wc8h0xwnlxr16d812lm";
    };
    meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
  };
@ -7859,12 +7847,12 @@ final: prev:

  poimandres-nvim = buildVimPluginFrom2Nix {
    pname = "poimandres.nvim";
-    version = "2023-02-17";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "olivercederborg";
      repo = "poimandres.nvim";
-      rev = "43ea31d1e19f7603697bb3272b233930d0292383";
-      sha256 = "1q3xszkwlz008n9dh3q2agii6yjk45c47k38g3fj7ssgzmq56q21";
+      rev = "6f281c8765fef5aa4d004532861b726b1f73721d";
+      sha256 = "0qpv3mkchvyyixnwi771n8n2xw81sxpw4daycwbm3wfj9r7739cr";
    };
    meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/";
  };
@ -8161,12 +8149,12 @@ final: prev:

  refactoring-nvim = buildVimPluginFrom2Nix {
    pname = "refactoring.nvim";
-    version = "2023-07-14";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "theprimeagen";
      repo = "refactoring.nvim";
-      rev = "7894b10078a1a70c9b26028f4373bf209968e9bc";
-      sha256 = "1bmqmxdp5940b9ymp73zjf1sl1m5405insj2v9jssx1cbby8pf14";
+      rev = "85cf9cb68ae4303f4c1deaf1a2009f098664e6c8";
+      sha256 = "060vp6hrvkx4ip4izwcg3p2w01k0d2bx5rzb4r9lzgsa7j54wxhj";
    };
    meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
  };
@ -8473,12 +8461,12 @@ final: prev:

  sg-nvim = buildVimPluginFrom2Nix {
    pname = "sg.nvim";
-    version = "2023-07-17";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "sourcegraph";
      repo = "sg.nvim";
-      rev = "fb17fe40387ff201d82fb7e10ddddb25a50ffbca";
-      sha256 = "1agi4d0wpmm5jz20ysv2m72mjxbns1rcb6xrgjc9g8rzxxsd58vz";
+      rev = "c59929296e0d6c9cee7c5aea80df22d437e734bb";
+      sha256 = "0q240jnllqg6pqy8krpl73rvaxrk01fsdwclnwmj35a7lyq7m0jl";
    };
    meta.homepage = "https://github.com/sourcegraph/sg.nvim/";
  };
@ -8871,12 +8859,12 @@ final: prev:

  substitute-nvim = buildVimPluginFrom2Nix {
    pname = "substitute.nvim";
-    version = "2023-07-03";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "gbprod";
      repo = "substitute.nvim";
-      rev = "7412aa56dedc3f507cddb02167a939e55b39a2cd";
-      sha256 = "17pjl4sl62myfar9xv2axghyj0dfllzr611qzh14a2kgf1x326n6";
+      rev = "89dbe55cccee36bcb5e2be8c2d92ff8716601734";
+      sha256 = "01cwgkgf8kgi4x4flwwfaj4qgafvnzaiixn68im4279rm6m1ic6y";
    };
    meta.homepage = "https://github.com/gbprod/substitute.nvim/";
  };
@ -9860,12 +9848,12 @@ final: prev:

  typst-vim = buildVimPluginFrom2Nix {
    pname = "typst.vim";
-    version = "2023-07-02";
+    version = "2023-07-18";
    src = fetchFromGitHub {
      owner = "kaarmu";
      repo = "typst.vim";
-      rev = "5c1a933d6e8178d8d2596165b1709a7605b26d11";
-      sha256 = "0pm56qlrj27y8krcjyiw17mpfb3ggl1898zj41fdb8zbhj36mj18";
+      rev = "6a99324a138c2da69589a8ab2e49375774e43d77";
+      sha256 = "085ksm9mp2w93vm22yabg1xgnjv4wd6yg3ivakqhghyk5x2qk9xy";
    };
    meta.homepage = "https://github.com/kaarmu/typst.vim/";
  };
@ -9908,12 +9896,12 @@ final: prev:

  unison = buildVimPluginFrom2Nix {
    pname = "unison";
-    version = "2023-07-14";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "unisonweb";
      repo = "unison";
-      rev = "e70a94267ac18d9552984f39bcf05a0eac17827f";
-      sha256 = "0sbf6r98ya7n7pmmqy8kk2n4ks55024x25xp9hm5f62dbnaz1i52";
+      rev = "9456a155a9073f0bbdc5d4922916d81d83008436";
+      sha256 = "04p6yzl41wi5y77qkkdz631jjmv92wgm2wyf7sz62zdsx3l7jfyj";
    };
    meta.homepage = "https://github.com/unisonweb/unison/";
  };
@ -10352,12 +10340,12 @@ final: prev:

  vim-airline = buildVimPluginFrom2Nix {
    pname = "vim-airline";
-    version = "2023-07-13";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "vim-airline";
      repo = "vim-airline";
-      rev = "cead8efb48fbd770757f74246fefd1a3c7bec8ef";
-      sha256 = "19h1y2wrapn3ig6ppm4rhjf0fw585dz5xqs2ajrxk63wwyfrrf71";
+      rev = "e6bb8427dc2d2dc3583ed1bf5ff6a9682c854d32";
+      sha256 = "0sbhpp8w1rdrh386j3q4n2zrwq1ipxb9107ddwlgs89nh5wbf4qv";
    };
    meta.homepage = "https://github.com/vim-airline/vim-airline/";
  };
@ -10844,12 +10832,12 @@ final: prev:

  vim-code-dark = buildVimPluginFrom2Nix {
    pname = "vim-code-dark";
-    version = "2023-06-05";
+    version = "2023-07-18";
    src = fetchFromGitHub {
      owner = "tomasiser";
      repo = "vim-code-dark";
-      rev = "978be3a98e49e166b572c9618206061ed74603e4";
-      sha256 = "0q7baxh2ckq0b0ycyyg7p0jq7b3wvlfgq8c69bd2dm5gdbijpq08";
+      rev = "d05d1ab602048fc13fd8cc70cd722c083b0fd904";
+      sha256 = "1v0117rahgs2ap650xcqv48xmw2yk5qiz6rfny7q0vz9pvy9p1s0";
    };
    meta.homepage = "https://github.com/tomasiser/vim-code-dark/";
  };
@ -12658,12 +12646,12 @@ final: prev:

  vim-markbar = buildVimPluginFrom2Nix {
    pname = "vim-markbar";
-    version = "2023-07-04";
+    version = "2023-07-18";
    src = fetchFromGitHub {
      owner = "Yilin-Yang";
      repo = "vim-markbar";
-      rev = "8c5a4d28a4d315db3d64cc2cd3859dbad675fb66";
-      sha256 = "1xg0vsijcmp4sjsk2cz3379zyhrqs7fin15gsknzgpxwnmpjfg0v";
+      rev = "00f8620cd53f569dca26594e9c94534f03fe16d6";
+      sha256 = "0h0m7mmc5x15mpq3af3n95nqfzhhb2mnw0rbxpr0xizjc2hcpg9z";
    };
    meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/";
  };
@ -12707,12 +12695,12 @@ final: prev:

  vim-matchup = buildVimPluginFrom2Nix {
    pname = "vim-matchup";
-    version = "2023-07-12";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "andymass";
      repo = "vim-matchup";
-      rev = "17cc05867cb3314761e4baa20115a27120f8e82c";
-      sha256 = "0hxp9akqxz7h2ly1qpiviqbgbk52mbxk88vvq6rxf2kb12sgbiag";
+      rev = "ca8971739e3908973c5912cb3a0ffb6cf7bd83e7";
+      sha256 = "1b9jqympkq0aw9mjpl5gny2xal0cmg3kxwxafpd3i4l8hw5qrwzh";
    };
    meta.homepage = "https://github.com/andymass/vim-matchup/";
  };
@ -15000,12 +14988,12 @@ final: prev:

  vimspector = buildVimPluginFrom2Nix {
    pname = "vimspector";
-    version = "2023-06-27";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "puremourning";
      repo = "vimspector";
-      rev = "02c8da857bbb1b5fc2cf7dfbdda85ba1201a8d8c";
-      sha256 = "1r4j4hilfrccrfpq08i24qdc7560lra3zvwd15y9371nkgbvrjqg";
+      rev = "95791ba3eb2e7d60de7faa4d5c13280ade356a0b";
+      sha256 = "1ss0aa2m7163yavqzxrjjr90fxbkik8mhilkwz1vjhb434wa8rnh";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/puremourning/vimspector/";
@ -15013,12 +15001,12 @@ final: prev:

  vimtex = buildVimPluginFrom2Nix {
    pname = "vimtex";
-    version = "2023-07-16";
+    version = "2023-07-19";
    src = fetchFromGitHub {
      owner = "lervag";
      repo = "vimtex";
-      rev = "5e50cc0e96e8a8ffc6fd10d627d65b8d1354b5da";
-      sha256 = "1w8q37akfwid53blhznai6521hys1xyv3w7ivd9nq099zmxfz8qy";
+      rev = "08371bf97a9c4ce3dbdf996161faf04ff8b32aa0";
+      sha256 = "1il9cq6y7yi82vpqf1dyabjx0dsc2nr91bwjvbpfqmk2zzap2j8d";
    };
    meta.homepage = "https://github.com/lervag/vimtex/";
  };
@ -15169,12 +15157,12 @@ final: prev:

  wiki-vim = buildVimPluginFrom2Nix {
    pname = "wiki.vim";
-    version = "2023-07-17";
+    version = "2023-07-20";
    src = fetchFromGitHub {
      owner = "lervag";
      repo = "wiki.vim";
-      rev = "89f3f50bef0a461082d73f93ec0f3c0a0981a0b1";
-      sha256 = "19xqlak0n1apdjwxlbqv8bvvg2p1ciqbpkvdjlp62sq1a289wxaq";
+      rev = "1c733d36026c4f9c9dac742c73a23f24838e6fef";
+      sha256 = "01ff7cj784h2w970hmjmvhbv8f76wla3b1pnhsvrgfl2rlcf6gd9";
    };
    meta.homepage = "https://github.com/lervag/wiki.vim/";
  };
@ -15458,12 +15446,12 @@ final: prev:

  catppuccin-nvim = buildVimPluginFrom2Nix {
    pname = "catppuccin-nvim";
-    version = "2023-07-17";
+    version = "2023-07-21";
    src = fetchFromGitHub {
      owner = "catppuccin";
      repo = "nvim";
-      rev = "bfe91dfb3a19ffd4445e43611fcde68acbb3fed4";
-      sha256 = "00ijlgn3fz2y1f4wncjqrmfw902csshq46xvg7283yfzmf1rwzy8";
+      rev = "6425df128d46f2db2cccf9aa7a66ca2823c1d153";
+      sha256 = "0abchc41rpfrhda9i3yjn08ngm785vxznmn3zkl2886gak0a9l34";
    };
    meta.homepage = "https://github.com/catppuccin/nvim/";
  };
@ -15518,12 +15506,12 @@ final: prev:

  lspsaga-nvim-original = buildVimPluginFrom2Nix {
    pname = "lspsaga-nvim-original";
-    version = "2023-07-16";
+    version = "2023-07-21";
    src = fetchFromGitHub {
      owner = "nvimdev";
      repo = "lspsaga.nvim";
-      rev = "95ec55dfd5355c90f1cee834bd415e1d2b5d9854";
-      sha256 = "129kb1dl0d0fh48xc42dcv17phg9dnmvfya1n9qc9p6721ymjm3y";
+      rev = "f4bfc448a837bb913bd971676ebcd94e0f3134c0";
+      sha256 = "0lxjf9zzch6zsmi9v976n95wcr1zzl2q0ha28mzppvnnd8w837ab";
    };
    meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
  };
@ -15602,12 +15590,12 @@ final: prev:

  rose-pine = buildVimPluginFrom2Nix {
    pname = "rose-pine";
-    version = "2023-07-15";
+    version = "2023-07-21";
    src = fetchFromGitHub {
      owner = "rose-pine";
      repo = "neovim";
-      rev = "76cae45b4e6716ee93afc78bd3860134935ea9d7";
-      sha256 = "0kxn0yx5qgygrdalvmhhzxfvdm275fbqbghni0anv919z052ghqk";
+      rev = "4ac66839a5cd138f26a2a107b9dd233177260346";
+      sha256 = "1dm2lr5v0ygj66daacmqkvbc1rpmhx5p778bi51wlxcya31id0sk";
    };
    meta.homepage = "https://github.com/rose-pine/neovim/";
  };
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -1186,12 +1186,12 @@
  };
  menhir = buildGrammar {
    language = "menhir";
-    version = "0.0.0+rev=db7953a";
+    version = "0.0.0+rev=be8866a";
    src = fetchFromGitHub {
      owner = "Kerl13";
      repo = "tree-sitter-menhir";
-      rev = "db7953acb0d5551f207373c81fa07a57d7b085cb";
-      hash = "sha256-w/ibFZ4bMPPRTgTJFLQrAzMecykJFcrjJjekKMXwqSI=";
+      rev = "be8866a6bcc2b563ab0de895af69daeffa88fe70";
+      hash = "sha256-CQVEQurf8Ur5xnz+g7e1nck0a32o4oeMOT78thjx8MQ=";
    };
    meta.homepage = "https://github.com/Kerl13/tree-sitter-menhir";
  };
@ -1463,6 +1463,17 @@
    };
    meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma";
  };
+  promql = buildGrammar {
+    language = "promql";
+    version = "0.0.0+rev=655afc4";
+    src = fetchFromGitHub {
+      owner = "MichaHoffmann";
+      repo = "tree-sitter-promql";
+      rev = "655afc4fe6813f38bde087d6493d8fd4920d6d4a";
+      hash = "sha256-eqpWHPlCoQqMXL4hgLXaakQ0fP/U5tK7p+QAZgq24KI=";
+    };
+    meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-promql";
+  };
  proto = buildGrammar {
    language = "proto";
    version = "0.0.0+rev=42d82fa";
@ -1597,12 +1608,12 @@
  };
  regex = buildGrammar {
    language = "regex";
-    version = "0.0.0+rev=17a3293";
+    version = "0.0.0+rev=2354482";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-regex";
-      rev = "17a3293714312c691ef14217f60593a3d093381c";
-      hash = "sha256-3D+LOWRUamAdbegVfWD5yFcCjBucthPogOL/zWR78PY=";
+      rev = "2354482d7e2e8f8ff33c1ef6c8aa5690410fbc96";
+      hash = "sha256-X4iQ60LgiVsF0rtinVysX16d6yFjaSmwwndP2L5cuqw=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex";
  };
@ -1860,6 +1871,17 @@
    };
    meta.homepage = "https://github.com/RaafatTurki/tree-sitter-sxhkdrc";
  };
+  systemtap = buildGrammar {
+    language = "systemtap";
+    version = "0.0.0+rev=1af543a";
+    src = fetchFromGitHub {
+      owner = "ok-ryoko";
+      repo = "tree-sitter-systemtap";
+      rev = "1af543a96d060b1f808982037bfc54cc02218edd";
+      hash = "sha256-KCsISHv9yglW+63UY/9Dhb0yVz7Ha76EyHo65Si6SpY=";
+    };
+    meta.homepage = "https://github.com/ok-ryoko/tree-sitter-systemtap";
+  };
  t32 = buildGrammar {
    language = "t32";
    version = "0.0.0+rev=4e581fc";
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -149,6 +149,19 @@ self: super: {
    };
  };

+  # The GitHub repository returns 404, which breaks the update script
+  bitbake-vim = buildVimPluginFrom2Nix {
+    pname = "bitbake.vim";
+    version = "2021-02-06";
+    src = fetchFromGitHub {
+      owner = "sblumentritt";
+      repo = "bitbake.vim";
+      rev = "faddca1e8768b10c80ee85221fb51a560df5ba45";
+      sha256 = "1hfly2vxhhvjdiwgfz58hr3523kf9z71i78vk168n3kdqp5vkwrp";
+    };
+    meta.homepage = "https://github.com/sblumentritt/bitbake.vim/";
+  };
+
  chadtree = super.chadtree.overrideAttrs {
    passthru.python3Dependencies = ps: with ps; [
      pynvim-pp
@ -919,7 +932,7 @@ self: super: {
        pname = "sg-nvim-rust";
        inherit (old) version src;

-        cargoHash = "sha256-ErXgFNx3bTp955p45xpW0vAfLMPbH8KQ+SQH6/TE3m4=";
+        cargoHash = "sha256-Xlhy2yfB99Tu0j7rXRC6UkdcV0MW09olyxcC2gjd7h4=";

        nativeBuildInputs = [ pkg-config ];

--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -85,7 +85,6 @@ https://github.com/vim-scripts/bats.vim/,,
 https://github.com/rbgrouleff/bclose.vim/,,
 https://github.com/max397574/better-escape.nvim/,,
 https://github.com/LunarVim/bigfile.nvim/,,
-https://github.com/sblumentritt/bitbake.vim/,,
 https://github.com/APZelos/blamer.nvim/,HEAD,
 https://github.com/HampusHauffman/block.nvim/,HEAD,
 https://github.com/blueballs-theme/blueballs-neovim/,,
@ -273,7 +272,7 @@ https://github.com/freddiehaddad/feline.nvim/,,
 https://github.com/bakpakin/fennel.vim/,,
 https://github.com/lambdalisue/fern.vim/,,
 https://github.com/wincent/ferret/,,
-https://github.com/j-hui/fidget.nvim/,,
+https://github.com/j-hui/fidget.nvim/,legacy,
 https://github.com/bogado/file-line/,,
 https://github.com/glacambre/firenvim/,HEAD,
 https://github.com/andviro/flake8-vim/,,
--- a/pkgs/applications/file-managers/browsr/default.nix
+++ b/pkgs/applications/file-managers/browsr/default.nix
@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "browsr";
-  version = "1.11.0";
+  version = "1.12.0";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "juftin";
    repo = "browsr";
    rev = "v${version}";
-    hash = "sha256-LhrMQFkvdkYra/6jQtMAooGy76qLYldHoxEGMPhde7Q=";
+    hash = "sha256-4i9jm4Rz2GepJHUvYXfjfNa/RxY2+16CmtLP70pb/DQ=";
  };

  nativeBuildInputs = with python3.pkgs; [
--- a/pkgs/applications/networking/clash-verge/default.nix
+++ b/pkgs/applications/networking/clash-verge/default.nix
@ -14,11 +14,11 @@

 stdenv.mkDerivation rec {
  pname = "clash-verge";
-  version = "1.3.3";
+  version = "1.3.4";

  src = fetchurl {
    url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb";
-    hash = "sha256-9VsHC0HqV3CavqBw9uK+zC1nHIkK8Dry3zhK1rr+VBU=";
+    hash = "sha256-Jqp+bGxOuKH3BTmwnjo2RVB0c2rBVjDqZmFSw5RD/ew=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/pkgs/applications/networking/cluster/argocd/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "argocd";
-  version = "2.7.7";
+  version = "2.7.8";

  src = fetchFromGitHub {
    owner = "argoproj";
    repo = "argo-cd";
    rev = "v${version}";
-    sha256 = "sha256-1GFA/zGX9geHgGRWx+sgszr9bJnMhAiiTjrnfvkTzuA=";
+    sha256 = "sha256-WZD/eq04PgUURdONpGvFP/wKwz4sUaoGMvrYZqJ+QqQ=";
  };

  proxyVendor = true; # darwin/linux hash mismatch
--- a/pkgs/applications/networking/cluster/terraform-backend-git/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-backend-git/default.nix
@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "terraform-backend-git";
-  version = "0.1.4";
+  version = "0.1.5";

  src = fetchFromGitHub {
    owner = "plumber-cd";
    repo = "terraform-backend-git";
    rev = "v${version}";
-    hash = "sha256-nRh2eIVVBdb8jFfgmPoOk4y0TDoCeng50TRA+nphn58=";
+    hash = "sha256-ryHFuHIEJ4i1R3oBW3w3aAvtv+vIrO745qwx0+SqBF4=";
  };

  vendorHash = "sha256-Y/4UgG/2Vp+gxBnGrNpAgRNfPZWJXhVo8TVa/VfOYt0=";
--- a/pkgs/applications/networking/netmaker/default.nix
+++ b/pkgs/applications/networking/netmaker/default.nix
@ -10,16 +10,16 @@

 buildGoModule rec {
  pname = "netmaker";
-  version = "0.20.3";
+  version = "0.20.4";

  src = fetchFromGitHub {
    owner = "gravitl";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-S4j9JoY3e763Jw46nCfJYdmZd8Ryao5v/zSiP1Cz9Pc=";
+    hash = "sha256-4njC4hQoiAWlkwyvP14wWK+PxQ6bGR5QzteurHcuo4o=";
  };

-  vendorHash = "sha256-BkBS1Gd9aZFIc1bTujYn2694SvRMF3nNCBg5i1NRwns=";
+  vendorHash = "sha256-f6foYD/2b9iLzQbPTXeiKCdrm7gz5E8ulWHZaj+KB/M=";

  inherit subPackages;

--- a/pkgs/applications/version-management/lefthook/default.nix
+++ b/pkgs/applications/version-management/lefthook/default.nix
@ -6,7 +6,7 @@

 let
  pname = "lefthook";
-  version = "1.4.5";
+  version = "1.4.6";
 in
 buildGoModule rec {
  inherit pname version;
@ -15,10 +15,10 @@ buildGoModule rec {
    owner = "evilmartians";
    repo = "lefthook";
    rev = "v${version}";
-    hash = "sha256-4QMizZrCj1WW5/SswBw5TYFVANI1OFoPd43nNGQHRNo=";
+    hash = "sha256-2SgzNDG63Lsddhn1phqBNuar4I5Gr4mkHv3pYvMIZ28=";
  };

-  vendorHash = "sha256-QKprfszbWqegvIJ2J+f3gxLpkpZgfuLP5HjoMwyCi5M=";
+  vendorHash = "sha256-/VLS7+nPERjIU7V2CzqXH69Z3/y+GKZbAFn+KcRKRuA=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/applications/video/asciicam/default.nix
+++ b/pkgs/applications/video/asciicam/default.nix
@ -0,0 +1,27 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule {
+  pname = "asciicam";
+  version = "unstable-2022-06-25";
+
+  src = fetchFromGitHub {
+    owner = "muesli";
+    repo = "asciicam";
+    rev = "e17a9333fdfe5f7c4c610c6aac23419fe2cba7a9";
+    hash = "sha256-BzMoyqp2chlQGA2Q9i8koXlH4pemN6q3P8gwM1i8ZAU=";
+  };
+
+  vendorHash = "sha256-Qnt1wo/yKC3Ce4JoZBIWtXyzlkh4bWz9vyE349iRsjk=";
+
+  ldflags = [ "-s" "-w" ];
+
+  meta = with lib; {
+    description = "Displays your webcam on the terminal";
+    homepage = "https://github.com/muesli/asciicam";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
    + lib.optionalString xenSupport "-xen"
    + lib.optionalString hostCpuOnly "-host-cpu-only"
    + lib.optionalString nixosTestRunner "-for-vm-tests";
-  version = "8.0.2";
+  version = "8.0.3";

  src = fetchurl {
    url = "https://download.qemu.org/qemu-${version}.tar.xz";
-    sha256 = "8GCr1DX75nlBJeLDmFaP/Dz6VABCWWkHqLGO3KNM9qU=";
+    hash = "sha256-7PTTLL7505e/yMxQ5NHpKhswJTvzLo7nPHqNz5ojKwk=";
  };

  depsBuildBuild = [ buildPackages.stdenv.cc ]
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "joker";
-  version = "1.1.0";
+  version = "1.2.0";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "candid82";
    repo = "joker";
-    sha256 = "sha256-ERkK4T+nUTf18OoEctSugeK4i/f6k0naBKxzn+6pe38=";
+    sha256 = "sha256-hNwDX2yg7J8rcR9QRSGgqFTeqH+ydyDtPbIGC2nK5RI=";
  };

-  vendorSha256 = "sha256-AYoespfzFLP/jIIxbw5K653wc7sSfLY8K7di8GZ64wA=";
+  vendorHash = "sha256-DrVtT2OBNquWVp/8Je45dBPDXafEc2Q+jffwY2S8J80=";

  doCheck = false;

--- a/pkgs/development/libraries/cmark-gfm/default.nix
+++ b/pkgs/development/libraries/cmark-gfm/default.nix
@ -1,13 +1,13 @@
 { lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
  pname = "cmark-gfm";
-  version = "0.29.0.gfm.12";
+  version = "0.29.0.gfm.13";

  src = fetchFromGitHub {
    owner = "github";
    repo = "cmark-gfm";
    rev = version;
-    sha256 = "sha256-C/aqoifxKWj+VXdsnNTHuAR/cFns0kGpSLstZ/6XPqU=";
+    sha256 = "sha256-HiSGtRsSbW03R6aKoMVVFOLrwP5aXtpeXUC/bE5M/qo=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/pkgs/development/python-modules/aiohomekit/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "aiohomekit";
-  version = "2.6.9";
+  version = "2.6.10";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "Jc2k";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-XhJDc5fkk5kMb6VMGXOAUWxOYMbC1AkFSUMHWPMMvfo=";
+    hash = "sha256-2+PqXIKjEJWfTUAJYctWojwoWl7QOfxbbH6c7ZlTNRI=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/certipy-ad/default.nix
+++ b/pkgs/development/python-modules/certipy-ad/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "certipy-ad";
-  version = "4.5.1";
+  version = "4.7.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "ly4k";
    repo = "Certipy";
    rev = "refs/tags/${version}";
-    hash = "sha256-OxSTg9yFzyiAnRUcSTG5EzFk5ForzEVt/tUyi+cz9XI=";
+    hash = "sha256-CkIxk+Aps9TRA2wEE/zZKl9t4CyjxEsgLntbn9kWY6o=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/lmfit/default.nix
+++ b/pkgs/development/python-modules/lmfit/default.nix
@ -14,13 +14,13 @@

 buildPythonPackage rec {
  pname = "lmfit";
-  version = "1.2.1";
+  version = "1.2.2";

  format = "pyproject";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-AM71vRRb+BtzYwt4kmrySyTxgFQh5iEcpYVYiqfMQVs=";
+    hash = "sha256-BEoFKhGmHaBXYnRQTBfrfigDtBEo4lgh6WYyIH8jyIw=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@ -15,22 +15,21 @@
 , pytestCheckHook
 , pytest-asyncio
 , aiosqlite
-, sqlalchemy
 , asyncpg
 }:

 buildPythonPackage rec {
  pname = "mautrix";
-  version = "0.19.16";
+  version = "0.20.0";
  format = "setuptools";

-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";

  src = fetchFromGitHub {
    owner = "mautrix";
    repo = "python";
    rev = "refs/tags/v${version}";
-    hash = "sha256-aZlc4+J5Q+N9qEzGUMhsYguPdUy+E5I06wrjVyqvVDk=";
+    hash = "sha256-op28CGpJBcCBiy0WXboaf4JeNRIMX6653QkAV6XW/yI=";
  };

  propagatedBuildInputs = [
@ -57,17 +56,9 @@ buildPythonPackage rec {
  checkInputs = [
    pytest-asyncio
    aiosqlite
-    sqlalchemy
    asyncpg
  ] ++ passthru.optional-dependencies.encryption;

-  SQLALCHEMY_SILENCE_UBER_WARNING = 1;
-
-  disabledTestPaths = [
-    # sqlalchemy 2 unsupported
-    "mautrix/client/state_store/tests/store_test.py"
-  ];
-
  pythonImportsCheck = [
    "mautrix"
  ];
--- a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix
+++ b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "robotframework-pythonlibcore";
-  version = "4.1.2";
+  version = "4.2.0";

  disabled = pythonOlder "3.7";

@ -18,8 +18,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "robotframework";
    repo = "PythonLibCore";
-    rev = "v${version}";
-    hash = "sha256-uS0NwyFqidhrMG7thHM0qau22B/kI16c8aXEUuNdioQ=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-RJTn1zSVJYgbh93Idr77uHl02u0wpj6p6llSJfQVTQk=";
  };

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/rpds-py/default.nix
+++ b/pkgs/development/python-modules/rpds-py/default.nix
@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , buildPythonPackage
 , cargo
 , fetchPypi
@ -6,6 +7,7 @@
 , pythonOlder
 , rustc
 , rustPlatform
+, libiconv
 }:

 buildPythonPackage rec {
@ -34,6 +36,10 @@ buildPythonPackage rec {
    rustc
  ];

+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
+
  nativeCheckInputs = [
    pytestCheckHook
  ];
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "gauge";
-  version = "1.5.1";
+  version = "1.5.2";

  src = fetchFromGitHub {
    owner = "getgauge";
    repo = "gauge";
    rev = "v${version}";
-    hash = "sha256-67MHWJc4sOhOVe0n1RJLSez7SeUb79gGxjDqMrTuqFU=";
+    hash = "sha256-gdqb9atksAU2bjNdoOfxb3XYl3H/1F51Xnfnm78J3CQ=";
  };

-  vendorHash = "sha256-qrRb8LRRmY5sZSSqsh0oSUq9MGYy7M8bgtBH8JPYQmc=";
+  vendorHash = "sha256-PmidtbtX+x5cxuop+OCrfdPP5EiJnyvFyxHveGVGAEo=";

  excludedPackages = [ "build" "man" ];

--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@ -6,14 +6,14 @@
 buildDunePackage rec {
  pname = "utop";

-  version = "2.13.0";
+  version = "2.13.1";
  propagatedBuildInputs = [ findlib lambda-term xdg zed logs ];

  minimalOCamlVersion = "4.11";

  src = fetchurl {
    url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz";
-    sha256 = "sha256-iEUPIABsLRB4Gr6YQbrSpX5ymLXs8b4zu/Hq3r0Shtg=";
+    sha256 = "sha256-sE7Co5TRpqKKeURMWPZuq3e390QB9HFKpubxwhJab/0=";
  };

  nativeBuildInputs = [ makeWrapper cppo ];
--- a/pkgs/development/tools/ruff/Cargo.lock
+++ b/pkgs/development/tools/ruff/Cargo.lock
@ -188,7 +188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
 dependencies = [
 "memchr",
- "regex-automata",
+ "regex-automata 0.3.0",
 "serde",
 ]

@ -734,7 +734,7 @@ dependencies = [

 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.278"
+version = "0.0.279"
 dependencies = [
 "anyhow",
 "clap",
@ -776,6 +776,12 @@ dependencies = [
 "percent-encoding",
 ]

+[[package]]
+name = "fs-err"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541"
+
 [[package]]
 name = "fsevent-sys"
 version = "4.1.0"
@ -963,6 +969,12 @@ dependencies = [
 "unicode-width",
 ]

+[[package]]
+name = "indoc"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4"
+
 [[package]]
 name = "inotify"
 version = "0.9.6"
@ -985,14 +997,15 @@ dependencies = [

 [[package]]
 name = "insta"
-version = "1.30.0"
+version = "1.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28491f7753051e5704d4d0ae7860d45fae3238d7d235bc4289dcd45c48d3cec3"
+checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a"
 dependencies = [
 "console",
 "globset",
 "lazy_static",
 "linked-hash-map",
+ "regex",
 "similar",
 "walkdir",
 "yaml-rust",
@ -1192,6 +1205,15 @@ version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"

+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
 [[package]]
 name = "matches"
 version = "0.1.10"
@ -1307,6 +1329,16 @@ dependencies = [
 "windows-sys 0.45.0",
 ]

+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.3"
@ -1389,6 +1421,12 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "paste"
 version = "1.0.13"
@ -1775,8 +1813,17 @@ checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484"
 dependencies = [
 "aho-corasick 1.0.2",
 "memchr",
- "regex-automata",
- "regex-syntax",
+ "regex-automata 0.3.0",
+ "regex-syntax 0.7.3",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
 ]

 [[package]]
@ -1787,9 +1834,15 @@ checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56"
 dependencies = [
 "aho-corasick 1.0.2",
 "memchr",
- "regex-syntax",
+ "regex-syntax 0.7.3",
 ]

+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
 [[package]]
 name = "regex-syntax"
 version = "0.7.3"
@ -1835,7 +1888,7 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.0.278"
+version = "0.0.279"
 dependencies = [
 "annotate-snippets 0.9.1",
 "anyhow",
@ -1876,7 +1929,7 @@ dependencies = [
 "ruff_python_ast",
 "ruff_python_semantic",
 "ruff_python_stdlib",
- "ruff_python_whitespace",
+ "ruff_python_trivia",
 "ruff_rustpython",
 "ruff_text_size",
 "ruff_textwrap",
@ -1893,12 +1946,14 @@ dependencies = [
 "smallvec",
 "strum",
 "strum_macros",
+ "tempfile",
 "test-case",
 "thiserror",
 "toml",
 "typed-arena",
 "unicode-width",
 "unicode_names2",
+ "wsl",
 ]

 [[package]]
@ -1933,7 +1988,7 @@ dependencies = [

 [[package]]
 name = "ruff_cli"
-version = "0.0.278"
+version = "0.0.279"
 dependencies = [
 "annotate-snippets 0.9.1",
 "anyhow",
@ -1950,6 +2005,7 @@ dependencies = [
 "filetime",
 "glob",
 "ignore",
+ "insta",
 "itertools",
 "itoa",
 "log",
@ -1972,6 +2028,7 @@ dependencies = [
 "shellexpand",
 "similar",
 "strum",
+ "tempfile",
 "tikv-jemallocator",
 "ureq",
 "walkdir",
@ -1986,6 +2043,7 @@ dependencies = [
 "clap",
 "ignore",
 "indicatif",
+ "indoc",
 "itertools",
 "libcst",
 "log",
@ -2003,11 +2061,13 @@ dependencies = [
 "rustpython-format",
 "rustpython-parser",
 "schemars",
+ "serde",
 "serde_json",
 "similar",
 "strum",
 "strum_macros",
 "tempfile",
+ "toml",
 ]

 [[package]]
@ -2068,7 +2128,7 @@ dependencies = [
 "num-bigint",
 "num-traits",
 "once_cell",
- "ruff_python_whitespace",
+ "ruff_python_trivia",
 "ruff_text_size",
 "rustc-hash",
 "rustpython-ast",
@ -2092,7 +2152,7 @@ dependencies = [
 "once_cell",
 "ruff_formatter",
 "ruff_python_ast",
- "ruff_python_whitespace",
+ "ruff_python_trivia",
 "ruff_text_size",
 "rustc-hash",
 "rustpython-parser",
@ -2101,7 +2161,6 @@ dependencies = [
 "similar",
 "smallvec",
 "thiserror",
- "unic-ucd-ident",
 ]

 [[package]]
@ -2136,11 +2195,14 @@ name = "ruff_python_stdlib"
 version = "0.0.0"

 [[package]]
-name = "ruff_python_whitespace"
+name = "ruff_python_trivia"
 version = "0.0.0"
 dependencies = [
+ "insta",
 "memchr",
 "ruff_text_size",
+ "smallvec",
+ "unic-ucd-ident",
 ]

 [[package]]
@ -2151,10 +2213,26 @@ dependencies = [
 "rustpython-parser",
 ]

+[[package]]
+name = "ruff_shrinking"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "fs-err",
+ "regex",
+ "ruff_python_ast",
+ "ruff_rustpython",
+ "rustpython-ast",
+ "shlex",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "ruff_text_size"
 version = "0.0.0"
-source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779"
 dependencies = [
 "schemars",
 "serde",
@ -2164,7 +2242,7 @@ dependencies = [
 name = "ruff_textwrap"
 version = "0.0.0"
 dependencies = [
- "ruff_python_whitespace",
+ "ruff_python_trivia",
 "ruff_text_size",
 ]

@ -2179,6 +2257,7 @@ dependencies = [
 "ruff",
 "ruff_diagnostics",
 "ruff_python_ast",
+ "ruff_python_formatter",
 "ruff_rustpython",
 "rustpython-parser",
 "serde",
@ -2255,7 +2334,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.2.0"
-source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779"
 dependencies = [
 "is-macro",
 "num-bigint",
@ -2266,7 +2345,7 @@ dependencies = [
 [[package]]
 name = "rustpython-format"
 version = "0.2.0"
-source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779"
 dependencies = [
 "bitflags 2.3.3",
 "itertools",
@ -2278,7 +2357,7 @@ dependencies = [
 [[package]]
 name = "rustpython-literal"
 version = "0.2.0"
-source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779"
 dependencies = [
 "hexf-parse",
 "is-macro",
@ -2290,7 +2369,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.2.0"
-source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779"
 dependencies = [
 "anyhow",
 "is-macro",
@ -2313,7 +2392,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser-core"
 version = "0.2.0"
-source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0"
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779"
 dependencies = [
 "is-macro",
 "memchr",
@ -2483,6 +2562,15 @@ dependencies = [
 "syn 2.0.23",
 ]

+[[package]]
+name = "sharded-slab"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+dependencies = [
+ "lazy_static",
+]
+
 [[package]]
 name = "shellexpand"
 version = "3.1.0"
@ -2492,6 +2580,12 @@ dependencies = [
 "dirs 5.0.1",
 ]

+[[package]]
+name = "shlex"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+
 [[package]]
 name = "similar"
 version = "2.2.1"
@ -2845,6 +2939,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
 dependencies = [
 "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
 ]

 [[package]]
@ -2998,6 +3122,12 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be"

+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
@ -3345,6 +3475,12 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "wsl"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dab7ac864710bdea6594becbea5b5050333cf34fefb0dc319567eb347950d4"
+
 [[package]]
 name = "yaml-rust"
 version = "0.4.5"
--- a/pkgs/development/tools/ruff/default.nix
+++ b/pkgs/development/tools/ruff/default.nix
@ -10,20 +10,20 @@

 rustPlatform.buildRustPackage rec {
  pname = "ruff";
-  version = "0.0.278";
+  version = "0.0.279";

  src = fetchFromGitHub {
    owner = "astral-sh";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-CM5oV9q9XYhaUV173VoFZl6dDALan4Lkl5PrvZN81c4=";
+    hash = "sha256-7f/caaCbYt+Uatd12gATSJgs5Nx/X7YZhXEESl5OtWE=";
  };

  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
      "libcst-0.1.0" = "sha256-FgQE8ofRXQs/zHh7AKscXu0deN3IG+Nk/h+a09Co5R8=";
-      "ruff_text_size-0.0.0" = "sha256-N4IzMeU8vqkfPBbC3o2bqkecCUcbgmX35QVdsTCtFfc=";
+      "ruff_text_size-0.0.0" = "sha256-5BAsTsgvrP+77yZuA/QfEwVOmCj82ab8Y4D3NtY7E2Q=";
      "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg=";
    };
  };
@ -45,6 +45,11 @@ rustPlatform.buildRustPackage rec {
    export JEMALLOC_SYS_WITH_LG_VADDR=48
  '';

+  # tests expect no colors
+  preCheck = ''
+    export NO_COLOR=1
+  '';
+
  postInstall = ''
    installShellCompletion --cmd ruff \
      --bash <($out/bin/ruff generate-shell-completion bash) \
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@ -18,13 +18,13 @@

 buildGoModule rec {
  pname = "skopeo";
-  version = "1.13.0";
+  version = "1.13.1";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "containers";
    repo = "skopeo";
-    hash = "sha256-PSBwwF6tIQ6EZD/nWj5Lw0ifk1aLLJl/qaj5EsksBBo=";
+    hash = "sha256-R9W9ZjH/McB5EwJ/RXeShoRKA6GRFiQX3mgQOCBm8sA=";
  };

  outputs = [ "out" "man" ];
--- a/pkgs/development/tools/wasmedge/default.nix
+++ b/pkgs/development/tools/wasmedge/default.nix
@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "wasmedge";
-  version = "0.13.0";
+  version = "0.13.2";

  src = fetchFromGitHub {
    owner = "WasmEdge";
    repo = "WasmEdge";
    rev = finalAttrs.version;
-    sha256 = "sha256-NbjjfK6qMKl6PRNSOmAYKB2prPEo9WCZuVWN1hLdGbU=";
+    sha256 = "sha256-AU+EfNC6Au93ajj8cMTbJDvJ5iWLtT5Law7l55Knxuk=";
  };

  nativeBuildInputs = [
--- a/pkgs/servers/heisenbridge/default.nix
+++ b/pkgs/servers/heisenbridge/default.nix
@ -1,21 +1,6 @@
-{ lib, fetchFromGitHub, fetchpatch, python3 }:
+{ lib, fetchFromGitHub, python3 }:

-let
-  python = python3.override {
-    packageOverrides = self: super: {
-      mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec {
-        version = "0.16.10";
-        src = fetchFromGitHub {
-          owner = "mautrix";
-          repo = "python";
-          rev = "v${version}";
-          hash = "sha256-YQsQ7M+mHcRdGUZp+mo46AlBmKSdmlgRdGieEG0Hu9k=";
-        };
-      });
-    };
-  };
-in
-python.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
  pname = "heisenbridge";
  version = "1.14.3";

@ -30,14 +15,14 @@ python.pkgs.buildPythonApplication rec {
    echo "${version}" > heisenbridge/version.txt
  '';

-  propagatedBuildInputs = with python.pkgs; [
+  propagatedBuildInputs = with python3.pkgs; [
    irc
    ruamel-yaml
    mautrix
    python-socks
  ];

-  nativeCheckInputs = with python.pkgs; [
+  nativeCheckInputs = with python3.pkgs; [
    pytestCheckHook
  ];

--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "homeassistant-stubs";
-  version = "2023.7.2";
+  version = "2023.7.3";
  format = "pyproject";

  disabled = python.version != home-assistant.python.version;
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "KapJI";
    repo = "homeassistant-stubs";
    rev = "refs/tags/${version}";
-    hash = "sha256-0Kx1qfeWvDH3JDbziwmAwJcpb7Loix1oGAZGPKvfHac=";
+    hash = "sha256-M7AGGGB7PpZBrNf9bUNX13SbQ8raK6nEUNkHbTIYuXQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/servers/mautrix-facebook/default.nix
+++ b/pkgs/servers/mautrix-facebook/default.nix
@ -1,20 +1,19 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , python3
 , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform python3.pkgs.systemd
 }:

 python3.pkgs.buildPythonPackage rec {
  pname = "mautrix-facebook";
-  version = "0.4.1";
+  version = "unstable-2023-07-16";

  src = fetchFromGitHub {
    owner = "mautrix";
    repo = "facebook";
-    rev = "v${version}";
-    hash = "sha256-MlT8jNUpJMgaUO9ZIYjpv8l3evdFjfEOSvdAdSlOUvg=";
+    rev = "543b50e73918918d1fabac67891dd80d97080942";
+    hash = "sha256-Y6nwryPenNQa68Rh2KPUHQrv6rnapj8x19FdgLXutm8=";
  };

  propagatedBuildInputs = with python3.pkgs; [
--- a/pkgs/servers/mautrix-googlechat/default.nix
+++ b/pkgs/servers/mautrix-googlechat/default.nix
@ -7,13 +7,13 @@
 , enableSqlite ? true
 }: python3.pkgs.buildPythonApplication rec {
  pname = "mautrix-googlechat";
-  version = "unstable-2023-01-25";
+  version = "unstable-2023-07-16";

  src = fetchFromGitHub {
    owner = "mautrix";
    repo = "googlechat";
-    rev = "e2eb528745466468f059c506c22e500e0cd832aa";
-    sha256 = "sha256-FNlEHzuy89RuFUwZPmVA+4AmpQHGD+18BguGC6qBdBM=";
+    rev = "f4cddafd474b12be09efd15c6652c04d0650458e";
+    sha256 = "sha256-WMJVAX5oUdYYuXoJKk7OoERR0LJM0Er5444xwqIUTm8=";
  };

  patches = [
@ -54,7 +54,7 @@
    ruamel-yaml
    commonmark
    python-magic
-    protobuf3
+    protobuf
    mautrix
  ] ++ lib.optionals enableE2be passthru.optional-dependencies.e2be
  ++ lib.optionals enableMetrics passthru.optional-dependencies.metrics
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@ -17,14 +17,6 @@ let
        };
        doCheck = false;
      });
-      mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec {
-        version = "0.20.0";
-        src = oldAttrs.src.override {
-          rev = "refs/tags/v${version}";
-          hash = "sha256-op28CGpJBcCBiy0WXboaf4JeNRIMX6653QkAV6XW/yI=";
-        };
-        doCheck = false;
-      });
    };
  };
 in
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@ -2,7 +2,7 @@

 buildPythonApplication rec {
  pname = "Tautulli";
-  version = "2.12.4";
+  version = "2.12.5";
  format = "other";

  pythonPath = [ setuptools ];
@ -12,7 +12,7 @@ buildPythonApplication rec {
    owner = "Tautulli";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-9E2qEdPfxnvx7WCHE/I2rP6Qk9CtsVrisQbq202+2uE=";
+    sha256 = "sha256-ruCTmLmAsDzrNUZAeu0NjgPZRG1ZEOFUdprMvO6ZWbc=";
  };

  installPhase = ''
--- a/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/pkgs/tools/admin/exoscale-cli/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "exoscale-cli";
-  version = "1.71.1";
+  version = "1.71.2";

  src = fetchFromGitHub {
    owner = "exoscale";
    repo = "cli";
    rev = "v${version}";
-    sha256 = "sha256-ex4TcOKHvxMlPJM/mNHUzCdgm9+5O98hQ1f6rc0afX4=";
+    sha256 = "sha256-c+u4mEpkzIEg3C1nQCSAhWdWWVxrW12Tt1RelgPkP1Y=";
  };

  vendorHash = null;
--- a/pkgs/tools/admin/simplotask/default.nix
+++ b/pkgs/tools/admin/simplotask/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "simplotask";
-  version = "1.9.0";
+  version = "1.9.2";

  src = fetchFromGitHub {
    owner = "umputun";
    repo = "spot";
    rev = "v${version}";
-    hash = "sha256-8QlxZ41t7tbi1Z5wjEp6BcjgVFoywM5T5PQGlImZWMk=";
+    hash = "sha256-cUsxkp/cWA7odhPli00rVodX2FjM0xCl7g/uOlJQl3Y=";
  };

  vendorHash = null;
--- a/pkgs/tools/misc/bitwise/default.nix
+++ b/pkgs/tools/misc/bitwise/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "bitwise";
-  version = "0.43";
+  version = "0.50";

  src = fetchFromGitHub {
    owner = "mellowcandle";
    repo = "bitwise";
    rev = "v${version}";
-    sha256 = "18sz7bfpq83s2zhw7c35snz6k3b6rzad2mmfq2qwmyqwypbp1g7l";
+    sha256 = "sha256-x+ky1X0c0bQZnkNvNNuXN2BoMDtDSCt/8dBAG92jCCQ=";
  };

  buildInputs = [ ncurses readline ];
--- a/pkgs/tools/misc/charasay/default.nix
+++ b/pkgs/tools/misc/charasay/default.nix
@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "charasay";
-  version = "3.0.0";
+  version = "3.0.1";

  src = fetchFromGitHub {
    owner = "latipun7";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-LijIteY0RZxNf6RI61bm1Ug4+GFsoWr6icNu1p2pa2s=";
+    hash = "sha256-Cq7pHW4CYGHdVAhscyiOHSdi5Lefk5ve32EOqS2oSRk=";
  };

-  cargoHash = "sha256-sG+tyCYur2UR1U9g5tWOyuU2mJ14PdayBqMdNGOwIrA=";
+  cargoHash = "sha256-/9ex5rIYtJVsuwpOpCZLgFSHEdntbnkOX1oRaZ02AOg=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/tools/misc/dotter/default.nix
+++ b/pkgs/tools/misc/dotter/default.nix
@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "dotter";
-  version = "0.12.15";
+  version = "0.12.16";

  src = fetchFromGitHub {
    owner = "SuperCuber";
    repo = "dotter";
    rev = "v${version}";
-    hash = "sha256-quMEwg/B4ey6zoxDZO2ce3/s1FX5xxmJfyAlt4YvFqE=";
+    hash = "sha256-mAvTy/11a9RGSQpElhpKMzsMC7vA7cbeHsNRy9MnIjw=";
  };

-  cargoHash = "sha256-D8H95dE+th1mMzlLmd+fqU5VdlxdOSBHKSjvh21JhnE=";
+  cargoHash = "sha256-lVhATGh4pP7xj/L8XmPe5fuUUjwPz6qgCtOzIheOvGk=";

  buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

--- a/pkgs/tools/networking/ooniprobe-cli/default.nix
+++ b/pkgs/tools/networking/ooniprobe-cli/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "ooniprobe-cli";
-  version = "3.18.0";
+  version = "3.18.1";

  src = fetchFromGitHub {
    owner = "ooni";
    repo = "probe-cli";
    rev = "v${version}";
-    hash = "sha256-3KnPqUB9vNxIWF28BGZqqg1IwglHOP2qAZfDMaNcN7s=";
+    hash = "sha256-abCglaMFW6zPc53IU8Bgl/SaoIh1N9i3xDcfOnJypls=";
  };

-  vendorHash = "sha256-iMEmTip9c7ySFUxcKr8ZUuREw7FfBvsIhECvmagvVL0=";
+  vendorHash = "sha256-olirtvnOIKvNXJsanv5UFTcpj7RpPAa5OP0qYTv4wtk=";

  subPackages = [ "cmd/ooniprobe" ];

--- a/pkgs/tools/networking/vegeta/default.nix
+++ b/pkgs/tools/networking/vegeta/default.nix
@ -5,17 +5,17 @@

 buildGoModule rec {
  pname = "vegeta";
-  version = "12.8.4";
+  version = "12.10.0";
  rev = "e04d9c0df8177e8633bff4afe7b39c2f3a9e7dea";

  src = fetchFromGitHub {
    owner = "tsenart";
    repo = "vegeta";
    rev = "v${version}";
-    sha256 = "sha256-FAb7nf6jZju95YEZR1GjPnfbsA5M8NcIKQyc8cgEgWs=";
+    sha256 = "sha256-lBJXMI/OVxgi4AqAFKE6cXLBagUZzUTRzvcJBr0Wh/c=";
  };

-  vendorSha256 = "sha256-v9Hu9eQJSmm4Glt49F7EN40rKjrg4acyll9Bfgey+Mw=";
+  vendorHash = "sha256-QWI2T1yJBATgCyGlR2dPbnBLn9KHQgfc30mPdMKzGsQ=";

  subPackages = [ "." ];

--- a/pkgs/tools/text/markscribe/default.nix
+++ b/pkgs/tools/text/markscribe/default.nix
@ -0,0 +1,28 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "markscribe";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "muesli";
+    repo = "markscribe";
+    rev = "v${version}";
+    hash = "sha256-I8WSG9rMqgf2QADQetlYTSUIQH1Iv8cMVw/3uIwEDPc=";
+  };
+
+  vendorHash = "sha256-leeP2+W+bnYASls3k0l4jpz1rc1mAkMWUfrY2uBUUdQ=";
+
+  ldflags = [ "-s" "-w" ];
+
+  meta = with lib; {
+    description = "Your personal markdown scribe with template-engine and Git(Hub) & RSS powers";
+    homepage = "https://github.com/muesli/markscribe";
+    changelog = "https://github.com/muesli/markscribe/releases/tag/${src.rev}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -260,6 +260,8 @@ with pkgs;

  alterx = callPackage ../tools/security/alterx { };

+  asciicam = callPackage ../applications/video/asciicam { };
+
  asitop = pkgs.python3Packages.callPackage ../os-specific/darwin/asitop { };

  asn = callPackage ../applications/networking/asn { };
@ -33109,6 +33111,8 @@ with pkgs;
    electron = electron_9;
  };

+  markscribe = callPackage ../tools/text/markscribe { };
+
  magnetico = callPackage ../applications/networking/p2p/magnetico { };

  mastodon-bot = nodePackages.mastodon-bot;