diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 1f11eaaa823d..73b71f68db79 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -123,7 +123,11 @@ rec {
          { x = "a"; y = "b"; }
        => { x = "a"; xa = "a"; y = "b"; yb = "b"; }
   */
-  concatMapAttrs = f: flip pipe [ (mapAttrs f) attrValues (foldl' mergeAttrs { }) ];
+  concatMapAttrs = f: v:
+    foldl' mergeAttrs { }
+      (attrValues
+        (mapAttrs f v)
+      );
 
 
   /* Update or set specific paths of an attribute set.
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 14683ec60182..621de6e25a59 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -292,6 +292,7 @@ with lib.maintainers; {
     members = [
       imincik
       sikmir
+      nh2
     ];
     scope = "Maintain geospatial packages.";
     shortName = "Geospatial";
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md
index ef4465d9ddfd..516e903954b3 100644
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@@ -8,6 +8,8 @@
 
 - Create the first release note entry in this section!
 
+- [acme-dns](https://github.com/joohoi/acme-dns), a limited DNS server to handle ACME DNS challenges easily and securely. Available as [services.acme-dns](#opt-services.acme-dns.enable).
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 - [river](https://github.com/riverwm/river), A dynamic tiling wayland compositor. Available as [programs.river](#opt-programs.river.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index fbc10cd3e058..158762170714 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -808,6 +808,7 @@
   ./services/network-filesystems/xtreemfs.nix
   ./services/network-filesystems/yandex-disk.nix
   ./services/networking/3proxy.nix
+  ./services/networking/acme-dns.nix
   ./services/networking/adguardhome.nix
   ./services/networking/alice-lg.nix
   ./services/networking/amuled.nix
diff --git a/nixos/modules/services/networking/acme-dns.nix b/nixos/modules/services/networking/acme-dns.nix
new file mode 100644
index 000000000000..5c53fa2cc4f1
--- /dev/null
+++ b/nixos/modules/services/networking/acme-dns.nix
@@ -0,0 +1,154 @@
+{ lib
+, config
+, pkgs
+, ...
+}:
+
+let
+  cfg = config.services.acme-dns;
+  format = pkgs.formats.toml { };
+  inherit (lib)
+    literalExpression
+    mdDoc
+    mkEnableOption
+    mkOption
+    mkPackageOptionMD
+    types
+    ;
+  domain = "acme-dns.example.com";
+in
+{
+  options.services.acme-dns = {
+    enable = mkEnableOption (mdDoc "acme-dns");
+
+    package = mkPackageOptionMD pkgs "acme-dns" { };
+
+    settings = mkOption {
+      description = mdDoc ''
+        Free-form settings written directly to the `acme-dns.cfg` file.
+        Refer to <https://github.com/joohoi/acme-dns/blob/master/README.md#configuration> for supported values.
+      '';
+
+      default = { };
+
+      type = types.submodule {
+        freeformType = format.type;
+        options = {
+          general = {
+            listen = mkOption {
+              type = types.str;
+              description = mdDoc "IP+port combination to bind and serve the DNS server on.";
+              default = "[::]:53";
+              example = "127.0.0.1:53";
+            };
+
+            protocol = mkOption {
+              type = types.enum [ "both" "both4" "both6" "udp" "udp4" "udp6" "tcp" "tcp4" "tcp6" ];
+              description = mdDoc "Protocols to serve DNS responses on.";
+              default = "both";
+            };
+
+            domain = mkOption {
+              type = types.str;
+              description = mdDoc "Domain name to serve the requests off of.";
+              example = domain;
+            };
+
+            nsname = mkOption {
+              type = types.str;
+              description = mdDoc "Zone name server.";
+              example = domain;
+            };
+
+            nsadmin = mkOption {
+              type = types.str;
+              description = mdDoc "Zone admin email address for `SOA`.";
+              example = "admin.example.com";
+            };
+
+            records = mkOption {
+              type = types.listOf types.str;
+              description = mdDoc "Predefined DNS records served in addition to the `_acme-challenge` TXT records.";
+              example = literalExpression ''
+                [
+                  # replace with your acme-dns server's public IPv4
+                  "${domain}. A 198.51.100.1"
+                  # replace with your acme-dns server's public IPv6
+                  "${domain}. AAAA 2001:db8::1"
+                  # ${domain} should resolve any *.${domain} records
+                  "${domain}. NS ${domain}."
+                ]
+              '';
+            };
+          };
+
+          database = {
+            engine = mkOption {
+              type = types.enum [ "sqlite3" "postgres" ];
+              description = mdDoc "Database engine to use.";
+              default = "sqlite3";
+            };
+            connection = mkOption {
+              type = types.str;
+              description = mdDoc "Database connection string.";
+              example = "postgres://user:password@localhost/acmedns";
+              default = "/var/lib/acme-dns/acme-dns.db";
+            };
+          };
+
+          api = {
+            ip = mkOption {
+              type = types.str;
+              description = mdDoc "IP to bind the HTTP API on.";
+              default = "[::]";
+              example = "127.0.0.1";
+            };
+
+            port = mkOption {
+              type = types.port;
+              description = mdDoc "Listen port for the HTTP API.";
+              default = 8080;
+              # acme-dns expects this value to be a string
+              apply = toString;
+            };
+
+            disable_registration = mkOption {
+              type = types.bool;
+              description = mdDoc "Whether to disable the HTTP registration endpoint.";
+              default = false;
+              example = true;
+            };
+
+            tls = mkOption {
+              type = types.enum [ "letsencrypt" "letsencryptstaging" "cert" "none" ];
+              description = mdDoc "TLS backend to use.";
+              default = "none";
+            };
+          };
+
+
+          logconfig = {
+            loglevel = mkOption {
+              type = types.enum [ "error" "warning" "info" "debug" ];
+              description = mdDoc "Level to log on.";
+              default = "info";
+            };
+          };
+        };
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.packages = [ cfg.package ];
+    systemd.services.acme-dns = {
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = [ "" "${lib.getExe cfg.package} -c ${format.generate "acme-dns.toml" cfg.settings}" ];
+        StateDirectory = "acme-dns";
+        WorkingDirectory = "%S/acme-dns";
+        DynamicUser = true;
+      };
+    };
+  };
+}
diff --git a/nixos/tests/acme-dns.nix b/nixos/tests/acme-dns.nix
new file mode 100644
index 000000000000..92d9498fe714
--- /dev/null
+++ b/nixos/tests/acme-dns.nix
@@ -0,0 +1,50 @@
+import ./make-test-python.nix ({ ... }: {
+  name = "acme-dns";
+
+  nodes.machine = { pkgs, ... }: {
+    services.acme-dns = {
+      enable = true;
+      settings = {
+        general = rec {
+          domain = "acme-dns.home.arpa";
+          nsname = domain;
+          nsadmin = "admin.home.arpa";
+          records = [
+            "${domain}. A 127.0.0.1"
+            "${domain}. AAAA ::1"
+            "${domain}. NS ${domain}."
+          ];
+        };
+        logconfig.loglevel = "debug";
+      };
+    };
+    environment.systemPackages = with pkgs; [ curl bind ];
+  };
+
+  testScript = ''
+    import json
+
+    machine.wait_for_unit("acme-dns.service")
+    machine.wait_for_open_port(53) # dns
+    machine.wait_for_open_port(8080) # http api
+
+    result = machine.succeed("curl --fail -X POST http://localhost:8080/register")
+    print(result)
+
+    registration = json.loads(result)
+
+    machine.succeed(f'dig -t TXT @localhost {registration["fulldomain"]} | grep "SOA" | grep "admin.home.arpa"')
+
+    # acme-dns exspects a TXT value string length of exactly 43 chars
+    txt = "___dummy_validation_token_for_txt_record___"
+
+    machine.succeed(
+      "curl --fail -X POST http://localhost:8080/update "
+      + f' -H "X-Api-User: {registration["username"]}"'
+      + f' -H "X-Api-Key: {registration["password"]}"'
+      + f' -d \'{{"subdomain":"{registration["subdomain"]}", "txt":"{txt}"}}\'''
+    )
+
+    assert txt in machine.succeed(f'dig -t TXT +short @localhost {registration["fulldomain"]}')
+  '';
+})
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index abe281a204b4..04bbf3b876aa 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -95,6 +95,7 @@ in {
   _3proxy = runTest ./3proxy.nix;
   aaaaxy = runTest ./aaaaxy.nix;
   acme = runTest ./acme.nix;
+  acme-dns = handleTest ./acme-dns.nix {};
   adguardhome = runTest ./adguardhome.nix;
   aesmd = runTestOn ["x86_64-linux"] ./aesmd.nix;
   agate = runTest ./web-servers/agate.nix;
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 44de89c3862a..51d165657843 100644
--- 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-05-27";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "LazyVim";
       repo = "LazyVim";
-      rev = "88238e2109e8340fae1424f693149ff2c334ae1c";
-      sha256 = "0vf85wpvyyn7fknjlsggijv5m3a1hqy30aidsk4asf52g88bapjf";
+      rev = "3b4c27e6a66fea8a248523f6ba95b51e4f66702f";
+      sha256 = "009406kz42w3qy9z8hcqy98zh61jpknwr88fyqx2rijjyff9wi76";
     };
     meta.homepage = "https://github.com/LazyVim/LazyVim/";
   };
 
   LeaderF = buildVimPluginFrom2Nix {
     pname = "LeaderF";
-    version = "2023-05-26";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "Yggdroot";
       repo = "LeaderF";
-      rev = "50430a7d67dc7e48498509cb85afdae021796bf3";
-      sha256 = "16dkw5agac2jk6xsk1p7kssql3sv8aa1cb7frygflv2b9v9bg66v";
+      rev = "5746281bb6467522e959f75939976e98da277f1e";
+      sha256 = "0fxaady67l9pj8cyyfb7fxxbx84y3vxp26jy8nvsm1fsx32dw8pi";
     };
     meta.homepage = "https://github.com/Yggdroot/LeaderF/";
   };
@@ -305,12 +305,12 @@ final: prev:
 
   SchemaStore-nvim = buildVimPluginFrom2Nix {
     pname = "SchemaStore.nvim";
-    version = "2023-05-27";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "2af5eb30096600eb0dc6058814f4f3fd88d7bd33";
-      sha256 = "1yz1jnlls98ajrii049xk0dy3hc1h1cv8mxrpab1bgd8r4snkzar";
+      rev = "2d0b27ad28443cb700835b0d6a404ffe7f29c731";
+      sha256 = "083jz49mb8yx0jng5nh8vdf8adc1q9zifs3acy4xcxwakskc0c7a";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
   };
@@ -365,12 +365,12 @@ final: prev:
 
   SpaceVim = buildVimPluginFrom2Nix {
     pname = "SpaceVim";
-    version = "2023-05-21";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "SpaceVim";
       repo = "SpaceVim";
-      rev = "fdd617e2a39f5f1d654cba4329638d730165b952";
-      sha256 = "0b5zn67pwaxcm4qgd3zhsx3l04skgvh6m0yh12b5h30nkmbaqzyi";
+      rev = "d0664365c0c14c6ba45196a679e25f04e10a6093";
+      sha256 = "11jc83v27xd68adzxspcbh4fswmpcyv6sljifzmfp9magqq7mhh5";
     };
     meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
   };
@@ -835,24 +835,24 @@ final: prev:
 
   auto-session = buildVimPluginFrom2Nix {
     pname = "auto-session";
-    version = "2023-05-28";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "rmagatti";
       repo = "auto-session";
-      rev = "b6bac3accc9a753be830aa059f834b787efe2f79";
-      sha256 = "0alryisld981ka3vag8qc9yvh8kfl5i1p1mp99i8i53wkzmg2qhh";
+      rev = "e3234c489397b46a2b7949d6169d61b69a30c015";
+      sha256 = "18c2jyp79rl68x4wfh00aln9zqm14g7vqbk7dnsxzr5vyyr6yssa";
     };
     meta.homepage = "https://github.com/rmagatti/auto-session/";
   };
 
   autoclose-nvim = buildVimPluginFrom2Nix {
     pname = "autoclose.nvim";
-    version = "2023-05-25";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "m4xshen";
       repo = "autoclose.nvim";
-      rev = "fec0b890ea2d2ab9e62c4ab48d097a0382226999";
-      sha256 = "0sgd0km3l1h6zxgdhri8pkgknasdry08w1kpdd0a6jv9is9ri1n7";
+      rev = "2321727fd10a6b34624723bc4747d8c09c10b7a4";
+      sha256 = "0bbf4lfs6li6mdifzlk9y2z4lgksl4xpvk0h1bd2l24x768mmm0k";
     };
     meta.homepage = "https://github.com/m4xshen/autoclose.nvim/";
   };
@@ -1099,12 +1099,12 @@ final: prev:
 
   bufdelete-nvim = buildVimPluginFrom2Nix {
     pname = "bufdelete.nvim";
-    version = "2023-02-16";
+    version = "2023-05-28";
     src = fetchFromGitHub {
       owner = "famiu";
       repo = "bufdelete.nvim";
-      rev = "8933abc09df6c381d47dc271b1ee5d266541448e";
-      sha256 = "1f2kv77273hgjmkwvsrxmpsdj2gpz8y72fz1nxgawd6h9w9ly7kf";
+      rev = "ccfa2589fa68512770639839ab3850097fbbf4dc";
+      sha256 = "1d0dy4i8qnbqwf7xi3hqvjhs40rh0h4mdhij6s45gxm2aj12gad2";
     };
     meta.homepage = "https://github.com/famiu/bufdelete.nvim/";
   };
@@ -1519,12 +1519,12 @@ final: prev:
 
   cmp-git = buildVimPluginFrom2Nix {
     pname = "cmp-git";
-    version = "2023-05-26";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "petertriho";
       repo = "cmp-git";
-      rev = "7b292e120ef0f31586908fddfa2e7626f6dcbf98";
-      sha256 = "16dflgkdpaxw5mxy7x53i668j5p66k0h8gq9z5f61sjc2v8y2gr6";
+      rev = "f900a4cf117300fdc3ba31d26f8b6223ccd9c574";
+      sha256 = "0sgs3ak50y46idzr4jp6iyv8gr52aznplfpmcfdd9ypfcl61ihii";
     };
     meta.homepage = "https://github.com/petertriho/cmp-git/";
   };
@@ -2107,12 +2107,12 @@ final: prev:
 
   compiler-explorer-nvim = buildVimPluginFrom2Nix {
     pname = "compiler-explorer.nvim";
-    version = "2023-05-09";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "krady21";
       repo = "compiler-explorer.nvim";
-      rev = "42979d2da0696da244f1e8f08de0a0ecaeceb718";
-      sha256 = "13n7fw03yyagml8ddvqqpi9gcng7kpz4bb0j9n63g9xfirpxszvj";
+      rev = "ee8e7a2808bdad67cd2acb61b5c9ffa7735c7ec9";
+      sha256 = "14gb8s8j745mzbal8b7r5ziaipi1hwz25f8s66l3634bwkych4r0";
     };
     meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/";
   };
@@ -2239,12 +2239,12 @@ final: prev:
 
   copilot-lua = buildVimPluginFrom2Nix {
     pname = "copilot.lua";
-    version = "2023-05-08";
+    version = "2023-05-28";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      rev = "653bbdc44cd569a5fd0617e5a9d3df2b1359e230";
-      sha256 = "1ym30fl7aw5x5wwr5bz5n4vh1hala66z4cdqk5pisin3270b1npr";
+      rev = "77e3a4907928f0813024e573b882dc879dfc0c6b";
+      sha256 = "0spirmbjbqj2gnjl1843czyai8f5xdk2afwns5gqgvcdqzqd454c";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
   };
@@ -2263,12 +2263,12 @@ final: prev:
 
   coq-artifacts = buildVimPluginFrom2Nix {
     pname = "coq.artifacts";
-    version = "2023-05-28";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq.artifacts";
-      rev = "285ebb67059b3f3bf0106e90b05931ba0c596c6c";
-      sha256 = "08f5hjf3afq0vrvwhjavykji2avvyf0b1apsdad4szvfrb7sfr3p";
+      rev = "843e43aed096f81fec069badd99ec5d54e03a69a";
+      sha256 = "1kcbaxnc5x034q1jfy7zxjrsgfli5aif12q5biacq92khi0nxrym";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
   };
@@ -2299,12 +2299,12 @@ final: prev:
 
   coq_nvim = buildVimPluginFrom2Nix {
     pname = "coq_nvim";
-    version = "2023-05-28";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "c1365375558fb320a90522d5a980393d7b98576d";
-      sha256 = "0vkfgplbwij09lsbbkfzzmw2asca73iqbw6rhafcfid6ryihfpai";
+      rev = "2d1f1e5192c9484320802b61e465d10c9199fbb2";
+      sha256 = "0axn19ly5xcmg773mm1an90ph29ja711jn3jhpzbxvlngfy1zlm0";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
   };
@@ -2551,12 +2551,12 @@ final: prev:
 
   denops-vim = buildVimPluginFrom2Nix {
     pname = "denops.vim";
-    version = "2023-05-22";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "vim-denops";
       repo = "denops.vim";
-      rev = "949a52412d35d56354f69bbbade6bcfe2951b8d6";
-      sha256 = "1cx5i69qjnynyap3iwk226vw2lar256s76sj2i8b28jqv7vz1991";
+      rev = "3b489d50ba2e034c829a09475a4002176bffbef7";
+      sha256 = "19r312fl7gavd3zgi1si1yh0s9pwbh7sz64spqbsqvrlzsjm7zxb";
     };
     meta.homepage = "https://github.com/vim-denops/denops.vim/";
   };
@@ -3179,12 +3179,12 @@ final: prev:
 
   firenvim = buildVimPluginFrom2Nix {
     pname = "firenvim";
-    version = "2023-05-09";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "glacambre";
       repo = "firenvim";
-      rev = "386239e1b1e6e3884db4da8bb7057709bec3dc51";
-      sha256 = "0srvka4bl6nwh66p04zdlb8qr35j1i0gcxakaavjamrs3qqk6b1k";
+      rev = "e2d5a0f97d1f41e03c8d2a3c71ee60b1a4a6bb83";
+      sha256 = "0rsrjqml5dsczkn560a3lcicq9k9szc45j2zmdnz07j25zamp5w7";
     };
     meta.homepage = "https://github.com/glacambre/firenvim/";
   };
@@ -3244,8 +3244,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "liangxianzhe";
       repo = "floating-input.nvim";
-      rev = "940a0135a074cec87f5f9bb00410817dff9a9e40";
-      sha256 = "0klpx5cpf8w1qmbf7lzyjq1qwpyywdi2xvvghjk1bhyz8ww4kc56";
+      rev = "6868f3371bc10e1984d6d8b7241a8f91184bd572";
+      sha256 = "0zhra271njsyksjwrdsrghax1mshixc5awfzg5kasmk611ayk37j";
     };
     meta.homepage = "https://github.com/liangxianzhe/floating-input.nvim/";
   };
@@ -3516,12 +3516,12 @@ final: prev:
 
   git-blame-nvim = buildVimPluginFrom2Nix {
     pname = "git-blame.nvim";
-    version = "2023-05-20";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "f-person";
       repo = "git-blame.nvim";
-      rev = "b8a23393827a0478dbf606f5397c328895bd4f0e";
-      sha256 = "11kh480lx51zymv6i0gyxwrm1h8qdmwfrbq0lz1jkzks3y475amb";
+      rev = "c2c0504451a5a2d8141befea7e4a90d21cc4c5c7";
+      sha256 = "1pyywcycwc4am1142vkqxyh6f7yppn28hphr0415d3jsm2r8ygi6";
     };
     meta.homepage = "https://github.com/f-person/git-blame.nvim/";
   };
@@ -3636,12 +3636,12 @@ final: prev:
 
   go-nvim = buildVimPluginFrom2Nix {
     pname = "go.nvim";
-    version = "2023-05-23";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "go.nvim";
-      rev = "711b3b84cf59d3c43a9d1b02fdf12152b397e7b1";
-      sha256 = "1p6k6rgmakg4cfb3675ajw8jbrhl5xnpkzg74cp4j8qd6c4qnxfy";
+      rev = "9fc0312c1ae08c24ca730c6f7f836965be5c1922";
+      sha256 = "0xna5ab6f17lwcgj3s4nsyvzc82ibfwjxaff2dnpr708md8acv3v";
     };
     meta.homepage = "https://github.com/ray-x/go.nvim/";
   };
@@ -3827,24 +3827,24 @@ final: prev:
 
   harpoon = buildVimPluginFrom2Nix {
     pname = "harpoon";
-    version = "2023-05-17";
+    version = "2023-05-28";
     src = fetchFromGitHub {
       owner = "ThePrimeagen";
       repo = "harpoon";
-      rev = "8cb54c4003045fe1b690de96638d334de9449546";
-      sha256 = "0n1g3dbv5a090hqh0sadqla69dg8c5gh6q6zkjngg781jiw691gx";
+      rev = "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc";
+      sha256 = "03i86ss4n3fayqwsv8d9dxgrs5lq5sc5fgbc2fg1b963r3y6rk68";
     };
     meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
   };
 
   haskell-tools-nvim = buildNeovimPluginFrom2Nix {
     pname = "haskell-tools.nvim";
-    version = "2023-05-27";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "haskell-tools.nvim";
-      rev = "0a427b93f8932794537c2474e826f89021dd1c6b";
-      sha256 = "1wap20ydnk5wk3787bwj0jdc485mk9iz32kvr85cy91k3qwrxwmd";
+      rev = "811d616fdbe2087cd63848dfa7b3bc8785de7dcd";
+      sha256 = "18a4ffg4ciadyax5a8qs79cxsmqn7ay3jq5xv6piwymi40rpl4wb";
     };
     meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
   };
@@ -4114,12 +4114,12 @@ final: prev:
 
   indent-blankline-nvim = buildVimPluginFrom2Nix {
     pname = "indent-blankline.nvim";
-    version = "2023-05-26";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "lukas-reineke";
       repo = "indent-blankline.nvim";
-      rev = "ceaf730b13e332cd76600d9795722413c236c684";
-      sha256 = "0q7hnpz0kdf29d9k0mx86snpwv646my5aicggj3v7caw7s1wydvq";
+      rev = "7075d7861f7a6bbf0de0298c83f8a13195e6ec01";
+      sha256 = "0hcjr1a4vasjvgs8w7hpg0rdfr2aji6n376g062xjynh0302826q";
     };
     meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
   };
@@ -4427,24 +4427,24 @@ final: prev:
 
   lazy-lsp-nvim = buildVimPluginFrom2Nix {
     pname = "lazy-lsp.nvim";
-    version = "2023-05-01";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "dundalek";
       repo = "lazy-lsp.nvim";
-      rev = "9144fa3dafb45fb68e529a3dae14853a57b76d73";
-      sha256 = "0s823mdh657paz6p8ffvrir3gzlqy3kr79bxbc572mb0xw542a3y";
+      rev = "cc9640662efcb99d869eaaec06c14f74d5135e04";
+      sha256 = "0f52bficds6zmk4bl1bq3210zrqjb576fl8a41fb31psj2mas07n";
     };
     meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/";
   };
 
   lazy-nvim = buildVimPluginFrom2Nix {
     pname = "lazy.nvim";
-    version = "2023-05-27";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazy.nvim";
-      rev = "a93d8983c4335b6ae7d6e7d516a191d929186d5b";
-      sha256 = "0r3zmvq6cfaghwr2sdg4rh5sc57f8mmpbjvrvn1jsrf89sjvifli";
+      rev = "e6bf3a0d9c4899dcf832270f79bb1cee8fbc506e";
+      sha256 = "16rry7rppcvamwpiyw7mb67nina1np4jk2vij948qw65nc0fwlnj";
     };
     meta.homepage = "https://github.com/folke/lazy.nvim/";
   };
@@ -5087,12 +5087,12 @@ final: prev:
 
   mason-nvim = buildVimPluginFrom2Nix {
     pname = "mason.nvim";
-    version = "2023-05-18";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason.nvim";
-      rev = "08b2fd308e0107eab9f0b59d570b69089fd0b522";
-      sha256 = "1z0vr1wmyd26xw57szng8n6hrdn25jj5qn5qf22bynplc86b3jdv";
+      rev = "7d7efc738e08fc5bee822857db45cb6103f0b0c1";
+      sha256 = "1m8irg61mzw2pcgc9r6nf0v9ch5pgmwq0n1qx8lclwwzxfbwgzdl";
     };
     meta.homepage = "https://github.com/williamboman/mason.nvim/";
   };
@@ -5111,12 +5111,12 @@ final: prev:
 
   material-nvim = buildVimPluginFrom2Nix {
     pname = "material.nvim";
-    version = "2023-04-25";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "marko-cerovac";
       repo = "material.nvim";
-      rev = "0c725897bc3d22c45fbf25a602002ee02f06f619";
-      sha256 = "1l950bqlpnidk2vpjsys6pgswsch9dza9vhjsi5pndnx3wgry81y";
+      rev = "5180510258ca4645da3c22a2d968138131ff5de8";
+      sha256 = "0v12bal6cjl4y3l60x8jp1wbakki7ixfb2c73hzmxhkwjfralb9x";
     };
     meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
   };
@@ -5171,12 +5171,12 @@ final: prev:
 
   mini-nvim = buildVimPluginFrom2Nix {
     pname = "mini.nvim";
-    version = "2023-05-27";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "09476036cbaa7676172f7dd37a26a51a92388aab";
-      sha256 = "0dq2n6nfxspqhp02gnvpy7l29a3v23kqs0jds04by5llqsbxn2k9";
+      rev = "afa6f0a3dc27b910501651f5fc26ef3b551fd99b";
+      sha256 = "0khp6ij0p8jjdh3nqcll6czyg85027v7f6a5is923vym8lq82v42";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
   };
@@ -5193,18 +5193,6 @@ final: prev:
     meta.homepage = "https://github.com/wfxr/minimap.vim/";
   };
 
-  minsnip-nvim = buildVimPluginFrom2Nix {
-    pname = "minsnip.nvim";
-    version = "2022-01-04";
-    src = fetchFromGitHub {
-      owner = "jose-elias-alvarez";
-      repo = "minsnip.nvim";
-      rev = "6ae2f3247b3a2acde540ccef2e843fdfcdfebcee";
-      sha256 = "1db5az5civ2bnqg7v3g937mn150ys52258c3glpvdvyyasxb4iih";
-    };
-    meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/";
-  };
-
   mkdir-nvim = buildVimPluginFrom2Nix {
     pname = "mkdir.nvim";
     version = "2022-07-23";
@@ -5243,12 +5231,12 @@ final: prev:
 
   monokai-pro-nvim = buildVimPluginFrom2Nix {
     pname = "monokai-pro.nvim";
-    version = "2023-05-27";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "loctvl842";
       repo = "monokai-pro.nvim";
-      rev = "1159576e6e3b709811a65039d4778b53f64a0245";
-      sha256 = "1w9yfq5vqmazagcfy0sv5f7461bmp1p80i4n3v7m2rkg6lldvyk6";
+      rev = "56e52cda4bb7b45d02d533a2aab00d32ff2de7df";
+      sha256 = "080iac140sbddpld9x8lr6vb2qmql24f77k6divizapjka3qxnh9";
     };
     meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/";
   };
@@ -5543,12 +5531,12 @@ final: prev:
 
   neoconf-nvim = buildVimPluginFrom2Nix {
     pname = "neoconf.nvim";
-    version = "2023-05-27";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "279c27f418f35397fe5b913d9d61d529cc038493";
-      sha256 = "0qlvz7n46s94xapapcsyp6r2h7rzyl1wi0b1acr6arhhgl2r3xay";
+      rev = "3ed504868353505fc95577b0981483f8608ebb55";
+      sha256 = "0jqf195kfv8vmmqs683pycmq975lz2xxax6qv9wak1jg2xcr1k86";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
   };
@@ -5567,12 +5555,12 @@ final: prev:
 
   neodev-nvim = buildVimPluginFrom2Nix {
     pname = "neodev.nvim";
-    version = "2023-05-25";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neodev.nvim";
-      rev = "ffa5f73f243954afb96fc19a512a24d7b8b0bb63";
-      sha256 = "0176984ffpsg9vchmb10b7kdl9g5d5qyvmwazmrqmdm393bshklw";
+      rev = "9f894d12d9fd680388acc2fcb4067e4664c1ddc9";
+      sha256 = "06s0bg112cbrlc0ysmcdcvbnrdbs7j13m23f1spv4mxz14m56g2q";
     };
     meta.homepage = "https://github.com/folke/neodev.nvim/";
   };
@@ -5603,12 +5591,12 @@ final: prev:
 
   neogit = buildVimPluginFrom2Nix {
     pname = "neogit";
-    version = "2023-05-27";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "TimUntersberger";
       repo = "neogit";
-      rev = "bcf4b6bb203d89af49ee22b64a06d5571bd3f39c";
-      sha256 = "0gih81a85s0zvpzrjwsr05ncdy0dd5j4zyd4jx5bhnhs4y0p91sk";
+      rev = "80be328067b370744c39323674a2ebaf515dea14";
+      sha256 = "1ryss8k6bixj2ky6nj45lyqmhizq58vykwl2wsz93g5x2f60cix3";
     };
     meta.homepage = "https://github.com/TimUntersberger/neogit/";
   };
@@ -5663,12 +5651,12 @@ final: prev:
 
   neorg = buildVimPluginFrom2Nix {
     pname = "neorg";
-    version = "2023-05-27";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "nvim-neorg";
       repo = "neorg";
-      rev = "360f8d6e8a18718d745c90ad25555d0803e1b168";
-      sha256 = "1d2a9z6drbqavy13ia600yrkrvpaw0h88m7lwys402x7r78nis12";
+      rev = "151c0337684a30ab8a9b31683b7a2fa28b0a15b0";
+      sha256 = "0i1rmnqzz8ckyvp2nixf1i5p6jbx8sqbk97wnwcs38930xmg0ys7";
     };
     meta.homepage = "https://github.com/nvim-neorg/neorg/";
   };
@@ -5723,24 +5711,24 @@ final: prev:
 
   neotest = buildVimPluginFrom2Nix {
     pname = "neotest";
-    version = "2023-05-27";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "nvim-neotest";
       repo = "neotest";
-      rev = "80f9c963019dc72d46574ff0ccb9a428f232afc5";
-      sha256 = "047pcx3fi6by690111xhs71mg6n1habgdk8kdal0il1aw53q5sqj";
+      rev = "10e6763d0794c70917faf45e8d869a1306d5182e";
+      sha256 = "0fw5sj7wm0hi0kbc1szmkj0hd1xf9sx5b9i7ra049w3jcxdgizgl";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest/";
   };
 
   neotest-dart = buildVimPluginFrom2Nix {
     pname = "neotest-dart";
-    version = "2023-04-28";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "sidlatau";
       repo = "neotest-dart";
-      rev = "c7a0aa394deadf63fc0a40b0df94c6e4d4047d19";
-      sha256 = "0axpiam24gljmnz2i41fg03a6x1i8fqgskmf9nskg5l6m1vf5p19";
+      rev = "f404d558c0ef8a463bf2b9882b6116b6b2301030";
+      sha256 = "1ybzva7qk9h58i5l114977lc6dd17w0zjy1dgfiz2rqckryhrmlv";
     };
     meta.homepage = "https://github.com/sidlatau/neotest-dart/";
   };
@@ -5795,12 +5783,12 @@ final: prev:
 
   neotest-haskell = buildVimPluginFrom2Nix {
     pname = "neotest-haskell";
-    version = "2023-05-27";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "257ea2f173c8c83ecf3e4a964a82ff869f4ce9f0";
-      sha256 = "108xzxd16i6mdyp2d1laqrszb2n672xagyz7bn53n2r2a7cjabh1";
+      rev = "f6d811ec24bdafe0c8d96eadbe1f6a53ebcfb10c";
+      sha256 = "1762rdq7hiljqbl8zwgam404h6gh6yd5aw287c38d2nnzfkf9ldb";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
   };
@@ -5867,12 +5855,12 @@ final: prev:
 
   neotest-rspec = buildVimPluginFrom2Nix {
     pname = "neotest-rspec";
-    version = "2023-05-26";
+    version = "2023-05-28";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "neotest-rspec";
-      rev = "e48cfeeeafce4610c6ce253560b75d6f91656f57";
-      sha256 = "0rfifxydkbxqgsqvg8lvklap98csj4ygr324cw2na1di2z48m10v";
+      rev = "45c3a0984e4b73a38bf8829c454f9e90d0da3f13";
+      sha256 = "1s2hw5z020i3f3wcy6k7lg73fbkli8xlyazrm18z4kq7i3s6lk9j";
     };
     meta.homepage = "https://github.com/olimorris/neotest-rspec/";
   };
@@ -6095,12 +6083,12 @@ final: prev:
 
   nlsp-settings-nvim = buildVimPluginFrom2Nix {
     pname = "nlsp-settings.nvim";
-    version = "2023-05-26";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "b896c665381eb63b2a5429eb8c9a7eb51a03ceb8";
-      sha256 = "0lvg0ccl6ai4ss9xfpmgrbapk1j5alsnryd68k6xb59yibf3mfsz";
+      rev = "93dd380e7957d62581d58ec4a9627879b8524b07";
+      sha256 = "1w1wxhchw7wzgbas09j7y1iz3l0ylkzpiklsk4h6q7g49x08mv9c";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
   };
@@ -6143,12 +6131,12 @@ final: prev:
 
   noice-nvim = buildVimPluginFrom2Nix {
     pname = "noice.nvim";
-    version = "2023-05-27";
+    version = "2023-05-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "noice.nvim";
-      rev = "ee24b36743b18e53bdc6b49bbfa426fc18ea337a";
-      sha256 = "000p1x73b2q3cazxj43nzc3q1v2ra9mm70rssyn9aacx5ai6c2ly";
+      rev = "7e358170cea2314d9768b3f63616e8fad186195e";
+      sha256 = "0xfai58pfyki4pr8jn3y5wpa1mas69bdcl9bbrfvrb1ckw0njv0l";
     };
     meta.homepage = "https://github.com/folke/noice.nvim/";
   };
@@ -6203,12 +6191,12 @@ final: prev:
 
   null-ls-nvim = buildVimPluginFrom2Nix {
     pname = "null-ls.nvim";
-    version = "2023-05-17";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "null-ls.nvim";
-      rev = "77e53bc3bac34cc273be8ed9eb9ab78bcf67fa48";
-      sha256 = "1h3nnci4y33ih4isss5sdd1c2fkjvmn58l01fpnmcqmr9rhqhwaq";
+      rev = "c89333e034a8daba654ebfcf9a4ec9f87765f01e";
+      sha256 = "1kpyh1y5p0cazbvcm9cazkc93giqbbngm9zk1pf5qxrl18217cqh";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
   };
@@ -6227,12 +6215,12 @@ final: prev:
 
   nvchad = buildVimPluginFrom2Nix {
     pname = "nvchad";
-    version = "2023-05-23";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "nvchad";
-      rev = "582dff9458ee8ac70149583829b6f8faecdc3aef";
-      sha256 = "1vy4mx7sajbklbharis68b1vkkifc12qj9ns8k8i3xw4hvqzhp73";
+      rev = "9c10201ef383f4c4c9caacd2050f76e8fbb76b1c";
+      sha256 = "0rby0rd8yjd8lj4lwqfmjghvhigh6fisjkk6m91ngyhlcj1lggvc";
     };
     meta.homepage = "https://github.com/nvchad/nvchad/";
   };
@@ -6347,12 +6335,12 @@ final: prev:
 
   nvim-cmp = buildNeovimPluginFrom2Nix {
     pname = "nvim-cmp";
-    version = "2023-05-27";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "nvim-cmp";
-      rev = "1088b3743b83ffd8973ad65e6b5fed010da0ffd2";
-      sha256 = "1jm74hqc2rw9p5fmgi1zfcmink42s6kqfcl812mi4wpbmq0yfb6n";
+      rev = "fc0f694af1a742ada77e5b1c91ff405c746f4a26";
+      sha256 = "1vmsa4vrx7nsrq2kzh8pyjfssfhb9b7xy7qqcyja4g0xp9z9z077";
     };
     meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
   };
@@ -6491,12 +6479,12 @@ final: prev:
 
   nvim-dap-ui = buildVimPluginFrom2Nix {
     pname = "nvim-dap-ui";
-    version = "2023-05-27";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "rcarriga";
       repo = "nvim-dap-ui";
-      rev = "c693e80f8d7b6369f4152e7fdab10db4847c5c71";
-      sha256 = "05vm17b78iiw8g3g59kjjhbvhvp8yavn1n1mdlydazhywkn0wk0j";
+      rev = "c020f660b02772f9f3d11f599fefad3268628a9e";
+      sha256 = "0w64jq8g57g6wacrz1yx9mfjmmd82qfcpia818lfa4594z1amfg3";
     };
     meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
   };
@@ -6551,12 +6539,12 @@ final: prev:
 
   nvim-gdb = buildVimPluginFrom2Nix {
     pname = "nvim-gdb";
-    version = "2023-05-23";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "sakhnik";
       repo = "nvim-gdb";
-      rev = "33de6ce3f12cec921e6c8fd715fcafce6641e037";
-      sha256 = "131545107srlrxs2h62bsdrpw9iv8iyq19y98lfg1b33cf92n0c7";
+      rev = "7c7690beff6a3fa0c1e04298694bd5b367fd333e";
+      sha256 = "0hgc7h56yia9fxsrlipfly59sqqv1zgky09n95i2j30ar75ya661";
     };
     meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
   };
@@ -6683,12 +6671,12 @@ final: prev:
 
   nvim-lint = buildVimPluginFrom2Nix {
     pname = "nvim-lint";
-    version = "2023-05-27";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "00b9feee38586d4521c17a0a6a0e2c94ea75d44a";
-      sha256 = "1cp43n0vnfm15hrgci7ghfnjw67m5k6ll7qcm72vgjiswpi9pp38";
+      rev = "58a4fee3d61a6fb3166163c55fe0b2eb29464f9c";
+      sha256 = "1rh5hhgr3lzq144a7bm2wn25fcdd29y1sanw2y5i82ks159ivdk5";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
   };
@@ -6707,12 +6695,12 @@ final: prev:
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2023-05-27";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "465042c0f786992212284311ebb5da1f89479774";
-      sha256 = "0qw6rxr8rrfbaivrwg05n94xcvbf9kdmizyf8b7bgv16qk2c002w";
+      rev = "9166622781a39a829878d1fd24c174529d996838";
+      sha256 = "1rms9dbiv1cmc8dwmsr3k8xsn8lcgqkiljfld1jx2yyj8l8xc19b";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -6959,12 +6947,12 @@ final: prev:
 
   nvim-surround = buildVimPluginFrom2Nix {
     pname = "nvim-surround";
-    version = "2023-05-22";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "kylechui";
       repo = "nvim-surround";
-      rev = "26b5067c3b56815eafbf41b7b830f1ab52819a45";
-      sha256 = "17r7klq852wq3kwhjlpc6a5k6d6h4bm8rf9ivjxgc7b4whiris5n";
+      rev = "10b20ca7d9da1ac8df8339e140ffef94f9ab3b18";
+      sha256 = "1jag0bdk8jmh6dnrl5051jm3q5lq25lp4yvs9zsq574479czjw5g";
     };
     meta.homepage = "https://github.com/kylechui/nvim-surround/";
   };
@@ -7007,24 +6995,24 @@ final: prev:
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2023-05-27";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "a76db88548bb7fe008cd7e4f2d2ec2ccc080dede";
-      sha256 = "0sipljsb1g2fikr8m91rn1jybdsgmz307icdh559p8xy3999c5ay";
+      rev = "23dfae4db84f71e2ddb56c024845b322035182ee";
+      sha256 = "1pw6hv2rdzd4y6hgm3rim297ar46wvjbbyljx2x77n08gr5c50n8";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
 
   nvim-treesitter-context = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-context";
-    version = "2023-05-24";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-context";
-      rev = "7cd5ac1c384b89e7e607238a936f13963f97ba32";
-      sha256 = "1l1sd5a046v8phq5irlr348x6aq5svv633yjxwz5vzmhcp9wv0wi";
+      rev = "24535437a9b62b9ec503c545f35e2ac298cd29df";
+      sha256 = "00nf9ps4mnmngimy4hrjnyshp7xiyfwa4wj4gnwxa9y1p3ha0q0h";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
   };
@@ -7118,8 +7106,8 @@ final: prev:
     version = "2023-05-28";
     src = fetchgit {
       url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
-      rev = "a87025babc32e2031890c7a22d9e928ec3d2ec85";
-      sha256 = "0hmg117c3szjs1dvrbd4gxmah850a679b8pwv42z9d4352s64zv6";
+      rev = "5becf2cec4b8e06b6df745cf515ac35c6c2e6308";
+      sha256 = "1643fm1k20fx155xfrpkmssbqqq1gpsbvj9nzdlj6h70vp9pbh87";
     };
     meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
   };
@@ -7234,12 +7222,12 @@ final: prev:
 
   octo-nvim = buildVimPluginFrom2Nix {
     pname = "octo.nvim";
-    version = "2023-05-23";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "512876820db1279e6f91530c6ce11187eb141056";
-      sha256 = "1lwfj89b30b44n13si0i1ljcdjlhp889cg2m7pa387cjjac559q3";
+      rev = "95a7f271eff4397e593c90246891c18058bdffc2";
+      sha256 = "1yw8kch7jn04y89jdr8zxrpkcfalmk8mq4kl4m41ylsdk93865mh";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
   };
@@ -7307,12 +7295,12 @@ final: prev:
 
   onedarkpro-nvim = buildVimPluginFrom2Nix {
     pname = "onedarkpro.nvim";
-    version = "2023-05-26";
+    version = "2023-05-28";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "onedarkpro.nvim";
-      rev = "ec07364f3cfa9cc6467bf067a490cfd74011efcd";
-      sha256 = "0jmy9m52xw526pddqqqnvqq8jbk3jkyi0fwfd0bg2wk699jfy1zc";
+      rev = "382c689c08803233da58f1141f713415772d9dc3";
+      sha256 = "082rvkfhkpd9w9kjpixp0a624cy9f3vyyvq5j3pgdnz3b5ddbx1l";
     };
     meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
   };
@@ -7379,24 +7367,24 @@ final: prev:
 
   orgmode = buildVimPluginFrom2Nix {
     pname = "orgmode";
-    version = "2023-05-11";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "nvim-orgmode";
       repo = "orgmode";
-      rev = "f6926dfde7b09928533cdb247406f7f0cb341f93";
-      sha256 = "1qadi16p5hzl35h3ljh93s1dxnc78hq948nx38cz1ilynhd7px3q";
+      rev = "3d6acc695184a964741ef00dfe7c45028585215e";
+      sha256 = "0p5di0zhlb2jm8d7f0lc7zil0gyy9bji55snahqaxk570yc4z1ss";
     };
     meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
   };
 
   other-nvim = buildVimPluginFrom2Nix {
     pname = "other.nvim";
-    version = "2022-11-15";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "rgroli";
       repo = "other.nvim";
-      rev = "9afecea37c9b5ffed65a21de9e585d548de7778a";
-      sha256 = "06rqg69dx3fqfq1jdyqvan33czx2xvp4b4d52gi4p3lxjgqwpzvm";
+      rev = "b87013f5d54920d6db36d605a6433495ea47d6c0";
+      sha256 = "0fr7p0y443x4g7025id4g4gbphaqnc5j9ksaprin2nwrm9dyvgc9";
     };
     meta.homepage = "https://github.com/rgroli/other.nvim/";
   };
@@ -8161,12 +8149,12 @@ final: prev:
 
   sg-nvim = buildVimPluginFrom2Nix {
     pname = "sg.nvim";
-    version = "2023-03-29";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "sourcegraph";
       repo = "sg.nvim";
-      rev = "2748c52e9bef39702941d3171670810e9d2dcace";
-      sha256 = "15nxm9yni6g5l7a16z9yc590q159dw8y48jqnaszgbv9hp7w01sp";
+      rev = "f79128f29ae501a54794fc99858e3e771f20a7ba";
+      sha256 = "1xmj05i4bw2cx9d18mm85ynkn29dkngn5090r71wssvan6dm3fb4";
     };
     meta.homepage = "https://github.com/sourcegraph/sg.nvim/";
   };
@@ -8982,12 +8970,12 @@ final: prev:
 
   telescope-manix = buildNeovimPluginFrom2Nix {
     pname = "telescope-manix";
-    version = "2023-03-12";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "telescope-manix";
-      rev = "a7cfacda4dc8a56383b30d402ab9eedcffc24c49";
-      sha256 = "071fdpxqv0l2zxjy71p0xi8p84jacqfpi9wzv0nm5w5dv8irr304";
+      rev = "86f40f1d562e344851e2d9df853c8f058db33c38";
+      sha256 = "0br5naafzrzrmr4qzdhl6j8557c4m4d6agqzphn9fcd8q6faphk8";
     };
     meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
   };
@@ -9163,12 +9151,12 @@ final: prev:
 
   term-edit-nvim = buildVimPluginFrom2Nix {
     pname = "term-edit.nvim";
-    version = "2023-01-25";
+    version = "2023-05-28";
     src = fetchFromGitHub {
       owner = "chomosuke";
       repo = "term-edit.nvim";
-      rev = "9efbb3298ce63807750a415a091d7d535ff0a7e8";
-      sha256 = "1qb16nnraxg1b9v2hwi8ywzzxgd6p8hxy673d5x561firnfj1zqi";
+      rev = "3c2385d5d058720928a96e77c405466478fb711a";
+      sha256 = "06qkld6i542p0hh2jxk80n5xfrf0jklg4b7vmkm6imvkcj705hdc";
     };
     meta.homepage = "https://github.com/chomosuke/term-edit.nvim/";
   };
@@ -9271,12 +9259,12 @@ final: prev:
 
   tint-nvim = buildVimPluginFrom2Nix {
     pname = "tint.nvim";
-    version = "2023-03-23";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "levouh";
       repo = "tint.nvim";
-      rev = "51e9144fa3cd3f2492a282ccadc8bd3355653f5c";
-      sha256 = "0fzxyph6qj0rcxysvap3awr5xv3hj56z5ma1gm5jp8b4fm72cgrh";
+      rev = "80b15a91087991068d5834419437f652d1d4bc8e";
+      sha256 = "14p909q7xlgapgjafpiwd71bf4f83xcrcikn6mlzlnhwrbmxmcns";
     };
     meta.homepage = "https://github.com/levouh/tint.nvim/";
   };
@@ -9307,12 +9295,12 @@ final: prev:
 
   tmux-nvim = buildVimPluginFrom2Nix {
     pname = "tmux.nvim";
-    version = "2023-05-05";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "aserowy";
       repo = "tmux.nvim";
-      rev = "57220071739c723c3a318e9d529d3e5045f503b8";
-      sha256 = "08liqkw987mh9i4flw9h7n74wrjkdksb1fy0wrdg9v1jk5f3p66f";
+      rev = "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9";
+      sha256 = "0hr8f385mdr9dpf7fzyf4a2swm7pyrwl64pzihqphccsjwijiwj1";
     };
     meta.homepage = "https://github.com/aserowy/tmux.nvim/";
   };
@@ -9368,24 +9356,24 @@ final: prev:
 
   toggleterm-nvim = buildVimPluginFrom2Nix {
     pname = "toggleterm.nvim";
-    version = "2023-05-22";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "toggleterm.nvim";
-      rev = "a44313fb28ed9bc9837c2b99dec1c6eed3a4f47f";
-      sha256 = "08hhwn9inh5llvdx9qb7ics8pz69q16218lfdrllbfam1km5sg4q";
+      rev = "cf146a267a6a7db62b1e2aff40414b20081048a1";
+      sha256 = "12windxwl9icn1g9yh36nw4brsmlb2cx16ay68p0dk16axvnhf22";
     };
     meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
   };
 
   tokyonight-nvim = buildVimPluginFrom2Nix {
     pname = "tokyonight.nvim";
-    version = "2023-05-27";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "tokyonight.nvim";
-      rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
-      sha256 = "1x0cv834fi084rs2ybzr0sr04n5bp5xd3d2ns88jcyvm2j5pw6zy";
+      rev = "161114bd39b990995e08dbf941f6821afbdcd666";
+      sha256 = "1wbgi4zwlsgw13bqbnvgn1f8bilfbgyjqlhw1jpcdrfz3xrymji0";
     };
     meta.homepage = "https://github.com/folke/tokyonight.nvim/";
   };
@@ -9584,12 +9572,12 @@ final: prev:
 
   unison = buildVimPluginFrom2Nix {
     pname = "unison";
-    version = "2023-05-27";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "7c9e968fe28ab9fec614159ca907df8fe69b5c74";
-      sha256 = "03yzmalnz1k7aj8r8s80mkr5x065mmnkgawx544mqqv9i7y0gz1q";
+      rev = "aed4e748fca6a0ab840487afaa02b1f6683a246a";
+      sha256 = "0d9v2s362z8sqgz75ypvy2cczknbcimyw9d0krckgs1mbplbkjy9";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
   };
@@ -10496,12 +10484,12 @@ final: prev:
 
   vim-codefmt = buildVimPluginFrom2Nix {
     pname = "vim-codefmt";
-    version = "2023-03-22";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
-      rev = "db7631c9b9ea72ccc830e9fda0a8284c43f2beed";
-      sha256 = "0jqbj2ggddhw9bgri1ngi2kcv15qispqngbd1vsfxcjn6c90arsz";
+      rev = "09ee74ce6afb9604a430d7425d7f0d67a35f30d7";
+      sha256 = "19bb68rr3f9yxk02gx19kpvqw71xppal0slmfdd3pcdjhi7wcb76";
     };
     meta.homepage = "https://github.com/google/vim-codefmt/";
   };
@@ -11084,12 +11072,12 @@ final: prev:
 
   vim-fetch = buildVimPluginFrom2Nix {
     pname = "vim-fetch";
-    version = "2021-02-12";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "wsdjeg";
       repo = "vim-fetch";
-      rev = "0a6ab17e84c7f4808bf05ec380121bce40b40d21";
-      sha256 = "04srlz3zaiqkv9hz6q3vdkfq02k1wj4p9mg4m8930das4nkl7a05";
+      rev = "bbb75c3172f766d1a62832df0ec7674c69a560ad";
+      sha256 = "1mcn4a7n1318sgi3dd062sh1sy2b8sa4inwklcz2gh095lr9i323";
     };
     meta.homepage = "https://github.com/wsdjeg/vim-fetch/";
   };
@@ -11372,12 +11360,12 @@ final: prev:
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2023-05-18";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "2a874910a242fd4a5da021ea32fb1cde3b69f79b";
-      sha256 = "1n5xs00xd7wkivxb3jfxrspplbs67kqg0lx54p3mclaasjia07ai";
+      rev = "c6cf8b9a67572a5c3bf54b0b4acabb3b9e85e101";
+      sha256 = "11k74xyk05sc9ckyxlkkam9j64rj02sk6sqhqsgmx685jkmgyvzx";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
   };
@@ -11839,6 +11827,18 @@ final: prev:
     meta.homepage = "https://github.com/lepture/vim-jinja/";
   };
 
+  vim-jinja-languages = buildVimPluginFrom2Nix {
+    pname = "vim-jinja-languages";
+    version = "2022-04-04";
+    src = fetchFromGitHub {
+      owner = "seirl";
+      repo = "vim-jinja-languages";
+      rev = "da6689b35691073d9472b1eae0fb01171f6325a5";
+      sha256 = "1y9fwzb6dhzgcvqy0dxkbzbsbpidmjdha1vrb1imaycbk7f3gzny";
+    };
+    meta.homepage = "https://github.com/seirl/vim-jinja-languages/";
+  };
+
   vim-jsbeautify = buildVimPluginFrom2Nix {
     pname = "vim-jsbeautify";
     version = "2020-12-11";
@@ -12275,12 +12275,12 @@ final: prev:
 
   vim-matchup = buildVimPluginFrom2Nix {
     pname = "vim-matchup";
-    version = "2023-05-18";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "andymass";
       repo = "vim-matchup";
-      rev = "b8eca3b588e41e0bb1b3ae200fae88183b91a76d";
-      sha256 = "03vwwszjrirrlnvh2gk95p31ps9ylhz6hms7g4by3rvab90av7p2";
+      rev = "02b906cf772811a6845f2d5caaa81152beb65d6b";
+      sha256 = "1cvi5as7wawzlmsjkjycy6s40460isfz90q4h2pzqzhhijr2ys0n";
     };
     meta.homepage = "https://github.com/andymass/vim-matchup/";
   };
@@ -12345,6 +12345,18 @@ final: prev:
     meta.homepage = "https://github.com/xolox/vim-misc/";
   };
 
+  vim-molokai-delroth = buildVimPluginFrom2Nix {
+    pname = "vim-molokai-delroth";
+    version = "2023-05-30";
+    src = fetchFromGitHub {
+      owner = "delroth";
+      repo = "vim-molokai-delroth";
+      rev = "134cf0f10117376fab713d42c53418ff31c045c6";
+      sha256 = "03diamza3in2w8pffzz4y002n8axgvszkr4gnyj5qa2k428ipzc3";
+    };
+    meta.homepage = "https://github.com/delroth/vim-molokai-delroth/";
+  };
+
   vim-monokai = buildVimPluginFrom2Nix {
     pname = "vim-monokai";
     version = "2022-12-09";
@@ -14532,12 +14544,12 @@ final: prev:
 
   vimspector = buildVimPluginFrom2Nix {
     pname = "vimspector";
-    version = "2023-05-25";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "puremourning";
       repo = "vimspector";
-      rev = "168fa06321c400ca6f4e41d03fc4909d0342b73b";
-      sha256 = "0d1mlibh0jy7ylhc8xqzl6n59lxdzp1nlm8iy2iylyr2wlvig24v";
+      rev = "e405c000dec636686759b88353c594e7944b0ea1";
+      sha256 = "1ab8f1gaf4sma70vvr86bkhyvjwhlsqf5ls1hpq46kdagjydiryx";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -14701,12 +14713,12 @@ final: prev:
 
   wiki-vim = buildVimPluginFrom2Nix {
     pname = "wiki.vim";
-    version = "2023-05-19";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "wiki.vim";
-      rev = "f9769a61bfb70ba0801b79174ed7f2f4d31fdf83";
-      sha256 = "1zrn4kcwz0ng4knxd5qml9vkkrz8808g6k56wan9bw6yrxnjy2rq";
+      rev = "10340eb9779dd9703f0231427276c5651ed29d10";
+      sha256 = "1q30lxzdjys8arf1fpmbxsxhqhwx337gsqpxn24l07zprblwiyr2";
     };
     meta.homepage = "https://github.com/lervag/wiki.vim/";
   };
@@ -14978,12 +14990,12 @@ final: prev:
 
   catppuccin-nvim = buildVimPluginFrom2Nix {
     pname = "catppuccin-nvim";
-    version = "2023-05-24";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "nvim";
-      rev = "1d3eda15703ba70f57e94e6451db55914ff7017f";
-      sha256 = "118mrf7h71a5f8qc1m7715824hgwg9cqslmc8adkkghqcgps3ap2";
+      rev = "c9cc5a997f1dae3f35b4bdd62f35958fee363ab4";
+      sha256 = "1gqdhav8b3p9jm1pmz6lyr24fgzwnp9pq60jn2hj27njljmjp45f";
     };
     meta.homepage = "https://github.com/catppuccin/nvim/";
   };
@@ -15002,12 +15014,12 @@ final: prev:
 
   chad = buildVimPluginFrom2Nix {
     pname = "chad";
-    version = "2023-05-28";
+    version = "2023-05-30";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "2eae4d1bdcfcf257c450a02495eb5d012388508b";
-      sha256 = "0m4z0ncdrgrc7nfsww7gi950ays43h8s6926q571zsdl9wkq34a1";
+      rev = "52adf33cc1e8e6f92f4670561c19ad702180c129";
+      sha256 = "053gim0j9z59i053w8p9cvspnyqny81zc96f4bhhg0ga8nhxargi";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };
@@ -15050,12 +15062,12 @@ final: prev:
 
   lspsaga-nvim-original = buildVimPluginFrom2Nix {
     pname = "lspsaga-nvim-original";
-    version = "2023-05-19";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "lspsaga.nvim";
-      rev = "01b9633aefd010f272d6c7e3d8293c44fcfe7696";
-      sha256 = "1gxfkdiqcjsqykkkq0xmbsif9x6qs22zjx9fv17ac0yky8fg8d0i";
+      rev = "c4e6259dda346babc71970bd00e03e211b44614d";
+      sha256 = "1dfmdcbrslksnaa6416ccdbrbkbzg16f49bsc6w552cwndj7fx6d";
     };
     meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
   };
@@ -15122,12 +15134,12 @@ final: prev:
 
   rose-pine = buildVimPluginFrom2Nix {
     pname = "rose-pine";
-    version = "2023-04-30";
+    version = "2023-05-29";
     src = fetchFromGitHub {
       owner = "rose-pine";
       repo = "neovim";
-      rev = "2eace84d649d76d41dcd44a87a17f64c7c4a586d";
-      sha256 = "0y7649xbny9qvwlcszzi9r69f8af92v3ibbkbmy2vyygzbcr3a73";
+      rev = "15aac8c529bb38ac39fdb22f7be7f37c0e39dd0c";
+      sha256 = "0w60dz8ifgvfk5av1f1ny2g6gchdh4y2q8r3x3nsfg2s2r3wazmp";
     };
     meta.homepage = "https://github.com/rose-pine/neovim/";
   };
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index ca3f3613dd3d..55837e11f54f 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -223,6 +223,17 @@
     };
     meta.homepage = "https://github.com/addcninblue/tree-sitter-cooklang";
   };
+  corn = buildGrammar {
+    language = "corn";
+    version = "0.0.0+rev=6a6b0f4";
+    src = fetchFromGitHub {
+      owner = "jakestanger";
+      repo = "tree-sitter-corn";
+      rev = "6a6b0f4b1d564392c1b6a8ebcc27d94185f72ede";
+      hash = "sha256-7sBdw8AsRvWo8iSALt9slO0HLVoLTPrU7Tt46mMPLoc=";
+    };
+    meta.homepage = "https://github.com/jakestanger/tree-sitter-corn";
+  };
   cpon = buildGrammar {
     language = "cpon";
     version = "0.0.0+rev=f4b3cbc";
@@ -601,12 +612,12 @@
   };
   gleam = buildGrammar {
     language = "gleam";
-    version = "0.0.0+rev=ae79782";
+    version = "0.0.0+rev=2d5d6b0";
     src = fetchFromGitHub {
       owner = "gleam-lang";
       repo = "tree-sitter-gleam";
-      rev = "ae79782c00656945db69641378e688cdb78d52c1";
-      hash = "sha256-8zxNOQnYvCHdkeyQwBGKL8fkRRinB3GUogPuw2X5n4I=";
+      rev = "2d5d6b001ba12bf1c7ac94679d69ac2bed3151dc";
+      hash = "sha256-9NHjBGvWLxenbD4dDBdWOOT7fVDIvyigilyd/SDtQtE=";
     };
     meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
   };
@@ -1244,12 +1255,12 @@
   };
   ocamllex = buildGrammar {
     language = "ocamllex";
-    version = "0.0.0+rev=ac1d595";
+    version = "0.0.0+rev=6211855";
     src = fetchFromGitHub {
       owner = "atom-ocaml";
       repo = "tree-sitter-ocamllex";
-      rev = "ac1d5957e719d49bd6acd27439b79843e4daf8ed";
-      hash = "sha256-XRxAnl+9F6AYPyd6BGNQOo+KjRs2el78ziyo7NeD1IE=";
+      rev = "62118551bd9501b8253598b835cb4bef04b31e3d";
+      hash = "sha256-oHniBpZj325U93vt4lgHPLqLxZj9YyKMwBdVQV59tZ8=";
     };
     generate = true;
     meta.homepage = "https://github.com/atom-ocaml/tree-sitter-ocamllex";
@@ -1311,12 +1322,12 @@
   };
   php = buildGrammar {
     language = "php";
-    version = "0.0.0+rev=ff6a35b";
+    version = "0.0.0+rev=a17c0ca";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-php";
-      rev = "ff6a35badb0fe373575196bd728a8a53e9be70bd";
-      hash = "sha256-mjpomE8jFusmBjXkFFCnliQ2oKhGYK5DRuIO8GPfb+c=";
+      rev = "a17c0caaf133f7bb37b3531dadcfd0879bea23f1";
+      hash = "sha256-gXJYJ5tkhjh6KgdLfaKcg5EkaiZmY4hAe2MkW68z98M=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
   };
@@ -1597,12 +1608,12 @@
   };
   scala = buildGrammar {
     language = "scala";
-    version = "0.0.0+rev=17a19b0";
+    version = "0.0.0+rev=dacd7bd";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-scala";
-      rev = "17a19b0f0505eec059b82e1b2fd8928f5f6f0b02";
-      hash = "sha256-YvFjzxBQQmL0+Lw8olMiomu6sDiqdTTPuiygHwB3Kww=";
+      rev = "dacd7bdbe27ba79fb7f3959d220f97820dc71dcc";
+      hash = "sha256-ceJY9EsLqoOh9xrcKMtwrnC3rmMaLfZFK3uCYKRR+qk=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
   };
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 6ec20ca15db2..9aa3dc18e99e 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -746,6 +746,18 @@ self: super: {
     vimCommandCheck = "MinimapToggle";
   });
 
+  minsnip-nvim = buildVimPluginFrom2Nix {
+    pname = "minsnip.nvim";
+    version = "2022-01-04";
+    src = fetchFromGitHub {
+      owner = "jose-elias-alvarez";
+      repo = "minsnip.nvim";
+      rev = "6ae2f3247b3a2acde540ccef2e843fdfcdfebcee";
+      sha256 = "1db5az5civ2bnqg7v3g937mn150ys52258c3glpvdvyyasxb4iih";
+    };
+    meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/";
+  };
+
   ncm2 = super.ncm2.overrideAttrs (old: {
     dependencies = with self; [ nvim-yarp ];
   });
@@ -900,7 +912,7 @@ self: super: {
         pname = "sg-nvim-rust";
         inherit (old) version src;
 
-        cargoHash = "sha256-gnQNQlW/c1vzyR+HbYn7rpxZ1C6WXFcqpylIOTUMZ6g=";
+        cargoHash = "sha256-9iXKVlhoyyRXCP4Bx9rCHljETdE9UD9PNWqPYDurQnI=";
 
         nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index bd7c802d36b0..47b235c9b421 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -436,7 +436,6 @@ https://github.com/chikamichi/mediawiki.vim/,HEAD,
 https://github.com/savq/melange-nvim/,,
 https://github.com/echasnovski/mini.nvim/,,
 https://github.com/wfxr/minimap.vim/,,
-https://github.com/jose-elias-alvarez/minsnip.nvim/,,
 https://github.com/jghauser/mkdir.nvim/,main,
 https://github.com/SidOfc/mkdx/,,
 https://github.com/tomasr/molokai/,,
@@ -997,6 +996,7 @@ https://github.com/artur-shaik/vim-javacomplete2/,,
 https://github.com/pangloss/vim-javascript/,,
 https://github.com/jelera/vim-javascript-syntax/,,
 https://github.com/lepture/vim-jinja/,,
+https://github.com/seirl/vim-jinja-languages/,HEAD,
 https://github.com/maksimr/vim-jsbeautify/,,
 https://github.com/heavenshell/vim-jsdoc/,,
 https://github.com/elzr/vim-json/,,
@@ -1039,6 +1039,7 @@ https://github.com/samoshkin/vim-mergetool/,,
 https://github.com/idanarye/vim-merginal/,,
 https://github.com/david-a-wheeler/vim-metamath/,,
 https://github.com/xolox/vim-misc/,,
+https://github.com/delroth/vim-molokai-delroth/,HEAD,
 https://github.com/crusoexia/vim-monokai/,,
 https://github.com/phanviet/vim-monokai-pro/,,
 https://github.com/patstockwell/vim-monokai-tasty/,HEAD,
diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix
index 5a3f78011085..63c46def867e 100644
--- a/pkgs/applications/misc/spicetify-cli/default.nix
+++ b/pkgs/applications/misc/spicetify-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "spicetify-cli";
-  version = "2.18.1";
+  version = "2.19.0";
 
   src = fetchFromGitHub {
     owner = "spicetify";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-BZuvuvbFCZ6VaztlZhlUZhJ7vf4W49mVHiORhH8oH2Y=";
+    sha256 = "sha256-ax1e4M+BReVjudcmR1fatMzH/zTNCPG4BWoSNJPQFts=";
   };
 
   vendorHash = "sha256-g0SuXDzYjg0mGzeDuB2tQnVnDmTiL5vw0r9QWSgIs3Q=";
diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix
index d732fdde136a..56f4c43624bf 100644
--- a/pkgs/applications/misc/tellico/default.nix
+++ b/pkgs/applications/misc/tellico/default.nix
@@ -24,14 +24,14 @@
 
 mkDerivation rec {
   pname = "tellico";
-  version = "3.4.6";
+  version = "3.5";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "office";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-aHA4DYuxh4vzXL82HRGMPfqS0DGqq/FLMEuhsr4eLko=";
+    hash = "sha256-uMq/iqPAbjR85wkgqUS1pk2BL/eatNFpyKcagjN5rJ4=";
   };
 
   postPatch = ''
diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix
index f291f465d3fd..63122b80d7b5 100644
--- a/pkgs/applications/networking/dnscontrol/default.nix
+++ b/pkgs/applications/networking/dnscontrol/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dnscontrol";
-  version = "4.0.1";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "StackExchange";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-1JSFhuH/YdWFckFxaky11R8eXl2xzYe5VCk0XGXwCp8=";
+    sha256 = "sha256-v7ED66CQ1DHfsrOXFJDlH80xL/U9ROn7fpGxPOm2WY4=";
   };
 
-  vendorHash = "sha256-oO/EMaVkcc054C6VOPjh6r4UhHifq2rQKtrYSg5frFQ=";
+  vendorHash = "sha256-4tYtqsi8b7jfd3rxr7HY6XXRVROne6mN0hLVkPZdmCs=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
index 4acb9b91eba1..6ae65e980dda 100644
--- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
@@ -48,11 +48,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-boxes";
-  version = "44.1";
+  version = "44.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "OJcGDWlvf6LZEudywnYdvlNDOrXxnr+kvE6Jc4X6ulM=";
+    sha256 = "ndOJwUnQwPpXRW7DY9UaiCVflFVY+530KJTOeO+F34k=";
   };
 
   patches = [
diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix
index 1c244d089c63..eadf77adbee6 100644
--- a/pkgs/desktops/gnome/core/eog/default.nix
+++ b/pkgs/desktops/gnome/core/eog/default.nix
@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation rec {
   pname = "eog";
-  version = "44.1";
+  version = "44.2";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-4slj8jL+WhCR3MGL7CWnMOkbAq9uRmYB76VeUAzXTKs=";
+    sha256 = "sha256-Ro9Tn2tn7kYYgXDyREgMwxHdHv5Hhv4VVL/+JqZccsQ=";
   };
 
   patches = [
diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix
index ac623014e831..2eee6813a0a2 100644
--- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix
@@ -65,11 +65,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-control-center";
-  version = "44.1";
+  version = "44.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-er02UBjihnne9gpezTBJ2w+4XebaSaltrdIfuo2wAuc=";
+    sha256 = "sha256-BiPX0hz+lw0u80QgYjVFpZRbmJLmQfmgEc7Owhr9oQw=";
   };
 
   patches = [
diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix
index 0172b1b83f42..b9a7685435e6 100644
--- a/pkgs/desktops/gnome/core/sushi/default.nix
+++ b/pkgs/desktops/gnome/core/sushi/default.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   pname = "sushi";
-  version = "43.0";
+  version = "44.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "V4SFJhSasceE+5L7yTTDUU/lIqumSdXZ/t7H4bFHUns=";
+    sha256 = "bAAv4K6hkCe6RIta7JTVzXU8l1L5lu4DMVJChzjqQ+k=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/interpreters/erlang/24.nix b/pkgs/development/interpreters/erlang/24.nix
index ae0a29d08208..2cea49fd9409 100644
--- a/pkgs/development/interpreters/erlang/24.nix
+++ b/pkgs/development/interpreters/erlang/24.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "24.3.4.11";
-  sha256 = "sha256-1A73UOCPJnCRCAXTEPc3VTHsDJIWQjlPJXkuwQBV0r4=";
+  version = "24.3.4.12";
+  sha256 = "sha256-XrQvpIHCxXbcaP9cvX1nwl9LumZeVzlgRJwq2Dj0VoY=";
 }
diff --git a/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch b/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch
index acaccb8c8485..23e1de95fdff 100644
--- a/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch
+++ b/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch
@@ -10,10 +10,10 @@ Only if environment variable NIXOS_USERS_PURE is set.
  2 files changed, 45 insertions(+)
 
 diff --git a/src/daemon.c b/src/daemon.c
-index e62e124..87459b2 100644
+index 861430f..aefaf2d 100644
 --- a/src/daemon.c
 +++ b/src/daemon.c
-@@ -931,6 +931,11 @@ daemon_create_user (AccountsAccounts      *accounts,
+@@ -1378,6 +1378,11 @@ daemon_create_user (AccountsAccounts      *accounts,
                      const gchar           *real_name,
                      gint                   account_type)
  {
@@ -22,10 +22,10 @@ index e62e124..87459b2 100644
 +                return;
 +        }
 +
-         Daemon *daemon = (Daemon*)accounts;
+         Daemon *daemon = (Daemon *) accounts;
          CreateUserData *data;
  
-@@ -1138,6 +1143,11 @@ daemon_delete_user (AccountsAccounts      *accounts,
+@@ -1581,6 +1586,11 @@ daemon_delete_user (AccountsAccounts      *accounts,
                      gint64                 uid,
                      gboolean               remove_files)
  {
@@ -34,14 +34,14 @@ index e62e124..87459b2 100644
 +                return;
 +        }
 +
-         Daemon *daemon = (Daemon*)accounts;
+         Daemon *daemon = (Daemon *) accounts;
          DeleteUserData *data;
  
 diff --git a/src/user.c b/src/user.c
-index 0fb1a17..dbdebaf 100644
+index 28170db..df947a1 100644
 --- a/src/user.c
 +++ b/src/user.c
-@@ -904,6 +904,11 @@ user_set_real_name (AccountsUser          *auser,
+@@ -1216,6 +1216,11 @@ user_set_real_name (AccountsUser          *auser,
                      GDBusMethodInvocation *context,
                      const gchar           *real_name)
  {
@@ -50,10 +50,10 @@ index 0fb1a17..dbdebaf 100644
 +                return;
 +        }
 +
-         User *user = (User*)auser;
+         User *user = (User *) auser;
          int uid;
          const gchar *action_id;
-@@ -981,6 +986,11 @@ user_set_user_name (AccountsUser          *auser,
+@@ -1293,6 +1298,11 @@ user_set_user_name (AccountsUser          *auser,
                      GDBusMethodInvocation *context,
                      const gchar           *user_name)
  {
@@ -62,10 +62,10 @@ index 0fb1a17..dbdebaf 100644
 +                return;
 +        }
 +
-         User *user = (User*)auser;
+         User *user = (User *) auser;
+ 
          daemon_local_check_auth (user->daemon,
-                                  user,
-@@ -1263,6 +1273,11 @@ user_set_home_directory (AccountsUser          *auser,
+@@ -1945,6 +1955,11 @@ user_set_home_directory (AccountsUser          *auser,
                           GDBusMethodInvocation *context,
                           const gchar           *home_dir)
  {
@@ -74,10 +74,10 @@ index 0fb1a17..dbdebaf 100644
 +                return;
 +        }
 +
-         User *user = (User*)auser;
+         User *user = (User *) auser;
+ 
          daemon_local_check_auth (user->daemon,
-                                  user,
-@@ -1322,6 +1337,11 @@ user_set_shell (AccountsUser          *auser,
+@@ -2000,6 +2015,11 @@ user_set_shell (AccountsUser          *auser,
                  GDBusMethodInvocation *context,
                  const gchar           *shell)
  {
@@ -86,10 +86,10 @@ index 0fb1a17..dbdebaf 100644
 +                return;
 +        }
 +
-         User *user = (User*)auser;
+         User *user = (User *) auser;
+ 
          daemon_local_check_auth (user->daemon,
-                                  user,
-@@ -1602,6 +1622,11 @@ user_set_locked (AccountsUser          *auser,
+@@ -2249,6 +2269,11 @@ user_set_locked (AccountsUser          *auser,
                   GDBusMethodInvocation *context,
                   gboolean               locked)
  {
@@ -98,10 +98,10 @@ index 0fb1a17..dbdebaf 100644
 +                return;
 +        }
 +
-         User *user = (User*)auser;
+         User *user = (User *) auser;
+ 
          daemon_local_check_auth (user->daemon,
-                                  user,
-@@ -1814,6 +1839,11 @@ user_set_password_mode (AccountsUser          *auser,
+@@ -2457,6 +2482,11 @@ user_set_password_mode (AccountsUser          *auser,
                          GDBusMethodInvocation *context,
                          gint                   mode)
  {
@@ -110,10 +110,10 @@ index 0fb1a17..dbdebaf 100644
 +                return;
 +        }
 +
-         User *user = (User*)auser;
+         User *user = (User *) auser;
          const gchar *action_id;
- 
-@@ -1905,6 +1935,11 @@ user_set_password (AccountsUser          *auser,
+         gint uid;
+@@ -2550,6 +2580,11 @@ user_set_password (AccountsUser          *auser,
                     const gchar           *password,
                     const gchar           *hint)
  {
@@ -122,9 +122,6 @@ index 0fb1a17..dbdebaf 100644
 +                return;
 +        }
 +
-         User *user = (User*)auser;
+         User *user = (User *) auser;
          gchar **data;
- 
--- 
-2.9.3
-
+         const gchar *action_id;
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 584b328d4700..1a5f03f635bc 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "accountsservice";
-  version = "22.08.8";
+  version = "23.13.9";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
-    sha256 = "kJmXp2kZ/n3BOKmgHOpwvWItWpMtvJ+xMBARMCOno5E=";
+    sha256 = "rdpM3q4k+gmS598///nv+nCQvjrCM6Pt/fadWpybkk8=";
   };
 
   patches = [
@@ -46,6 +46,10 @@ stdenv.mkDerivation rec {
     # Do not ignore third-party (e.g Pantheon) extensions not matching FHS path scheme.
     # Fixes https://github.com/NixOS/nixpkgs/issues/72396
     ./drop-prefix-check-extensions.patch
+
+    # Detect DM type from config file.
+    # `readlink display-manager.service` won't return any of the candidates.
+    ./get-dm-type-from-config.patch
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch b/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch
index 4b5222c9552d..d4b7eac1cb31 100644
--- a/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch
+++ b/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch
@@ -1,8 +1,8 @@
 diff --git a/src/extensions.c b/src/extensions.c
-index 038dcb2..830465d 100644
+index 354f476..8d020a6 100644
 --- a/src/extensions.c
 +++ b/src/extensions.c
-@@ -121,16 +121,7 @@ daemon_read_extension_directory (GHashTable  *ifaces,
+@@ -122,15 +122,7 @@ daemon_read_extension_directory (GHashTable  *ifaces,
                          continue;
                  }
  
@@ -10,8 +10,7 @@ index 038dcb2..830465d 100644
 -                const gchar * const prefix = "../../dbus-1/interfaces/";
 -                if (g_str_has_prefix (symlink, prefix) && g_str_equal (symlink + strlen (prefix), name)) {
 -                        daemon_read_extension_file (ifaces, filename);
--                }
--                else {
+-                } else {
 -                        g_warning ("Found accounts service vendor extension symlink %s, but it must be exactly "
 -                                   "equal to '../../dbus-1/interfaces/%s' for forwards-compatibility reasons.",
 -                                   filename, name);
diff --git a/pkgs/development/libraries/accountsservice/fix-paths.patch b/pkgs/development/libraries/accountsservice/fix-paths.patch
index 0ed8e04579f4..d4b48e882e53 100644
--- a/pkgs/development/libraries/accountsservice/fix-paths.patch
+++ b/pkgs/development/libraries/accountsservice/fix-paths.patch
@@ -1,8 +1,8 @@
 diff --git a/src/daemon.c b/src/daemon.c
-index c8b6320..2b74949 100644
+index aa9d050..861430f 100644
 --- a/src/daemon.c
 +++ b/src/daemon.c
-@@ -1102,7 +1102,7 @@ daemon_create_user_authorized_cb (Daemon                *daemon,
+@@ -1319,7 +1319,7 @@ daemon_create_user_authorized_cb (Daemon                *daemon,
  
          sys_log (context, "create user '%s'", cd->user_name);
  
@@ -11,7 +11,7 @@ index c8b6320..2b74949 100644
          argv[1] = "-m";
          argv[2] = "-c";
          argv[3] = cd->real_name;
-@@ -1335,7 +1335,7 @@ daemon_delete_user_authorized_cb (Daemon                *daemon,
+@@ -1552,7 +1552,7 @@ daemon_delete_user_authorized_cb (Daemon                *daemon,
          }
          free (resolved_homedir);
  
@@ -21,10 +21,10 @@ index c8b6320..2b74949 100644
                  argv[1] = "-f";
                  argv[2] = "-r";
 diff --git a/src/user.c b/src/user.c
-index 189b2c5..5358c02 100644
+index 917d427..28170db 100644
 --- a/src/user.c
 +++ b/src/user.c
-@@ -1145,7 +1145,7 @@ user_change_real_name_authorized_cb (Daemon                *daemon,
+@@ -1193,7 +1193,7 @@ user_change_real_name_authorized_cb (Daemon                *daemon,
                          new_gecos = g_strdup (name);
                  }
  
@@ -33,7 +33,7 @@ index 189b2c5..5358c02 100644
                  argv[1] = "-c";
                  argv[2] = new_gecos;
                  argv[3] = "--";
-@@ -1218,7 +1218,7 @@ user_change_user_name_authorized_cb (Daemon                *daemon,
+@@ -1267,7 +1267,7 @@ user_change_user_name_authorized_cb (Daemon                *daemon,
                           accounts_user_get_uid (ACCOUNTS_USER (user)),
                           name);
  
@@ -42,7 +42,25 @@ index 189b2c5..5358c02 100644
                  argv[1] = "-l";
                  argv[2] = name;
                  argv[3] = "--";
-@@ -1627,7 +1627,7 @@ user_change_home_dir_authorized_cb (Daemon                *daemon,
+@@ -1718,7 +1718,7 @@ user_set_password_expiration_policy_authorized_cb (Daemon                *daemon
+                  accounts_user_get_uid (ACCOUNTS_USER (user)));
+ 
+         g_object_freeze_notify (G_OBJECT (user));
+-        argv[0] = "/usr/bin/chage";
++        argv[0] = "@shadow@/bin/chage";
+         argv[1] = "-m";
+         argv[2] = pwd_expiration->min_days_between_changes;
+         argv[3] = "-M";
+@@ -1806,7 +1806,7 @@ user_set_user_expiration_policy_authorized_cb (Daemon                *daemon,
+         } else {
+                 expiration_time = g_strdup ("-1");
+         }
+-        argv[0] = "/usr/bin/chage";
++        argv[0] = "@shadow@/bin/chage";
+         argv[1] = "-E";
+         argv[2] = expiration_time;
+         argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+@@ -1919,7 +1919,7 @@ user_change_home_dir_authorized_cb (Daemon                *daemon,
                           accounts_user_get_uid (ACCOUNTS_USER (user)),
                           home_dir);
  
@@ -51,7 +69,7 @@ index 189b2c5..5358c02 100644
                  argv[1] = "-m";
                  argv[2] = "-d";
                  argv[3] = home_dir;
-@@ -1683,7 +1683,7 @@ user_change_shell_authorized_cb (Daemon                *daemon,
+@@ -1977,7 +1977,7 @@ user_change_shell_authorized_cb (Daemon                *daemon,
                           accounts_user_get_uid (ACCOUNTS_USER (user)),
                           shell);
  
@@ -60,7 +78,7 @@ index 189b2c5..5358c02 100644
                  argv[1] = "-s";
                  argv[2] = shell;
                  argv[3] = "--";
-@@ -1824,7 +1824,7 @@ user_change_icon_file_authorized_cb (Daemon                *daemon,
+@@ -2120,7 +2120,7 @@ user_change_icon_file_authorized_cb (Daemon                *daemon,
                          return;
                  }
  
@@ -69,7 +87,7 @@ index 189b2c5..5358c02 100644
                  argv[1] = filename;
                  argv[2] = NULL;
  
-@@ -1904,7 +1904,7 @@ user_change_locked_authorized_cb (Daemon                *daemon,
+@@ -2201,7 +2201,7 @@ user_change_locked_authorized_cb (Daemon                *daemon,
                           locked ? "locking" : "unlocking",
                           accounts_user_get_user_name (ACCOUNTS_USER (user)),
                           accounts_user_get_uid (ACCOUNTS_USER (user)));
@@ -78,7 +96,7 @@ index 189b2c5..5358c02 100644
                  argv[1] = locked ? "-L" : "-U";
                  argv[2] = "--";
                  argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
-@@ -2026,7 +2026,7 @@ user_change_account_type_authorized_cb (Daemon                *daemon,
+@@ -2328,7 +2328,7 @@ user_change_account_type_authorized_cb (Daemon                *daemon,
  
                  g_free (groups);
  
@@ -87,16 +105,16 @@ index 189b2c5..5358c02 100644
                  argv[1] = "-G";
                  argv[2] = str->str;
                  argv[3] = "--";
-@@ -2093,7 +2093,7 @@ user_change_password_mode_authorized_cb (Daemon                *daemon,
+@@ -2396,7 +2396,7 @@ user_change_password_mode_authorized_cb (Daemon                *daemon,
+ 
                  if (mode == PASSWORD_MODE_SET_AT_LOGIN ||
                      mode == PASSWORD_MODE_NONE) {
- 
 -                        argv[0] = "/usr/bin/passwd";
 +                        argv[0] = "/run/wrappers/bin/passwd";
                          argv[1] = "-d";
                          argv[2] = "--";
                          argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
-@@ -2105,7 +2105,7 @@ user_change_password_mode_authorized_cb (Daemon                *daemon,
+@@ -2408,7 +2408,7 @@ user_change_password_mode_authorized_cb (Daemon                *daemon,
                          }
  
                          if (mode == PASSWORD_MODE_SET_AT_LOGIN) {
@@ -105,21 +123,21 @@ index 189b2c5..5358c02 100644
                                  argv[1] = "-d";
                                  argv[2] = "0";
                                  argv[3] = "--";
-@@ -2126,7 +2126,7 @@ user_change_password_mode_authorized_cb (Daemon                *daemon,
+@@ -2428,7 +2428,7 @@ user_change_password_mode_authorized_cb (Daemon                *daemon,
+                          */
                          accounts_user_set_locked (ACCOUNTS_USER (user), FALSE);
-                 }
-                 else if (accounts_user_get_locked (ACCOUNTS_USER (user))) {
+                 } else if (accounts_user_get_locked (ACCOUNTS_USER (user))) {
 -                        argv[0] = "/usr/sbin/usermod";
 +                        argv[0] = "@shadow@/bin/usermod";
                          argv[1] = "-U";
                          argv[2] = "--";
                          argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
-@@ -2203,7 +2203,7 @@ user_change_password_authorized_cb (Daemon                *daemon,
+@@ -2505,7 +2505,7 @@ user_change_password_authorized_cb (Daemon                *daemon,
  
-         g_object_freeze_notify (G_OBJECT (user));
+         g_autoptr (GError) error = NULL;
+         g_autoptr (GSubprocess) process = NULL;
+-        const char *argv[] = { "/usr/sbin/chpasswd", "-e", NULL };
++        const char *argv[] = { "@shadow@/bin/chpasswd", "-e", NULL };
  
--        argv[0] = "/usr/sbin/usermod";
-+        argv[0] = "@shadow@/bin/usermod";
-         argv[1] = "-p";
-         argv[2] = strings[0];
-         argv[3] = "--";
+         sys_log (context,
+                  "set password and hint of user '%s' (%" G_GUINT64_FORMAT ")",
diff --git a/pkgs/development/libraries/accountsservice/get-dm-type-from-config.patch b/pkgs/development/libraries/accountsservice/get-dm-type-from-config.patch
new file mode 100644
index 000000000000..3d4398ab303a
--- /dev/null
+++ b/pkgs/development/libraries/accountsservice/get-dm-type-from-config.patch
@@ -0,0 +1,15 @@
+diff --git a/src/daemon.c b/src/daemon.c
+index aefaf2d..7c004d0 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -193,9 +193,9 @@ get_current_system_dm_type (void)
+                 basename = g_file_get_basename (file);
+                 g_object_unref (file);
+ 
+-                if (g_strcmp0 (basename, "lightdm.service") == 0)
++                if (g_file_test (PATH_LIGHTDM_CONF, G_FILE_TEST_EXISTS))
+                         return DISPLAY_MANAGER_TYPE_LIGHTDM;
+-                else if (g_strcmp0 (basename, "gdm.service") == 0)
++                else if (g_file_test (PATH_GDM_CUSTOM, G_FILE_TEST_EXISTS))
+                         return DISPLAY_MANAGER_TYPE_GDM;
+         }
diff --git a/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/pkgs/development/libraries/accountsservice/no-create-dirs.patch
index 5d137eb52a11..9fbba4599c9f 100644
--- a/pkgs/development/libraries/accountsservice/no-create-dirs.patch
+++ b/pkgs/development/libraries/accountsservice/no-create-dirs.patch
@@ -2,7 +2,7 @@ diff --git a/meson_post_install.py b/meson_post_install.py
 index d8c3dd1..620f714 100644
 --- a/meson_post_install.py
 +++ b/meson_post_install.py
-@@ -9,9 +9,9 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1])
+@@ -9,9 +9,9 @@
  # FIXME: meson will not track the creation of these directories
  #        https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39
  dst_dirs = [
diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix
index a31777fed9df..1e6098aa637a 100644
--- a/pkgs/development/libraries/tclx/default.nix
+++ b/pkgs/development/libraries/tclx/default.nix
@@ -5,13 +5,13 @@
 
 tcl.mkTclDerivation rec {
   pname = "tclx";
-  version = "8.6.1";
+  version = "8.6.2";
 
   src = fetchFromGitHub {
     owner = "flightaware";
     repo = "tclx";
     rev = "v${version}";
-    hash = "sha256-HdbuU0IR8q/0g2fIs1xtug4oox/D24C8E2VbEJC5B1A=";
+    hash = "sha256-ZYJcaVBM5DQWBFYAcW6fx+ENMWJwHzTOUKYPkLsd6o8=";
   };
 
   # required in order for tclx to properly detect tclx.tcl at runtime
diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix
index a82c444c7c81..20553c482b0b 100644
--- a/pkgs/development/python-modules/gaphas/default.nix
+++ b/pkgs/development/python-modules/gaphas/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "gaphas";
-  version = "3.10.3";
+  version = "3.11.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-I+/DsXppY//KOZgydDR4/Ks5qEsL4hLIiH+GaaFZHpA=";
+    hash = "sha256-TqrrGu+jk6WNXUnXJao71JHEu7Is27UeHAG29/Jpqb8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix
index ca2b8959d58f..66a49625d1a3 100644
--- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix
+++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-monitoring";
-  version = "2.14.2";
+  version = "2.15.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5v2hMJeeLo11mrcNZCe1lISBlIyW9f1KQjcLqWoRlZs=";
+    hash = "sha256-w6BCbs0lpw2lOyqQedcXMSKahJak7a6NN4Xsy7+CjVs=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock
index 69520391f888..019f8a6005bc 100644
--- a/pkgs/development/tools/language-servers/millet/Cargo.lock
+++ b/pkgs/development/tools/language-servers/millet/Cargo.lock
@@ -28,7 +28,7 @@ dependencies = [
 
 [[package]]
 name = "analysis"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "config",
  "diagnostic",
@@ -44,6 +44,7 @@ dependencies = [
  "sml-namespace",
  "sml-statics",
  "sml-statics-types",
+ "sml-symbol-kind",
  "sml-syntax",
  "str-util",
  "text-pos",
@@ -107,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chain-map"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "fast-hash",
  "str-util",
@@ -120,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e
 
 [[package]]
 name = "cm-syntax"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "lex-util",
  "paths",
@@ -139,7 +140,7 @@ dependencies = [
 
 [[package]]
 name = "config"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "fast-hash",
  "serde",
@@ -384,7 +385,7 @@ dependencies = [
 
 [[package]]
 name = "input"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "cm-syntax",
  "config",
@@ -443,7 +444,7 @@ checksum = "1dabfe0d01e15fde0eba33b9de62475c59e681a47ce4ffe0534af2577a3f8524"
 
 [[package]]
 name = "lang-srv"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "analysis",
  "anyhow",
@@ -471,7 +472,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "lex-util"
-version = "0.9.8"
+version = "0.10.0"
 
 [[package]]
 name = "libc"
@@ -546,7 +547,7 @@ dependencies = [
 
 [[package]]
 name = "millet-cli"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "analysis",
  "config",
@@ -561,7 +562,7 @@ dependencies = [
 
 [[package]]
 name = "millet-ls"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "anyhow",
  "env_logger",
@@ -590,7 +591,7 @@ dependencies = [
 
 [[package]]
 name = "mlb-hir"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "fast-hash",
  "paths",
@@ -601,7 +602,7 @@ dependencies = [
 
 [[package]]
 name = "mlb-statics"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "config",
  "diagnostic",
@@ -625,7 +626,7 @@ dependencies = [
 
 [[package]]
 name = "mlb-syntax"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "lex-util",
  "paths",
@@ -697,7 +698,7 @@ dependencies = [
 
 [[package]]
 name = "panic-hook"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "better-panic",
 ]
@@ -891,7 +892,7 @@ dependencies = [
 
 [[package]]
 name = "slash-var-path"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "fast-hash",
  "str-util",
@@ -899,14 +900,14 @@ dependencies = [
 
 [[package]]
 name = "sml-comment"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "sml-syntax",
 ]
 
 [[package]]
 name = "sml-dynamics"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "fast-hash",
  "fmt-util",
@@ -917,7 +918,7 @@ dependencies = [
 
 [[package]]
 name = "sml-dynamics-tests"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "config",
  "sml-dynamics",
@@ -932,7 +933,7 @@ dependencies = [
 
 [[package]]
 name = "sml-file-syntax"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "config",
  "elapsed",
@@ -946,7 +947,7 @@ dependencies = [
 
 [[package]]
 name = "sml-fixity"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "fast-hash",
  "once_cell",
@@ -955,7 +956,7 @@ dependencies = [
 
 [[package]]
 name = "sml-hir"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "la-arena",
  "sml-lab",
@@ -966,7 +967,7 @@ dependencies = [
 
 [[package]]
 name = "sml-hir-lower"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "config",
  "diagnostic",
@@ -980,14 +981,14 @@ dependencies = [
 
 [[package]]
 name = "sml-lab"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "str-util",
 ]
 
 [[package]]
 name = "sml-lex"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "diagnostic",
  "lex-util",
@@ -1001,7 +1002,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#7ae671a607a143fd8529e34019
 
 [[package]]
 name = "sml-naive-fmt"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "fast-hash",
  "sml-comment",
@@ -1010,11 +1011,11 @@ dependencies = [
 
 [[package]]
 name = "sml-namespace"
-version = "0.9.8"
+version = "0.10.0"
 
 [[package]]
 name = "sml-parse"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "diagnostic",
  "event-parse",
@@ -1026,14 +1027,14 @@ dependencies = [
 
 [[package]]
 name = "sml-path"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "str-util",
 ]
 
 [[package]]
 name = "sml-scon"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -1042,7 +1043,7 @@ dependencies = [
 
 [[package]]
 name = "sml-statics"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "chain-map",
  "config",
@@ -1057,13 +1058,14 @@ dependencies = [
  "sml-namespace",
  "sml-path",
  "sml-statics-types",
+ "sml-symbol-kind",
  "str-util",
  "uniq",
 ]
 
 [[package]]
 name = "sml-statics-types"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "chain-map",
  "code-h2-md-map",
@@ -1078,9 +1080,17 @@ dependencies = [
  "str-util",
 ]
 
+[[package]]
+name = "sml-symbol-kind"
+version = "0.10.0"
+dependencies = [
+ "sml-namespace",
+ "sml-statics-types",
+]
+
 [[package]]
 name = "sml-syntax"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "char-name",
  "code-h2-md-map",
@@ -1093,7 +1103,7 @@ dependencies = [
 
 [[package]]
 name = "sml-ty-var-scope"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "fast-hash",
  "sml-hir",
@@ -1161,7 +1171,7 @@ dependencies = [
 
 [[package]]
 name = "tests"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "analysis",
  "cm-syntax",
@@ -1495,7 +1505,7 @@ dependencies = [
 
 [[package]]
 name = "xtask"
-version = "0.9.8"
+version = "0.10.0"
 dependencies = [
  "anyhow",
  "flate2",
diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix
index 931367e2c9ed..662bdd93956d 100644
--- a/pkgs/development/tools/language-servers/millet/default.nix
+++ b/pkgs/development/tools/language-servers/millet/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "millet";
-  version = "0.9.8";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "azdavis";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-04XP5Mw41KRCB1n1iqSxBXXCiVLO8UN05SoaVqMnwjU=";
+    hash = "sha256-QAXvkSGC7IydFXcWdrVf9QlMBlJVFDLNgfXu+P6yWlE=";
   };
 
   cargoLock = {
diff --git a/pkgs/development/tools/loganalyzer/default.nix b/pkgs/development/tools/loganalyzer/default.nix
new file mode 100644
index 000000000000..d8368df1e44c
--- /dev/null
+++ b/pkgs/development/tools/loganalyzer/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, qtbase
+, qtsvg
+, wrapQtAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "loganalyzer";
+  version = "23.5.1";
+
+  src = fetchFromGitHub {
+    owner = "pbek";
+    repo = "loganalyzer";
+    rev = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-k9hOGI/TmiftwhSHQEh3ZVV8kkMSs1yKejqHelFSQJ4=";
+  };
+
+  buildInputs = [
+    qtbase
+    qtsvg
+  ];
+
+  nativeBuildInputs = [
+    wrapQtAppsHook
+  ];
+
+  sourceRoot = "source/src";
+
+  buildPhase = ''
+    runHook preBuild
+
+    qmake LogAnalyzer.pro CONFIG+=release PREFIX=/
+    make
+
+    runHook postBuild
+  '';
+
+  installFlags = [ "INSTALL_ROOT=$(out)" ];
+
+  postInstall = ''
+    ln -s $out/bin/LogAnalyzer $out/bin/loganalyzer
+  '';
+
+  meta = with lib; {
+    description = "Tool that helps you to analyze your log files by reducing the content with patterns you define";
+    homepage = "https://github.com/pbek/loganalyzer";
+    changelog = "https://github.com/pbek/loganalyzer/blob/develop/CHANGELOG.md";
+    downloadPage = "https://github.com/pbek/loganalyzer/releases/tag/v${version}";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ pbek ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/misc/typical/default.nix b/pkgs/development/tools/misc/typical/default.nix
new file mode 100644
index 000000000000..403d5c9d0eb1
--- /dev/null
+++ b/pkgs/development/tools/misc/typical/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, installShellFiles
+, stdenv
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "typical";
+  version = "0.9.4";
+
+  src = fetchFromGitHub {
+    owner = "stepchowfun";
+    repo = "typical";
+    rev = "v${version}";
+    hash = "sha256-MkMcJY0J3wvJE01VpphS84zNWv62hbed5ZypvLzrnpo=";
+  };
+
+  cargoHash = "sha256-msRfZYvDnb/WeKZhCIabUB2k/AzSYVU1OYdwZNbANbM=";
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  preCheck = ''
+    export NO_COLOR=true
+  '';
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd typical \
+      --bash <($out/bin/typical shell-completion bash) \
+      --fish <($out/bin/typical shell-completion fish) \
+      --zsh <($out/bin/typical shell-completion zsh)
+  '';
+
+  meta = with lib; {
+    description = "Data interchange with algebraic data types";
+    homepage = "https://github.com/stepchowfun/typical";
+    changelog = "https://github.com/stepchowfun/typical/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 0afaff264947..e1a739e999e0 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -3,35 +3,17 @@
 , zed, logs, lwt, react, lwt_react
 }:
 
-let
-  switch =
-    if lib.versionAtLeast ocaml.version "4.08"
-    then
-      {
-        version = "2.10.0";
-        sha256 = "sha256-R10WovnqYcYCrDJnPuIQx2zHaPchSYfXDAaVMsJ4LQA=";
-        duneVersion = "3";
-        propagatedBuildInputs = [ findlib lambda-term zed logs ];
-      }
-    else
-      {
-        version = "2.9.2";
-        sha256 = "sha256-kvFBCe69TRQIWvZV47SH7ISus9k8afGRw5WLKzKqw08=";
-        duneVersion = "2";
-        propagatedBuildInputs = [ lambda-term ];
-      };
-in
-
 buildDunePackage rec {
   pname = "utop";
 
-  inherit (switch) version duneVersion propagatedBuildInputs;
+  version = "2.12.1";
+  propagatedBuildInputs = [ findlib lambda-term zed logs ];
 
-  minimalOCamlVersion = "4.03";
+  minimalOCamlVersion = "4.08";
 
   src = fetchurl {
     url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz";
-    sha256 = switch.sha256;
+    sha256 = "sha256-Z6S3pUE4RY5Q7keRUVSQuzkikewWgM+sRLgcR+8bIlM=";
   };
 
   nativeBuildInputs = [ makeWrapper cppo ];
diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix
index 6270f8f6b668..d70c2bb9c603 100644
--- a/pkgs/development/tools/okteto/default.nix
+++ b/pkgs/development/tools/okteto/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "okteto";
-  version = "2.15.4";
+  version = "2.16.2";
 
   src = fetchFromGitHub {
     owner = "okteto";
     repo = "okteto";
     rev = version;
-    hash = "sha256-sTlbub315MePIUjXKrdBUTplcOk10yIz0N8RejOf2FQ=";
+    hash = "sha256-ehalSPD9yEWL9mm5qjUXWlPIbdEO8StLL2mOZPnB5do=";
   };
 
-  vendorHash = "sha256-dZ6gzW5R5na5qcHFQqQvKfYb0Bu0kVvVMOaRdtTgkhE=";
+  vendorHash = "sha256-bEAUkTl5O5i2R4oglOWSgWG7OKzOrZo5YDe5TzNlZ3E=";
 
   postPatch = ''
     # Disable some tests that need file system & network access.
diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix
index 12e4f5cac966..40438d333cf9 100644
--- a/pkgs/misc/cups/drivers/canon/default.nix
+++ b/pkgs/misc/cups/drivers/canon/default.nix
@@ -16,35 +16,32 @@
 , coreutils
 , atk
 , pkg-config
-, gnome2
 , libxml2
 , runtimeShell
-, proot
+, libredirect
 , ghostscript
 , pkgs
-, pkgsi686Linux
 , zlib
 }:
 
 let
-  i686_NIX_GCC = pkgsi686Linux.callPackage ({ gcc }: gcc) { };
-  ld32 =
-    if stdenv.hostPlatform.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
-    else if stdenv.hostPlatform.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
-    else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.hostPlatform.system}";
+  system =
+    if stdenv.targetPlatform.system == "x86_64-linux" then "intel"
+    else if stdenv.targetPlatform.system == "aarch64-linux" then "arm"
+    else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.targetPlatform.system}";
   ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
   libs = pkgs: lib.makeLibraryPath buildInputs;
 
-  version = "5.40";
-  dl = "6/0100009236/10";
+  version = "5.70";
+  dl = "8/0100007658/33";
 
   versionNoDots = builtins.replaceStrings [ "." ] [ "" ] version;
   src_canon = fetchurl {
-    url = "http://gdlp01.c-wss.com/gds/${dl}/linux-UFRII-drv-v${versionNoDots}-usen-20.tar.gz";
-    sha256 = "sha256:069z6ijmql62mcdyxnzc9mf0dxa6z1107cd0ab4i1adk8kr3d75k";
+    url = "http://gdlp01.c-wss.com/gds/${dl}/linux-UFRII-drv-v${versionNoDots}-m17n-11.tar.gz";
+    hash = "sha256-d5VHlPpUPAr3RWVdQRdn42YLuVekOw1IaMFLVt1Iu7o=";
   };
 
-  buildInputs = [ cups zlib jbigkit glib gtk3 gnome2.libglade libxml2 gdk-pixbuf pango cairo atk ];
+  buildInputs = [ cups zlib jbigkit glib gtk3 libxml2 gdk-pixbuf pango cairo atk ];
 in
 stdenv.mkDerivation rec {
   pname = "canon-cups-ufr2";
@@ -54,10 +51,11 @@ stdenv.mkDerivation rec {
   postUnpack = ''
     (
       cd $sourceRoot
-      tar -xzf Sources/cnrdrvcups-lb-${version}-1.tar.gz
+      tar -xf Sources/cnrdrvcups-lb-${version}-1.11.tar.xz
       sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh
       sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh
       sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh
+      sed -ie "s@/usr@$out@" cnrdrvcups-common-${version}/{{backend,rasterfilter}/Makefile.am,rasterfilter/cnrasterproc.h}
       sed -ie "s@etc/cngplp@$out/etc/cngplp@" cnrdrvcups-common-${version}/cngplp/Makefile.am
       sed -ie "s@usr/share/cngplp@$out/usr/share/cngplp@" cnrdrvcups-common-${version}/cngplp/src/Makefile.am
       patchShebangs cnrdrvcups-common-${version}
@@ -67,6 +65,7 @@ stdenv.mkDerivation rec {
       sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-lb-${version}/allgen.sh
       sed -ie '/^cd \.\.\/cngplp/,/^cd files/{/^cd files/!{d}}' cnrdrvcups-lb-${version}/allgen.sh
       sed -ie "s@cd \.\./pdftocpca@cd pdftocpca@" cnrdrvcups-lb-${version}/allgen.sh
+      sed -ie "s@/usr@$out@" cnrdrvcups-lb-${version}/pdftocpca/Makefile.am
       sed -i "/CNGPLPDIR/d" cnrdrvcups-lb-${version}/Makefile
       patchShebangs cnrdrvcups-lb-${version}
     )
@@ -86,8 +85,8 @@ stdenv.mkDerivation rec {
     )
     (
       cd cnrdrvcups-common-${version}/Rule
-      mkdir -p $out/share/usb
-      install -m 644 *.usb-quirks $out/share/usb
+      mkdir -p $out/share/cups/usb
+      install -m 644 *.usb-quirks $out/share/cups/usb
     )
     (
       cd cnrdrvcups-lb-${version}
@@ -97,73 +96,56 @@ stdenv.mkDerivation rec {
       mkdir -p $out/share/cups/model
       install -m 644 ppd/*.ppd $out/share/cups/model/
     )
+
     (
       cd lib
-      mkdir -p $out/lib32
-      install -m 755 libs32/intel/libColorGearCufr2.so.2.0.0 $out/lib32
-      install -m 755 libs32/intel/libcaepcmufr2.so.1.0 $out/lib32
-      install -m 755 libs32/intel/libcaiocnpkbidir.so.1.0.0 $out/lib32
-      install -m 755 libs32/intel/libcaiousb.so.1.0.0 $out/lib32
-      install -m 755 libs32/intel/libcaiowrapufr2.so.1.0.0 $out/lib32
-      install -m 755 libs32/intel/libcanon_slimufr2.so.1.0.0 $out/lib32
-      install -m 755 libs32/intel/libcanonufr2r.so.1.0.0 $out/lib32
-      install -m 755 libs32/intel/libcnaccm.so.1.0 $out/lib32
-      install -m 755 libs32/intel/libcnlbcmr.so.1.0 $out/lib32
-      install -m 755 libs32/intel/libcnncapcmr.so.1.0 $out/lib32
-      install -m 755 libs32/intel/libufr2filterr.so.1.0.0 $out/lib32
-
       mkdir -p $out/lib
-      install -m 755 libs64/intel/libColorGearCufr2.so.2.0.0 $out/lib
-      install -m 755 libs64/intel/libcaepcmufr2.so.1.0 $out/lib
-      install -m 755 libs64/intel/libcaiocnpkbidir.so.1.0.0 $out/lib
-      install -m 755 libs64/intel/libcaiousb.so.1.0.0 $out/lib
-      install -m 755 libs64/intel/libcaiowrapufr2.so.1.0.0 $out/lib
-      install -m 755 libs64/intel/libcanon_slimufr2.so.1.0.0 $out/lib
-      install -m 755 libs64/intel/libcanonufr2r.so.1.0.0 $out/lib
-      install -m 755 libs64/intel/libcnaccm.so.1.0 $out/lib
-      install -m 755 libs64/intel/libcnlbcmr.so.1.0 $out/lib
-      install -m 755 libs64/intel/libcnncapcmr.so.1.0 $out/lib
-      install -m 755 libs64/intel/libufr2filterr.so.1.0.0 $out/lib
+      install -m 755 libs64/${system}/libColorGearCufr2.so.2.0.0 $out/lib
+      install -m 755 libs64/${system}/libcaepcmufr2.so.1.0 $out/lib
+      install -m 755 libs64/${system}/libcaiocnpkbidir.so.1.0.0 $out/lib
+      install -m 755 libs64/${system}/libcaiousb.so.1.0.0 $out/lib
+      install -m 755 libs64/${system}/libcaiowrapufr2.so.1.0.0 $out/lib
+      install -m 755 libs64/${system}/libcanon_slimufr2.so.1.0.0 $out/lib
+      install -m 755 libs64/${system}/libcanonufr2r.so.1.0.0 $out/lib
+      install -m 755 libs64/${system}/libcnaccm.so.1.0 $out/lib
+      install -m 755 libs64/${system}/libcnlbcmr.so.1.0 $out/lib
+      install -m 755 libs64/${system}/libcnncapcmr.so.1.0 $out/lib
+      install -m 755 libs64/${system}/libufr2filterr.so.1.0.0 $out/lib
 
-      install -m 755 libs64/intel/cnpdfdrv $out/bin
-      install -m 755 libs64/intel/cnpkbidir $out/bin
-      install -m 755 libs64/intel/cnpkmoduleufr2r $out/bin
-      install -m 755 libs64/intel/cnrsdrvufr2 $out/bin
-      install -m 755 libs64/intel/cnsetuputil2 $out/bin/cnsetuputil2
+      install -m 755 libs64/${system}/cnpdfdrv $out/bin
+      install -m 755 libs64/${system}/cnpkbidir $out/bin
+      install -m 755 libs64/${system}/cnpkmoduleufr2r $out/bin
+      install -m 755 libs64/${system}/cnrsdrvufr2 $out/bin
+      install -m 755 libs64/${system}/cnsetuputil2 $out/bin/cnsetuputil2
 
       mkdir -p $out/share/cnpkbidir
-      install -m 644 libs64/intel/cnpkbidir_info* $out/share/cnpkbidir
+      install -m 644 libs64/${system}/cnpkbidir_info* $out/share/cnpkbidir
 
       mkdir -p $out/share/ufr2filter
-      install -m 644 libs64/intel/ThLB* $out/share/ufr2filter
-    )
-
-    (
-      cd $out/lib32
-      ln -sf libcaepcmufr2.so.1.0 libcaepcmufr2.so
-      ln -sf libcaepcmufr2.so.1.0 libcaepcmufr2.so.1
-      ln -sf libcaiowrapufr2.so.1.0.0 libcaiowrapufr2.so
-      ln -sf libcaiowrapufr2.so.1.0.0 libcaiowrapufr2.so.1
-      ln -sf libcanon_slimufr2.so.1.0.0 libcanon_slimufr2.so
-      ln -sf libcanon_slimufr2.so.1.0.0 libcanon_slimufr2.so.1
-      ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so
-      ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so.1
-
-      patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${pkgsi686Linux.stdenv.cc.libc}/lib:${pkgsi686Linux.libxml2.out}/lib:$out/lib32" libcanonufr2r.so.1.0.0
-      patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${pkgsi686Linux.stdenv.cc.libc}/lib" libcaepcmufr2.so.1.0
-      patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${pkgsi686Linux.stdenv.cc.libc}/lib" libColorGearCufr2.so.2.0.0
+      install -m 644 libs64/${system}/ThLB* $out/share/ufr2filter
     )
 
     (
       cd $out/lib
+
+      ln -sf libColorGearCufr2.so.2.0.0 libColorGearCufr2.so
+      ln -sf libColorGearCufr2.so.2.0.0 libColorGearCufr2.so.2
       ln -sf libcaepcmufr2.so.1.0 libcaepcmufr2.so
       ln -sf libcaepcmufr2.so.1.0 libcaepcmufr2.so.1
+      ln -sf libcaiocnpkbidir.so.1.0.0 libcaiocnpkbidir.so
+      ln -sf libcaiocnpkbidir.so.1.0.0 libcaiocnpkbidir.so.1
       ln -sf libcaiowrapufr2.so.1.0.0 libcaiowrapufr2.so
       ln -sf libcaiowrapufr2.so.1.0.0 libcaiowrapufr2.so.1
       ln -sf libcanon_slimufr2.so.1.0.0 libcanon_slimufr2.so
       ln -sf libcanon_slimufr2.so.1.0.0 libcanon_slimufr2.so.1
+      ln -sf libcanonufr2r.so.1.0.0 libcanonufr2r.so
+      ln -sf libcanonufr2r.so.1.0.0 libcanonufr2r.so.1
+      ln -sf libcnlbcmr.so.1.0 libcnlbcmr.so
+      ln -sf libcnlbcmr.so.1.0 libcnlbcmr.so.1
       ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so
       ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so.1
+      ln -sf libuictlufr2r.so.1.0.0 libuictlufr2r.so
+      ln -sf libuictlufr2r.so.1.0.0 libuictlufr2r.so.1
 
       patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" libcanonufr2r.so.1.0.0
       patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" libcaepcmufr2.so.1.0
@@ -172,15 +154,17 @@ stdenv.mkDerivation rec {
 
     (
       cd $out/bin
-      patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2
-      patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" cnpdfdrv
-      patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir
-      patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnrsdrvufr2
+      patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2 cnpdfdrv
+      patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir cnrsdrvufr2 cnpkmoduleufr2r cnjbigufr2
 
-      mv cnsetuputil2 cnsetuputil2.wrapped
-      echo "#!${runtimeShell} -e" > cnsetuputil2
-      echo "exec ${proot}/bin/proot -b $out/usr/share/cnsetuputil2:/usr/share/cnsetuputil2 -b ${coreutils}/bin/ls:/bin/ls -b ${cups}/share:/usr/share/cups $out/bin/cnsetuputil2.wrapped" > cnsetuputil2
-      chmod +x cnsetuputil2
+      wrapProgram $out/bin/cnrsdrvufr2 \
+        --prefix LD_LIBRARY_PATH ":" "$out/lib" \
+        --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+        --set NIX_REDIRECTS /usr/bin/cnpkmoduleufr2r=$out/bin/cnpkmoduleufr2r:/usr/bin/cnjbigufr2=$out/bin/cnjbigufr2
+
+      wrapProgram $out/bin/cnsetuputil2 \
+        --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+        --set NIX_REDIRECTS /usr/share/cnsetuputil2=$out/usr/share/cnsetuputil2
     )
 
     (
@@ -210,8 +194,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.canon.com/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
-    maintainers = with maintainers; [
-      # please consider maintaining if you are updating this package
-    ];
+    maintainers = with maintainers; [ lluchs ];
   };
 }
diff --git a/pkgs/servers/dns/acme-dns/default.nix b/pkgs/servers/dns/acme-dns/default.nix
new file mode 100644
index 000000000000..08cd511f1827
--- /dev/null
+++ b/pkgs/servers/dns/acme-dns/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, nixosTests
+}:
+
+buildGoModule rec {
+  pname = "acme-dns";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "joohoi";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-qQwvhouqzkChWeu65epgoeMNqZyAD18T+xqEMgdMbhA=";
+  };
+
+  vendorHash = "sha256-q/P+cH2OihvPxPj2XWeLsTBHzQQABp0zjnof+Ys/qKo=";
+
+  postInstall = ''
+    install -D -m0444 -t $out/lib/systemd/system ./acme-dns.service
+    substituteInPlace $out/lib/systemd/system/acme-dns.service --replace "/usr/local/bin/acme-dns" "$out/bin/acme-dns"
+  '';
+
+  passthru.tests = { inherit (nixosTests) acme-dns; };
+
+  meta = {
+    description = "Limited DNS server to handle ACME DNS challenges easily and securely";
+    homepage = "https://github.com/joohoi/acme-dns";
+    changelog = "https://github.com/joohoi/acme-dns/releases/tag/${src.rev}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ emilylange ];
+  };
+}
diff --git a/pkgs/servers/memos/default.nix b/pkgs/servers/memos/default.nix
index 6cdc3b72c326..1c2a17fd638c 100644
--- a/pkgs/servers/memos/default.nix
+++ b/pkgs/servers/memos/default.nix
@@ -1,12 +1,12 @@
 { fetchFromGitHub, buildGoModule, jq, buildNpmPackage, lib, makeWrapper }:
 
 let
-  version = "0.13.0";
+  version = "0.13.1";
   src = fetchFromGitHub {
     owner = "usememos";
     repo = "memos";
     rev = "v${version}";
-    sha256 = "7rMs1jFyGlCfc7LVZvsQ9tuBLsWP/S9DXYcEPZ86tKw=";
+    sha256 = "VUY81ir7cPtuHodJhkSz3bmnoIeQH20kbg+duDcjfwM=";
   };
 
   frontend = buildNpmPackage {
@@ -15,7 +15,7 @@ let
 
     src = "${src}/web";
 
-    npmDepsHash = "sha256-vgO5HWbV/oR1GenK9q5a1bhlTSJqtF4HBcQTZ3DqZq8=";
+    npmDepsHash = "sha256-36UcHE98dsGvYQWLIc/xgP8Q0IyJ7la0Qoo3lZqUcmw=";
 
     postPatch = ''
       cp ${./package-lock.json} package-lock.json
diff --git a/pkgs/servers/memos/package-lock.json b/pkgs/servers/memos/package-lock.json
index a42aee0dca65..c6c8d9149abd 100644
--- a/pkgs/servers/memos/package-lock.json
+++ b/pkgs/servers/memos/package-lock.json
@@ -33,7 +33,6 @@
         "zustand": "^4.3.6"
       },
       "devDependencies": {
-        "@playwright/test": "^1.32.2",
         "@types/lodash-es": "^4.17.5",
         "@types/node": "^18.0.3",
         "@types/qs": "^6.9.7",
@@ -1099,25 +1098,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@playwright/test": {
-      "version": "1.32.3",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.32.3.tgz",
-      "integrity": "sha512-BvWNvK0RfBriindxhLVabi8BRe3X0J9EVjKlcmhxjg4giWBD/xleLcg2dz7Tx0agu28rczjNIPQWznwzDwVsZQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "playwright-core": "1.32.3"
-      },
-      "bin": {
-        "playwright": "cli.js"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "optionalDependencies": {
-        "fsevents": "2.3.2"
-      }
-    },
     "node_modules/@popperjs/core": {
       "version": "2.11.7",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz",
@@ -4564,18 +4544,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/playwright-core": {
-      "version": "1.32.3",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.32.3.tgz",
-      "integrity": "sha512-SB+cdrnu74ZIn5Ogh/8278ngEh9NEEV0vR4sJFmK04h2iZpybfbqBY0bX6+BLYWVdV12JLLI+JEFtSnYgR+mWg==",
-      "dev": true,
-      "bin": {
-        "playwright": "cli.js"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/postcss": {
       "version": "8.4.22",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.22.tgz",
diff --git a/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/pkgs/servers/monitoring/prometheus/exportarr/default.nix
index bcfd2ebee475..49dc399346e4 100644
--- a/pkgs/servers/monitoring/prometheus/exportarr/default.nix
+++ b/pkgs/servers/monitoring/prometheus/exportarr/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "exportarr";
-  version = "1.3.2";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "onedr0p";
     repo = "exportarr";
     rev = "v${version}";
-    hash = "sha256-99ap7B5EfMhuSGmT/JNI+CTPv7lTdjxibC0ndYWyNoA=";
+    hash = "sha256-7ev6twbavAhSZWJZCwjpbEz2STRYifLrPCFyel+Ml5A=";
   };
 
-  vendorHash = "sha256-2Eb8FhbRu5M5u8HGa2bgAvZZkwHycBu8UiNKHG5/fFw=";
+  vendorHash = "sha256-3JObDCeRjhws6U4DRky7BVEleCmxadLmPnTp8PX6S7A=";
 
   subPackages = [ "cmd/exportarr" ];
 
diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix
index 0eb19679bdc4..b27aa9f59333 100644
--- a/pkgs/tools/admin/copilot-cli/default.nix
+++ b/pkgs/tools/admin/copilot-cli/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "copilot-cli";
-  version = "1.27.0";
+  version = "1.28.0";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Py45QkivjwVNQqKX5/j4YUO+gpVYfXI7elD9YSlrmak=";
+    sha256 = "sha256-KrgPHdYR0kYwyNhO2EwIO00Xnjy0MmrzHb5LDmbrgB0=";
   };
 
-  vendorHash = "sha256-ali7zvLLLB5kQCU9r2o/dO0g5CQxv/kVVz3iJ56fqYY=";
+  vendorHash = "sha256-1YOx7tqPJwCZlJSAG9o+STKRAIR72dptvTOpa9rRt3A=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix
index f7a5193100d7..728f16a6351c 100644
--- a/pkgs/tools/admin/lego/default.nix
+++ b/pkgs/tools/admin/lego/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "lego";
-  version = "4.11.0";
+  version = "4.12.0";
 
   src = fetchFromGitHub {
     owner = "go-acme";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-RotsWr/wUPAAzW9PrUH3DGx2J5beyD+s/PpAUH12gNI=";
+    sha256 = "sha256-uWs8P3oQS6DFuLmuj+Med0vEBjTv2jNbEkDB/cqyY7g=";
   };
 
-  vendorHash = "sha256-6dfwAsCxEYksZXqSWYurAD44YfH4h5p5P1aYZENjHSs=";
+  vendorHash = "sha256-Pwtvv/qVX91yWx49IYdveVCySoVxekvHomfAzOdFj7w=";
 
   doCheck = false;
 
diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index 298fe7fd036f..5d14551a860a 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -341,6 +341,12 @@ stdenv.mkDerivation rec {
       url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1514678888595ef41a968a0c69b7ff769edd1e9c";
       sha256 = "sha256-tgAEoAtaNKJjscjMFkXXiVn59Pa4c+NiQ3iVW6CMrpo=";
     })
+
+    # fix incompatibility with e2fsprogs 1.47+
+    (fetchpatch {
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763";
+      sha256 = "sha256-pejn1bJkC7XnT2ODaxeERHUrMOONoBV6w0wF2Z2ZKWI=";
+    })
   ];
 
   postPatch = if kbdcompSupport then ''
diff --git a/pkgs/tools/misc/notify/default.nix b/pkgs/tools/misc/notify/default.nix
index 81e928a8dc7a..8c8158174c76 100644
--- a/pkgs/tools/misc/notify/default.nix
+++ b/pkgs/tools/misc/notify/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "notify";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-PZSt4mhon0JbFxeq5tOXb+xWKOoxT6rjRS1E3Jf2V3c=";
+    sha256 = "sha256-CXzxrY8G7Zh5xafuiIY9SsPkrYoSkMt15v2KLZBs0Jo=";
   };
 
-  vendorSha256 = "sha256-MoGaIs2WmJk+E8pTljrahuaJ1VwYBhGBf1XGYVYOVt4=";
+  vendorSha256 = "sha256-tjaVEmOd/MJnDcS/mhvw95ZZ8giaUDTdDTyAMbjTckM=";
 
   modRoot = ".";
   subPackages = [
diff --git a/pkgs/tools/nix/gridlock/default.nix b/pkgs/tools/nix/gridlock/default.nix
new file mode 100644
index 000000000000..7e3bee28ebb7
--- /dev/null
+++ b/pkgs/tools/nix/gridlock/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, openssl
+, stdenv
+, darwin
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "gridlock";
+  version = "unstable-2023-03-03";
+
+  outputs = [ "out" "nyarr" ];
+
+  src = fetchFromGitHub {
+    owner = "lf-";
+    repo = "gridlock";
+    rev = "15261abdb179e1d7e752772bf9db132b3ee343ea";
+    hash = "sha256-rnPAEJH3TebBH6lqgVo7B+nNiArDIkGDnIZWcteFNEw=";
+  };
+
+  cargoHash = "sha256-EPs5vJ2RkVXKxrTRtbT/1FbvCT0KJtNuW2WKIUq7G0U=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  postInstall = ''
+    moveToOutput bin/nyarr $nyarr
+  '';
+
+  meta = with lib; {
+    description = "Nix compatible lockfile manager, without Nix";
+    homepage = "https://github.com/lf-/gridlock";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9ad5d5529e4..52a52e1e573b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -587,6 +587,9 @@ with pkgs;
 
   gpick = callPackage ../tools/misc/gpick { };
 
+  gridlock = callPackage ../tools/nix/gridlock { };
+  inherit (gridlock) nyarr;
+
   hwatch = callPackage ../tools/misc/hwatch { };
 
   hobbes = callPackage ../development/tools/hobbes { stdenv = gcc10StdenvCompat; };
@@ -1303,6 +1306,8 @@ with pkgs;
 
   accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { };
 
+  acme-dns = callPackage ../servers/dns/acme-dns/default.nix { };
+
   acme-sh = callPackage ../tools/admin/acme-sh { };
 
   acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { };
@@ -9304,6 +9309,8 @@ with pkgs;
 
   lockfileProgs = callPackage ../tools/misc/lockfile-progs { };
 
+  loganalyzer = libsForQt5.callPackage ../development/tools/loganalyzer { };
+
   logstash7 = callPackage ../tools/misc/logstash/7.x.nix {
     # https://www.elastic.co/support/matrix#logstash-and-jvm
     jre = jdk11_headless;
@@ -19485,6 +19492,8 @@ with pkgs;
 
   tweak = callPackage ../applications/editors/tweak { };
 
+  typical = callPackage ../development/tools/misc/typical { };
+
   uddup = callPackage ../tools/security/uddup { };
 
   udis86 = callPackage  ../development/tools/udis86 { };