Merge staging-next into staging

2023-04-13 18:01:58 +00:00 · 2023-04-13 18:01:58 +00:00 · 5557fcff78
commit 5557fcff78
parent a288d73b36 f0875e05d4
67 changed files with 6135 additions and 732 deletions
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@ -40,6 +40,7 @@ lrexlib-pcre,,,,,,vyp
 lrexlib-posix,,,,,,
 lua-cjson,,,,,,
 lua-cmsgpack,,,,,,
+lua-curl,,,,,,
 lua-iconv,,,,,,
 lua-lsp,,,,,,
 lua-messagepack,,,,,,
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@ -274,6 +274,8 @@ In addition to numerous new and upgraded packages, this release has the followin
  replacement. It stores backups as volume dump files and thus better integrates
  into contemporary backup solutions.

+- `services.maddy` now allows to configure users and their credentials using `services.maddy.ensureCredentials`.
+
 - The `dnsmasq` service now takes configuration via the
  `services.dnsmasq.settings` attribute set. The option
  `services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches
--- a/nixos/modules/services/mail/maddy.nix
+++ b/nixos/modules/services/mail/maddy.nix
@ -228,8 +228,8 @@ in {
        default = [];
        description = lib.mdDoc ''
          List of IMAP accounts which get automatically created. Note that for
-          a complete setup, user credentials for these accounts are required too
-          and can be created using the command `maddyctl creds`.
+          a complete setup, user credentials for these accounts are required
+          and can be created using the `ensureCredentials` option.
          This option does not delete accounts which are not (anymore) listed.
        '';
        example = [
@ -238,6 +238,33 @@ in {
        ];
      };

+      ensureCredentials = mkOption {
+        default = {};
+        description = lib.mdDoc ''
+          List of user accounts which get automatically created if they don't
+          exist yet. Note that for a complete setup, corresponding mail boxes
+          have to get created using the `ensureAccounts` option.
+          This option does not delete accounts which are not (anymore) listed.
+        '';
+        example = {
+          "user1@localhost".passwordFile = /secrets/user1-localhost;
+          "user2@localhost".passwordFile = /secrets/user2-localhost;
+        };
+        type = types.attrsOf (types.submodule {
+          options = {
+            passwordFile = mkOption {
+              type = types.path;
+              example = "/path/to/file";
+              default = null;
+              description = lib.mdDoc ''
+                Specifies the path to a file containing the
+                clear text password for the user.
+              '';
+            };
+          };
+        });
+      };
+
    };
  };

@ -265,6 +292,13 @@ in {
                fi
              '') cfg.ensureAccounts}
            ''}
+            ${optionalString (cfg.ensureCredentials != {}) ''
+              ${concatStringsSep "\n" (mapAttrsToList (name: cfg: ''
+                if ! ${pkgs.maddy}/bin/maddyctl creds list | grep "${name}"; then
+                  ${pkgs.maddy}/bin/maddyctl creds create --password $(cat ${escapeShellArg cfg.passwordFile}) ${name}
+                fi
+              '') cfg.ensureCredentials)}
+            ''}
          '';
          serviceConfig = {
            Type = "oneshot";
--- a/nixos/modules/services/monitoring/grafana-agent.nix
+++ b/nixos/modules/services/monitoring/grafana-agent.nix
@ -140,7 +140,7 @@ in
        # We can't use Environment=HOSTNAME=%H, as it doesn't include the domain part.
        export HOSTNAME=$(< /proc/sys/kernel/hostname)

-        exec ${cfg.package}/bin/agent -config.expand-env -config.file ${configFile}
+        exec ${lib.getExe cfg.package} -config.expand-env -config.file ${configFile}
      '';
      serviceConfig = {
        Restart = "always";
--- a/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix
@ -4,12 +4,12 @@ with lib;

 let
  cfg = config.services.prometheus.exporters.smartctl;
-  args = concatStrings [
-    "--web.listen-address=\"${cfg.listenAddress}:${toString cfg.port}\" "
-    "--smartctl.path=\"${pkgs.smartmontools}/bin/smartctl\" "
-    "--smartctl.interval=\"${cfg.maxInterval}\" "
-    "${concatMapStringsSep " " (device: "--smartctl.device=${device}") cfg.devices}"
-  ] ++ cfg.extraFlags;
+  args = lib.escapeShellArgs ([
+    "--web.listen-address=${cfg.listenAddress}:${toString cfg.port}"
+    "--smartctl.path=${pkgs.smartmontools}/bin/smartctl"
+    "--smartctl.interval=${cfg.maxInterval}"
+  ] ++ map (device: "--smartctl.device=${device}") cfg.devices
+  ++ cfg.extraFlags);
 in {
  port = 9633;

--- a/nixos/tests/maddy.nix
+++ b/nixos/tests/maddy.nix
@ -10,6 +10,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
        primaryDomain = "server";
        openFirewall = true;
        ensureAccounts = [ "postmaster@server" ];
+        ensureCredentials = {
+          # Do not use this in production. This will make passwords world-readable
+          # in the Nix store
+          "postmaster@server".passwordFile = "${pkgs.writeText "postmaster" "test"}";
+        };
      };
    };

@ -49,9 +54,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
    server.wait_for_unit("maddy.service")
    server.wait_for_open_port(143)
    server.wait_for_open_port(587)
-
-    server.succeed("maddyctl creds create --password test postmaster@server")
-
    client.succeed("send-testmail")
    client.succeed("test-imap")
  '';
--- a/pkgs/applications/blockchains/polkadot/Cargo.lock
+++ b/pkgs/applications/blockchains/polkadot/Cargo.lock
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "polkadot";
-  version = "0.9.40";
+  version = "0.9.41";

  src = fetchFromGitHub {
    owner = "paritytech";
    repo = "polkadot";
    rev = "v${version}";
-    hash = "sha256-gwifWhGsStC8vhMxc+LWSvs/av8c04cdWv7iszIQ/k8=";
+    hash = "sha256-wjV/+2n9B617S6MxC48vtpbBBKGCWBEjRj7K6m630Mo=";

    # the build process of polkadot requires a .git folder in order to determine
    # the git commit hash that is being built and add it to the version string.
@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "binary-merkle-tree-4.0.0-dev" = "sha256-YxCAFrLWTmGjTFzNkyjE+DNs2cl4IjAlB7qz0KPN1vE=";
+      "binary-merkle-tree-4.0.0-dev" = "sha256-ngtW11MGs+fcuCp9J5NH+dYJeK4YM5vWpRk0OuLYHus=";
      "sub-tokens-0.1.0" = "sha256-GvhgZhOIX39zF+TbQWtTCgahDec4lQjH+NqamLFLUxM=";
    };
  };
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -547,12 +547,12 @@ final: prev:

  ale = buildVimPluginFrom2Nix {
    pname = "ale";
-    version = "2023-04-07";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "dense-analysis";
      repo = "ale";
-      rev = "57254db9ef1e0b0bf21466ed2d3ebaf60338768f";
-      sha256 = "01n04zi55y6nrg2dg2jpfacs7a140wa0m8rfkingdvx59n5g3j6j";
+      rev = "fdadaed2ba93432add241bb25f9935dc2ebb4152";
+      sha256 = "08i1fs55b3wqbvn3259c7zwnr45iv0lcyqri7ig7xgppi13hm2x8";
    };
    meta.homepage = "https://github.com/dense-analysis/ale/";
  };
@ -847,12 +847,12 @@ final: prev:

  b64-nvim = buildVimPluginFrom2Nix {
    pname = "b64.nvim";
-    version = "2022-08-22";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "taybart";
      repo = "b64.nvim";
-      rev = "12dde6ebc3035f010833f513cfbd9abad92b28b3";
-      sha256 = "0h3ghaddqf00q7gih53ni7mx0iw5k9m616j34yg6hdf6s12zp5qw";
+      rev = "0efc9f2d5baf546298c3ef936434fe5783d7ecb3";
+      sha256 = "1sb24ydihp01qkrvfr1pc2wf5yjl9sb8b893x5hm6l8q8a70pr5h";
    };
    meta.homepage = "https://github.com/taybart/b64.nvim/";
  };
@ -871,12 +871,12 @@ final: prev:

  barbecue-nvim = buildVimPluginFrom2Nix {
    pname = "barbecue.nvim";
-    version = "2023-04-09";
+    version = "2023-04-11";
    src = fetchFromGitHub {
      owner = "utilyre";
      repo = "barbecue.nvim";
-      rev = "0859f1264310e8b5f75e2da1d5254c586fc7e3c8";
-      sha256 = "0h391fy61il5xvdm48h73ddckf27x5x4vqr1x6fbv7zll9qi1q1l";
+      rev = "e1b18d219bebbc97bc6afcf332313110ca62435d";
+      sha256 = "0bja7y2nm0iv1ly6mi0g7y9ivgv6b9dr60sbgnz099b36aw4918g";
    };
    meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
  };
@ -1111,12 +1111,12 @@ final: prev:

  ccc-nvim = buildVimPluginFrom2Nix {
    pname = "ccc.nvim";
-    version = "2023-03-31";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "uga-rosa";
      repo = "ccc.nvim";
-      rev = "3e07b8ffc9dab162cd2940e75601da75ed0cebbe";
-      sha256 = "0rk2gvnksss5w29sij6pw9rw0ah7wgvl5q8h21iby6wyvrzhh32i";
+      rev = "82f5113a9b12993deabe610958dcf23933a8f4a7";
+      sha256 = "1rpf985i4q2hlz9rlinqrc4bgf4lkj9615z7xjb2savc12pg7jww";
    };
    meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
  };
@ -1651,12 +1651,12 @@ final: prev:

  cmp-tabnine = buildVimPluginFrom2Nix {
    pname = "cmp-tabnine";
-    version = "2023-03-21";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "tzachar";
      repo = "cmp-tabnine";
-      rev = "4c8a0db92e75c848fb066edd280072389db80d24";
-      sha256 = "19ypgjd3hfiw3qvjzx543x9i3pk09qj0wr89w2rbngsj4sypfm4h";
+      rev = "380a11420752ac1c2d8fbb344454ff7f955b912c";
+      sha256 = "0dn7cm1zxincy2m83irlc979ci9wlgvic66j1mqps2a2g0aan1zj";
    };
    meta.homepage = "https://github.com/tzachar/cmp-tabnine/";
  };
@ -1927,12 +1927,12 @@ final: prev:

  comment-nvim = buildVimPluginFrom2Nix {
    pname = "comment.nvim";
-    version = "2023-04-11";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "numtostr";
      repo = "comment.nvim";
-      rev = "ab62084fa992ed7ee3c19bbb5227ce2c4234612b";
-      sha256 = "02hsh3addjmdinhh3irh0hsbyqvl4mhkd5msa6c4ddaxf6zbwclq";
+      rev = "a89339ffbee677ab0521a483b6dac7e2e67c907e";
+      sha256 = "0q2882md4c42v255y7pfhqiv1vvi0h76wh4i8n2a00958vkmzg36";
    };
    meta.homepage = "https://github.com/numtostr/comment.nvim/";
  };
@ -2335,12 +2335,12 @@ final: prev:

  dashboard-nvim = buildVimPluginFrom2Nix {
    pname = "dashboard-nvim";
-    version = "2023-04-07";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "nvimdev";
      repo = "dashboard-nvim";
-      rev = "6f65affd9904ed96a7c7a3edc55486f7f517931d";
-      sha256 = "1jqxl2hsygmsq4bm3461qmancszh6ddr713g3zlzb1a17fyrivpk";
+      rev = "d5b0fff69546a3d4d742b47ca0452a41323f2f8f";
+      sha256 = "1s5gdcj29yy5dpv3553r7g9plhq81d68xnykz49kmmpxkapm5liz";
    };
    meta.homepage = "https://github.com/nvimdev/dashboard-nvim/";
  };
@ -2721,12 +2721,12 @@ final: prev:

  diffview-nvim = buildVimPluginFrom2Nix {
    pname = "diffview.nvim";
-    version = "2023-04-06";
+    version = "2023-04-11";
    src = fetchFromGitHub {
      owner = "sindrets";
      repo = "diffview.nvim";
-      rev = "6bebefbc4c90e6d2b8c65e65b055d284475d89f8";
-      sha256 = "0rpfy4cc6wb443y73gncb4l6iq82mka1gmblagknycrk64ycinaw";
+      rev = "63720aa5a70ce4aa386be407d0e612cd9e63861a";
+      sha256 = "0a8n7kv3b7qwzn435vnq0wxprfcypi86c2jsn7w07b9f0mymmlmf";
    };
    meta.homepage = "https://github.com/sindrets/diffview.nvim/";
  };
@ -2769,24 +2769,24 @@ final: prev:

  dracula-nvim = buildVimPluginFrom2Nix {
    pname = "dracula.nvim";
-    version = "2023-04-11";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "Mofiqul";
      repo = "dracula.nvim";
-      rev = "ce99c0b68edca27caa1701c0e79cf461b484d501";
-      sha256 = "00rnxjz7cvlcbs1zld04fxnk8y5vjvikcz078bs7ap3l4pg1zy5p";
+      rev = "b5bd9c7e4c6c8f4712610bda92140c735fe90521";
+      sha256 = "0v1hq1la8l6kfz0p6ypkd8krr373pb7gizxljay3yk3jh9yzx524";
    };
    meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
  };

  dressing-nvim = buildVimPluginFrom2Nix {
    pname = "dressing.nvim";
-    version = "2023-04-07";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "stevearc";
      repo = "dressing.nvim";
-      rev = "91b9ba8a9474d2c4156dc2f3e858e07ae8faecf0";
-      sha256 = "09cwg5vfccacxqm5y6k28f3kvmx80mczd1c7j4srdi824mqj9ffa";
+      rev = "0e3e1eba147fee6e638ac1ac28f0495bcde17319";
+      sha256 = "0yndy9n5hl1vv53nflixrqng11mpf5qj7afk9x137bpi847b2x7h";
    };
    meta.homepage = "https://github.com/stevearc/dressing.nvim/";
  };
@ -3048,12 +3048,12 @@ final: prev:

  flatten-nvim = buildVimPluginFrom2Nix {
    pname = "flatten.nvim";
-    version = "2023-04-09";
+    version = "2023-04-11";
    src = fetchFromGitHub {
      owner = "willothy";
      repo = "flatten.nvim";
-      rev = "3508beaa48d316937d8332d17f7ddc1b7d3f9a83";
-      sha256 = "1npwcscw01r109vlgkfk5wziwr31nscz3xv0k7gjhpb09chnrb43";
+      rev = "081095e3abbfeae03b74e134053e8ef48c751932";
+      sha256 = "13b9dzsp02x35zs8jv6pkwvlijimns6mbnxj3c7yy20rrc3y4g77";
    };
    meta.homepage = "https://github.com/willothy/flatten.nvim/";
  };
@ -3264,12 +3264,12 @@ final: prev:

  fzf-lua = buildVimPluginFrom2Nix {
    pname = "fzf-lua";
-    version = "2023-04-11";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "ibhagwan";
      repo = "fzf-lua";
-      rev = "061a4df40f5238782fdd7b380fe55650fadd9384";
-      sha256 = "0p928iyia6bpzrc4g6926xxagvfw30830air5lfbw492vp4rh2j5";
+      rev = "08f57e9a3c58c4ebef4c96de271d674d12e77607";
+      sha256 = "1x9pv8pf7cs1iyqw5f2aqrpp8wlzkkizxq1pbm2hjfp14k6gjvl4";
    };
    meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
  };
@ -3324,12 +3324,12 @@ final: prev:

  ghcid = buildVimPluginFrom2Nix {
    pname = "ghcid";
-    version = "2022-12-12";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "ndmitchell";
      repo = "ghcid";
-      rev = "41dd2cfd805478c5601df229549029b20f930381";
-      sha256 = "1zwrh2wss3igx10bh85zh55hjahhn5nda2w8na8cz8qld0prpc3v";
+      rev = "e2852979aa644c8fed92d46ab529d2c6c1c62b59";
+      sha256 = "0bsjbb6n7ssg411k2xj4f881v392hvb7xln99bq1r3vkg14mqqsd";
    };
    meta.homepage = "https://github.com/ndmitchell/ghcid/";
  };
@ -3480,12 +3480,12 @@ final: prev:

  go-nvim = buildVimPluginFrom2Nix {
    pname = "go.nvim";
-    version = "2023-04-08";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "ray-x";
      repo = "go.nvim";
-      rev = "8398343f2e161aec2d1a9324cd1c739eb379dd24";
-      sha256 = "07w7zwz87d3ngz34cnp5g6pxg16n7ixaci32gxfvyixlpng43wcb";
+      rev = "d7530aea0f1086d10e9267287966702616c366af";
+      sha256 = "1m4ijvxdf6v16i1bqi6d1yjs2drbj05nfnc636b597wfgri94ayf";
    };
    meta.homepage = "https://github.com/ray-x/go.nvim/";
  };
@ -3612,12 +3612,12 @@ final: prev:

  gruvbox-nvim = buildVimPluginFrom2Nix {
    pname = "gruvbox.nvim";
-    version = "2023-04-10";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "ellisonleao";
      repo = "gruvbox.nvim";
-      rev = "de4e3380575acc1bc9a349d32f028301dea54dcd";
-      sha256 = "10r0vvici824894aj51979vyszwdzw2g2dyfzfr5d57365sc8bgb";
+      rev = "e685aebb5967c2597858a41779a8d38321253509";
+      sha256 = "035xpsxxpfyhm79jkm1gsyix5gvf5xjyvkqbrzdkg23wj7bcxr4f";
    };
    meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
  };
@ -3731,12 +3731,12 @@ final: prev:

  heirline-nvim = buildVimPluginFrom2Nix {
    pname = "heirline.nvim";
-    version = "2023-04-10";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "rebelot";
      repo = "heirline.nvim";
-      rev = "d860874eef6088109b5cb102871d76307280f052";
-      sha256 = "0gh4jc45zvgmgx3bg4iyqa4smjl2bqalkwylpq74izzn4bxjd4yz";
+      rev = "b5bbb8b4e4e24dccd4a2f20e38a2be0b58fb7fc5";
+      sha256 = "0gm2khmr5jlj9idij9baw5jcpc7wiib84vsqd36rbz8byw1l7a4r";
    };
    meta.homepage = "https://github.com/rebelot/heirline.nvim/";
  };
@ -4343,12 +4343,12 @@ final: prev:

  legendary-nvim = buildVimPluginFrom2Nix {
    pname = "legendary.nvim";
-    version = "2023-04-10";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "mrjones2014";
      repo = "legendary.nvim";
-      rev = "69e7b9b56e6507760049c78a15116e1c0540423c";
-      sha256 = "0m5ngwaz9hw79gwv7mpbc3i63m3i18sykvmm67gr9182k505xqpc";
+      rev = "d1f805647e14c2e1c998bfb69feb0c764ee0eb19";
+      sha256 = "1251m1b34af55cfc913h70vr7xsp94nzy3ajqggcq7paaav51i7r";
    };
    meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
  };
@ -4643,12 +4643,12 @@ final: prev:

  lsp-overloads-nvim = buildVimPluginFrom2Nix {
    pname = "lsp-overloads.nvim";
-    version = "2023-04-10";
+    version = "2023-04-11";
    src = fetchFromGitHub {
      owner = "Issafalcon";
      repo = "lsp-overloads.nvim";
-      rev = "c63692f0b31ca0114bf2573d8d99fed5fd47dad9";
-      sha256 = "1yh1k1px4lxfqcdirpdwammc9rjf8bpk2qs6vvkiixx2wkh4xsdf";
+      rev = "91a933b024b39aaef42cb03db3edbce516ac0b0b";
+      sha256 = "14454n8mfa9ngccanrj3dnh9cii64xpp9g4wbgymzwycl1dgwxl0";
    };
    meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/";
  };
@ -4798,12 +4798,12 @@ final: prev:

  luasnip = buildVimPluginFrom2Nix {
    pname = "luasnip";
-    version = "2023-04-11";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "l3mon4d3";
      repo = "luasnip";
-      rev = "dc2e307287e9a9eabc18f0e3984c7e8cb164bb38";
-      sha256 = "10gyij1glisb1zqqdrb2wy772kz3nwf0mjn9npzzfcyrpvvwfra4";
+      rev = "eb592e4be52fff5a514b7540d5341b55ca4c3226";
+      sha256 = "0a9j9cay70znddqxq5lf1nnwnnnc2w9sbc8n26s0l5sd1c0zg18x";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@ -4895,12 +4895,12 @@ final: prev:

  mason-lspconfig-nvim = buildVimPluginFrom2Nix {
    pname = "mason-lspconfig.nvim";
-    version = "2023-04-08";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "williamboman";
      repo = "mason-lspconfig.nvim";
-      rev = "a8d5db8f227b9b236d1c54a9c6234bc033825ce7";
-      sha256 = "1c8w86yxmyay2b3c7ifl4qxcibgi27sf6pmx5b43j21ixjv5455n";
+      rev = "b81c50c4baae7d80b1723b3fa86e814d7754d15b";
+      sha256 = "0616f3b2h64xc566zlaxdg2cf6jvlzv6bnfxq4v30xm1wqzfa1a0";
    };
    meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
  };
@ -4919,12 +4919,12 @@ final: prev:

  mason-nvim = buildVimPluginFrom2Nix {
    pname = "mason.nvim";
-    version = "2023-04-11";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "williamboman";
      repo = "mason.nvim";
-      rev = "3fb2be48864b7850a26c54c04cedb54e95dcdf3f";
-      sha256 = "11i931xsxbsw7arbglv8k4gl53klw2jv0r69a00m0fddyiz4avq8";
+      rev = "6845ccfe009d6fbc5a6a266c285779ad462b234b";
+      sha256 = "1yd1lcg7zvh1kyflfkm7ip2g9z75bs52fp5fami8w4a2qp6hpz3f";
    };
    meta.homepage = "https://github.com/williamboman/mason.nvim/";
  };
@ -5039,12 +5039,12 @@ final: prev:

  mkdx = buildVimPluginFrom2Nix {
    pname = "mkdx";
-    version = "2023-04-04";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "SidOfc";
      repo = "mkdx";
-      rev = "1ddfff8118b6c3eb000dfc7c3c6eea5a314344b8";
-      sha256 = "0jjrn0br2sl7flr0bjx367j8f94m7cyqsmaaq3ind9i42vjfahkv";
+      rev = "2881f23d06da8544ecfcb75cd3b6c061d7392414";
+      sha256 = "06d08mbzc3ri9x8ar9a5f05b7g9vz76cbygna8hqkpmzhq1rq817";
    };
    meta.homepage = "https://github.com/SidOfc/mkdx/";
  };
@ -5411,12 +5411,12 @@ final: prev:

  neogit = buildVimPluginFrom2Nix {
    pname = "neogit";
-    version = "2023-03-20";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "TimUntersberger";
      repo = "neogit";
-      rev = "039ff3212ec43cc4d3332956dfb54e263c8d5033";
-      sha256 = "17a6lpqv99b89g7kakbzw97hpkqmw729if4j8gq8svza3fjcq2pg";
+      rev = "69a6ca7c41b023ebf9cad70778e227b3209b40c4";
+      sha256 = "1r5dii9510hb4qd63g32hrrrn8m3dmhwlp8l2ilig2vzcpics6mq";
    };
    meta.homepage = "https://github.com/TimUntersberger/neogit/";
  };
@ -5867,12 +5867,12 @@ final: prev:

  nightfox-nvim = buildVimPluginFrom2Nix {
    pname = "nightfox.nvim";
-    version = "2023-04-11";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "EdenEast";
      repo = "nightfox.nvim";
-      rev = "fbc610f3d3771e330b0dbefc8aab3112679554a6";
-      sha256 = "1a5mmjhiq3dpbillrmyh0f2j4p2cki6707j0qdbak1swrk30hwqp";
+      rev = "669b0ce7d02d511c06ceae6201392dc29906dfc0";
+      sha256 = "1698j3jrk0rl64q97013hj3lvlrdq6ndfz8k395kkfiaplg31xwh";
    };
    meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
  };
@ -5903,12 +5903,12 @@ final: prev:

  nlsp-settings-nvim = buildVimPluginFrom2Nix {
    pname = "nlsp-settings.nvim";
-    version = "2023-04-11";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "tamago324";
      repo = "nlsp-settings.nvim";
-      rev = "fd5ca6e4c2b01f97309e6b515b9957e7454587e1";
-      sha256 = "047911rgg1a9vrg1f6yaifsc54wgg6xjpgv198iaz80dhn5mr913";
+      rev = "5c2a066205b0fa4f9408e57fc02937dc01b1a2a2";
+      sha256 = "075rx3j1kjp7gbajzpvhrxi5mzgbzgkv18sy2sjhzy8vc2jijw57";
    };
    meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
  };
@ -5999,12 +5999,12 @@ final: prev:

  nui-nvim = buildVimPluginFrom2Nix {
    pname = "nui.nvim";
-    version = "2023-04-10";
+    version = "2023-04-11";
    src = fetchFromGitHub {
      owner = "MunifTanjim";
      repo = "nui.nvim";
-      rev = "bf5900f1b60bf6499755ac92315181a24a87a577";
-      sha256 = "0rs8i095ppkllvk6hacgvwsbmmiwaj2m57xwg5jd7mxyvy40zr4j";
+      rev = "ecd9def93891b9260b15b5fcef542eaabf4145c9";
+      sha256 = "133qxi97km61kg0y465jbwwzrby1v5h663igvrqlj1n2syvwwmi2";
    };
    meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
  };
@ -6119,12 +6119,12 @@ final: prev:

  nvim-bufdel = buildVimPluginFrom2Nix {
    pname = "nvim-bufdel";
-    version = "2023-02-27";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "ojroques";
      repo = "nvim-bufdel";
-      rev = "9f1ed6ef6594df9a74762a86f469d12036584976";
-      sha256 = "0fcvhxsr6nfi1sg5cy46dyy20rzc7g25y7ha0bhl2cprvz3frph1";
+      rev = "96c4f7ab053ddab0025bebe5f7c71e4795430e47";
+      sha256 = "01m8pgwsfplmknwf0a0ynwn7nflhsxfz1vmx4h3y92p0gs5shwwy";
    };
    meta.homepage = "https://github.com/ojroques/nvim-bufdel/";
  };
@ -6371,12 +6371,12 @@ final: prev:

  nvim-highlight-colors = buildVimPluginFrom2Nix {
    pname = "nvim-highlight-colors";
-    version = "2023-03-26";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "brenoprata10";
      repo = "nvim-highlight-colors";
-      rev = "14670d94c7813bfe929ed2ca2d3875f4f468173e";
-      sha256 = "0igiam19m1kw9ir41zkpfq78n67yypwvmmw2j3p04qnbwj0x3nxb";
+      rev = "46babc602128ff8024a97574e9c24963466cf061";
+      sha256 = "1z6lf13g42b9kkkkrr7src0fq3kaaqnxqp5akf8ib4l2rnf6hh4f";
    };
    meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/";
  };
@ -6419,12 +6419,12 @@ final: prev:

  nvim-jdtls = buildVimPluginFrom2Nix {
    pname = "nvim-jdtls";
-    version = "2023-04-03";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "mfussenegger";
      repo = "nvim-jdtls";
-      rev = "ffb8f63689197b845c2388f0df5f0d1bd21c968f";
-      sha256 = "0pxz9050522vlglvwm67s43dniwxygynvi0f8qdd8dhb5zm9x65q";
+      rev = "a2dd26c1c089fcd70dcf9ee5b691cad09cc8c200";
+      sha256 = "15y63lbxn33plyjfq00swzsyvpy69bn94x2xsyq6jwg4w2r0myf9";
    };
    meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
  };
@ -6479,12 +6479,12 @@ final: prev:

  nvim-lint = buildVimPluginFrom2Nix {
    pname = "nvim-lint";
-    version = "2023-04-05";
+    version = "2023-04-11";
    src = fetchFromGitHub {
      owner = "mfussenegger";
      repo = "nvim-lint";
-      rev = "2a9969a09d8456104d7954b67ee6667d6645c71a";
-      sha256 = "0yy9kwl2xkg38xl7rsjz9yz3w99md2ywj2w3whlv7hwk0w0pirb4";
+      rev = "a37881a226980e6c1042dd3abc2c0e05e2a1ac45";
+      sha256 = "0aaf5kfhr5jxzr2s7jq7i17nk096aww4icnp18x6c78qpvyrpils";
    };
    meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
  };
@ -6503,12 +6503,12 @@ final: prev:

  nvim-lspconfig = buildVimPluginFrom2Nix {
    pname = "nvim-lspconfig";
-    version = "2023-04-10";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvim-lspconfig";
-      rev = "10fa01d553ce10646350461ac5ddc71f189e9d1a";
-      sha256 = "1v5zqf5z9fl23f62cgchsyhg54wpw364k6bpn9gi6py5mfpig49c";
+      rev = "7f776b7d0a028e9d63d2e9389d7fdfc48cbb15d6";
+      sha256 = "0mm3j7l2ih92v6kb2im3r9as3ncv18bpiqxgw64lb5crd9j4z4dv";
    };
    meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
  };
@ -6729,6 +6729,18 @@ final: prev:
    meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
  };

+  nvim-spider = buildVimPluginFrom2Nix {
+    pname = "nvim-spider";
+    version = "2023-04-12";
+    src = fetchFromGitHub {
+      owner = "chrisgrieser";
+      repo = "nvim-spider";
+      rev = "23fa1260be2090f2d675ee90e0b83fd993f6c3dc";
+      sha256 = "1ij9kv1dm6lrdvrw83wc833yw32k4wdgqg1gd5d4qdddnqhix6zw";
+    };
+    meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
+  };
+
  nvim-surround = buildVimPluginFrom2Nix {
    pname = "nvim-surround";
    version = "2023-04-02";
@ -6767,36 +6779,36 @@ final: prev:

  nvim-tree-lua = buildVimPluginFrom2Nix {
    pname = "nvim-tree.lua";
-    version = "2023-04-11";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "nvim-tree";
      repo = "nvim-tree.lua";
-      rev = "48d53a5934fbd51b655d03db7dad35551838f2c9";
-      sha256 = "0wxkbjbbx6j2fs3bxc69vdppp4n46s13ykilrq4sd4vkcj1msr5m";
+      rev = "b601b5aa25627f68d3d73ba9269b49e4f04ce126";
+      sha256 = "1xs48i82gw78ig6wkan5c5b1a2fd1vgh8c51zckn76hmrzjb8bns";
    };
    meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
  };

  nvim-treesitter = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter";
-    version = "2023-04-11";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "ac4020c70722337c326bf65b645b162ee6e1796b";
-      sha256 = "0i993nj2yazzq5maiyqn0x1n0iilx6jz1a5wi079f0whhz5jaggi";
+      rev = "ba6c55b203748ec099127914d34554a575e051c0";
+      sha256 = "1qlq691vrl6bicd1i19ycm7zjg8g6bkz2jg0p5pq0v72gjaf11xs";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };

  nvim-treesitter-context = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter-context";
-    version = "2023-04-07";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter-context";
-      rev = "38203f5e6c62617b3c07662dc71ce3047ecd90d3";
-      sha256 = "0l3583h890pqmil34bim5zy3ib1jfc3nz12ykhda2b42a1qad0b4";
+      rev = "0d730df898f3dc27fd88f03cfa6d26d2405554b4";
+      sha256 = "0jf2643hv5b9hbjvjkzscsafi0p75ar29gcfayvaz0n7002hkmi0";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
  };
@ -6851,12 +6863,12 @@ final: prev:

  nvim-ts-autotag = buildVimPluginFrom2Nix {
    pname = "nvim-ts-autotag";
-    version = "2023-04-10";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "windwp";
      repo = "nvim-ts-autotag";
-      rev = "b525525b6aba20763e19011a73454845170850d7";
-      sha256 = "0j8vgqq3408y1b6vsv5rppp5aqly1cf8yn37chh526r42aikzbkd";
+      rev = "cac97f3b47bcb927db6d1d784c0c323056506ef3";
+      sha256 = "0fl804msvrhykw6haskn9n0f1yxmjxy8mv0b3hja0ya7pqblybda";
    };
    meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";
  };
@ -6914,8 +6926,8 @@ final: prev:
    src = fetchFromGitHub {
      owner = "nvim-tree";
      repo = "nvim-web-devicons";
-      rev = "defb7da4d3d313bf31982c52fd78e414f02840c9";
-      sha256 = "1qwcr82yd2jdfds6r6s0pfkixpk0dydnl1l9vqg092l6vkx6v30v";
+      rev = "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e";
+      sha256 = "18ssw6v60sy2lmb4dc11xz0vwkc4mw8fzbavvggadibjmbcf824l";
    };
    meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
  };
@ -6972,12 +6984,12 @@ final: prev:
    pname = "oceanic-material";
    version = "2022-08-17";
    src = fetchFromGitHub {
-      owner = "glepnir";
+      owner = "nvimdev";
      repo = "oceanic-material";
      rev = "9f2d002398d1ef0cd52315fa767b138719536c5d";
      sha256 = "1c9sbprivdhjyzxni3xzmk3lc56icd61azzvl9bb961iaag6r1c9";
    };
-    meta.homepage = "https://github.com/glepnir/oceanic-material/";
+    meta.homepage = "https://github.com/nvimdev/oceanic-material/";
  };

  oceanic-next = buildVimPluginFrom2Nix {
@ -7329,6 +7341,18 @@ final: prev:
    meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
  };

+  poimandres-nvim = buildVimPluginFrom2Nix {
+    pname = "poimandres.nvim";
+    version = "2023-02-17";
+    src = fetchFromGitHub {
+      owner = "olivercederborg";
+      repo = "poimandres.nvim";
+      rev = "43ea31d1e19f7603697bb3272b233930d0292383";
+      sha256 = "1q3xszkwlz008n9dh3q2agii6yjk45c47k38g3fj7ssgzmq56q21";
+    };
+    meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/";
+  };
+
  pony-vim-syntax = buildVimPluginFrom2Nix {
    pname = "pony-vim-syntax";
    version = "2017-09-26";
@ -7645,12 +7669,12 @@ final: prev:

  rest-nvim = buildNeovimPluginFrom2Nix {
    pname = "rest.nvim";
-    version = "2023-01-23";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "rest-nvim";
      repo = "rest.nvim";
-      rev = "0fdb69f328529b34a2279c14be63b3325dc52740";
-      sha256 = "0dn9g6a3lidavw381cd9ckhw3biiq81vypgg4bl5yl6w4avp5nr0";
+      rev = "df826bc0a76d5eb79b458db894d47a5538b454fe";
+      sha256 = "13f3s5xzl572y2pa7j67h7sgmnkjhkrchzqd1fjjx6098r15qnsk";
    };
    meta.homepage = "https://github.com/rest-nvim/rest.nvim/";
  };
@ -7970,12 +7994,12 @@ final: prev:

  smart-splits-nvim = buildVimPluginFrom2Nix {
    pname = "smart-splits.nvim";
-    version = "2023-04-11";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "mrjones2014";
      repo = "smart-splits.nvim";
-      rev = "a2d3c590c250298f34674c19a87aa9e4c01af788";
-      sha256 = "18028fx4f88v34227mdzqj77x9k6zja69dj0shsl14pyagxallng";
+      rev = "4ade2833e248cef0cf038a03678c55eb7499cbff";
+      sha256 = "0yha2rnvdk5wrlpi9q3q8w05lwdw0vbq584h1zlcyq0q2b66v50r";
    };
    meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
  };
@ -9019,12 +9043,12 @@ final: prev:

  tmux-nvim = buildVimPluginFrom2Nix {
    pname = "tmux.nvim";
-    version = "2023-03-11";
+    version = "2023-04-11";
    src = fetchFromGitHub {
      owner = "aserowy";
      repo = "tmux.nvim";
-      rev = "9ba03cc5dfb30f1dc9eb50d0796dfdd52c5f454e";
-      sha256 = "0xkdihg0f9b0wc37zml7n3wsmy8ppy08zynv8f2j90xwlwad06b4";
+      rev = "b6da35847df972f50df27d938b6e5ea09bcc8391";
+      sha256 = "1zmvc8ar9x79bygiilb9gs49hnl8w2z575l25cpvlbylaz6yxi22";
    };
    meta.homepage = "https://github.com/aserowy/tmux.nvim/";
  };
@ -9080,12 +9104,12 @@ final: prev:

  toggleterm-nvim = buildVimPluginFrom2Nix {
    pname = "toggleterm.nvim";
-    version = "2023-04-09";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "akinsho";
      repo = "toggleterm.nvim";
-      rev = "2e477f7ee8ee8229ff3158e3018a067797b9cd38";
-      sha256 = "1d7qqgviimgmzz1g7ykv688pyhr0m9kv6h9lrczxmdq7xwymmbbq";
+      rev = "1c5996ee3c30b54751093fe68d40676859e7778f";
+      sha256 = "0m0xaw7d9yf9xy4j9x9y8lj7alr9zmys5picknfklyxq6p7szh6b";
    };
    meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
  };
@ -9276,8 +9300,8 @@ final: prev:
    src = fetchFromGitHub {
      owner = "unisonweb";
      repo = "unison";
-      rev = "b9c391ea148795d50071565d8abea635f59dc68f";
-      sha256 = "0xh52mc6kp58w2frjmncc0p132y3287hc92dxih62maaagaham9l";
+      rev = "a7097aaaf8e84c7709f14fe9aa3568eacb9532fb";
+      sha256 = "1xgiq7a9zvqhvjm5sp6ln83791mvwcfj2dqza0sgcqdfqv8ag2fn";
    };
    meta.homepage = "https://github.com/unisonweb/unison/";
  };
@ -10868,12 +10892,12 @@ final: prev:

  vim-fubitive = buildVimPluginFrom2Nix {
    pname = "vim-fubitive";
-    version = "2023-02-13";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "tommcdo";
      repo = "vim-fubitive";
-      rev = "f522e7c1c958d099438b375f38576f0f2f5100d2";
-      sha256 = "1qd9pka3wrmwq1y33i4bzm2qs6l0lx8g1174aa0g4kcawwf21m7j";
+      rev = "5b13f16703ff69cca103aeffbd3d69515899989a";
+      sha256 = "00gi3bfrf58f8z7v30lkbdj4mw8n8q2cjdkqq4clv6yrsy7jg25i";
    };
    meta.homepage = "https://github.com/tommcdo/vim-fubitive/";
  };
@ -11758,12 +11782,12 @@ final: prev:

  vim-lsp = buildVimPluginFrom2Nix {
    pname = "vim-lsp";
-    version = "2023-04-10";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "prabirshrestha";
      repo = "vim-lsp";
-      rev = "06bf1b35ef4717a10a00ec4f8387ebf3ec983194";
-      sha256 = "1wmxjlhhb3za2giza5hphr4sp4x763czajviv6vndfpibi4cgy5s";
+      rev = "80644e108b71d8735ab4c03dbc53db5ec6598d9b";
+      sha256 = "1m3c8sq48acb1mcv1b1dxyh6zfm2i46hvaf0i7nx8ndnasd3jap4";
    };
    meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
  };
@ -11867,12 +11891,12 @@ final: prev:

  vim-matchup = buildVimPluginFrom2Nix {
    pname = "vim-matchup";
-    version = "2023-04-10";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "andymass";
      repo = "vim-matchup";
-      rev = "03ebc3b7dbf8f17f2d45d9b5619b48a030e1bf88";
-      sha256 = "18bgw4gv9xd8msh7ly4lz8x631a3bprn5lcdl114g3h6ybs8ldix";
+      rev = "57499f5ca9a66f233efa4faeb04571e5194863a6";
+      sha256 = "08dm88wfwl55lx3kygh4mpwm5l62k3v0776jpwni8k80pzf057fi";
    };
    meta.homepage = "https://github.com/andymass/vim-matchup/";
  };
@ -13199,12 +13223,12 @@ final: prev:

  vim-startuptime = buildVimPluginFrom2Nix {
    pname = "vim-startuptime";
-    version = "2023-02-01";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "dstein64";
      repo = "vim-startuptime";
-      rev = "6580cf539c33a212f4f5542068a3b4dd2b3ad834";
-      sha256 = "1977l3k7crzrr1cc80afnz7cs6bz2y16qn02gz56marc0pn215mx";
+      rev = "c9da356b59eb30dfca6cd573b63d0e81c0a24ff9";
+      sha256 = "17qv1xpakvp4x23g02kxz34q2vfk80sgqfkx17g6rb8fx5dy00yx";
    };
    meta.homepage = "https://github.com/dstein64/vim-startuptime/";
  };
@ -14100,12 +14124,12 @@ final: prev:

  vimspector = buildVimPluginFrom2Nix {
    pname = "vimspector";
-    version = "2023-04-06";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "puremourning";
      repo = "vimspector";
-      rev = "657132ead403951a59641b24bd771bb6da93e427";
-      sha256 = "11kzpzah7wqm22wnrlr8hpyjaammkj2nlxh19m52xb8cc3fkzpys";
+      rev = "2d374a10f9c451cd90a073e67121fa640f5ef8c2";
+      sha256 = "1w80mavmjivmgw6fp5pjqzg34l6hdwip97afsvlh8qhfnvngb0gg";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/puremourning/vimspector/";
@ -14452,12 +14476,12 @@ final: prev:
    pname = "zephyr-nvim";
    version = "2022-12-31";
    src = fetchFromGitHub {
-      owner = "glepnir";
+      owner = "nvimdev";
      repo = "zephyr-nvim";
      rev = "7fd86b7164442d3b5ec2c81b2694d040e716b5cf";
      sha256 = "12ichp7jmawgf1clwpd2w22a2amqlv578lnb89ppzf9hjz5kcxnb";
    };
-    meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
+    meta.homepage = "https://github.com/nvimdev/zephyr-nvim/";
  };

  zig-vim = buildVimPluginFrom2Nix {
@ -14514,8 +14538,8 @@ final: prev:
    src = fetchFromGitHub {
      owner = "catppuccin";
      repo = "nvim";
-      rev = "f078aa49bef4cb9e7b86f07b607c6e98c95b9fb5";
-      sha256 = "0w87h5vdrwn3ch8fyyfxkpz16r150910wmbb5y6wr4ad3scndjsk";
+      rev = "5e31d3ce29aa17b7a047b1a0e6b9ce9d6702c511";
+      sha256 = "0pms68jjqgpkm29rklrl2yzl0rd9b7zpx1zyf3msjqm0ph4hakg5";
    };
    meta.homepage = "https://github.com/catppuccin/nvim/";
  };
@ -14582,12 +14606,12 @@ final: prev:

  lspsaga-nvim-original = buildVimPluginFrom2Nix {
    pname = "lspsaga-nvim-original";
-    version = "2023-04-11";
+    version = "2023-04-13";
    src = fetchFromGitHub {
      owner = "nvimdev";
      repo = "lspsaga.nvim";
-      rev = "1ead4ce8a20a8ac7e96aca038d54ceaa185be4e0";
-      sha256 = "14k02srgqdzglzbn6yvr12qgpkmngaamlpb97p4h27d6di9zpkkm";
+      rev = "da44b65d4f64905e566bb151f407f16d64a5fcf8";
+      sha256 = "10qmrp45czl1vml5wd1x0fjnxvyzcab592jkijgqdxypqj0y238g";
    };
    meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
  };
@ -14630,12 +14654,12 @@ final: prev:

  rose-pine = buildVimPluginFrom2Nix {
    pname = "rose-pine";
-    version = "2023-03-30";
+    version = "2023-04-12";
    src = fetchFromGitHub {
      owner = "rose-pine";
      repo = "neovim";
-      rev = "f8e210df52a4f418eae3690eb744b06c13a6c556";
-      sha256 = "1d2ll2x66f7v854xdmp65l23mnv5qhzqci1bri5v2gj7hqs18r4f";
+      rev = "3935606b6c1cd0111359142498a9b02d3a12e1f1";
+      sha256 = "1xnj2fxmf5ih0jybdh9frgf7jbnszwyjd154v6dkxmblnxk2ny0v";
    };
    meta.homepage = "https://github.com/rose-pine/neovim/";
  };
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -192,12 +192,12 @@
  };
  comment = buildGrammar {
    language = "comment";
-    version = "0.0.0+rev=a37ca37";
+    version = "0.0.0+rev=f08e7d4";
    src = fetchFromGitHub {
      owner = "stsewd";
      repo = "tree-sitter-comment";
-      rev = "a37ca370310ac6f89b6e0ebf2b86b2219780494e";
-      hash = "sha256-wiFY2uMNv8Wet3qKh0bSe8FSO1sjGu1uTOBxnt/HHHg=";
+      rev = "f08e7d44b2923e9da2bf487a2f365d08677d368e";
+      hash = "sha256-v3h4x3R+9xbCEFezZlWPPM2Hb4575mbRkkyw7oz7K+U=";
    };
    meta.homepage = "https://github.com/stsewd/tree-sitter-comment";
  };
@ -579,12 +579,12 @@
  };
  gitcommit = buildGrammar {
    language = "gitcommit";
-    version = "0.0.0+rev=1723599";
+    version = "0.0.0+rev=04dcb2c";
    src = fetchFromGitHub {
      owner = "gbprod";
      repo = "tree-sitter-gitcommit";
-      rev = "17235998809be904892f14ee57730d96795e9323";
-      hash = "sha256-UhPlEanOBUpzqVPCqe8t5MIwdUwSeaoFJFsxpnUqwn8=";
+      rev = "04dcb2cb9a4cf638252b8bd4a829f9acadf2cc4c";
+      hash = "sha256-plu1qzMfvMfSqapQ4q+ZYNULDM8mBwlNeOzHoSSC3Hc=";
    };
    meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
  };
@ -612,12 +612,12 @@
  };
  glimmer = buildGrammar {
    language = "glimmer";
-    version = "0.0.0+rev=16c3786";
+    version = "0.0.0+rev=21805f4";
    src = fetchFromGitHub {
      owner = "alexlafroscia";
      repo = "tree-sitter-glimmer";
-      rev = "16c3786e1a2c87a236c823d1a8859574778a3436";
-      hash = "sha256-fLRA4Rm92hVezbAdMxmrXPb5ax6wNaaBYIo+U64nD+8=";
+      rev = "21805f429c5b7536be9f5f61dcabb5d3a4173bec";
+      hash = "sha256-EMcPjnf0SPa8Jk0GkkLTsOEGqRVdjbUt/DklRmXOGUA=";
    };
    meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer";
  };
@ -1878,12 +1878,12 @@
  };
  v = buildGrammar {
    language = "v";
-    version = "0.0.0+rev=4cd190d";
+    version = "0.0.0+rev=234c102";
    src = fetchFromGitHub {
      owner = "vlang";
      repo = "vls";
-      rev = "4cd190d1aaced458e8f1548e11b3beae5e4ea806";
-      hash = "sha256-rbIRx/LA5kvq7vI5WdR8be0WCyyTxsWB87ENNO7Qkao=";
+      rev = "234c1028883187c6b48e030780b7332229faefa3";
+      hash = "sha256-4DqMn9rPTxOtQOfy8fy6R7z/+z50XnCLV0J/4QFrRz4=";
    };
    location = "tree_sitter_v";
    meta.homepage = "https://github.com/vlang/vls";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -566,6 +566,7 @@ https://github.com/dstein64/nvim-scrollview/,,
 https://github.com/dcampos/nvim-snippy/,HEAD,
 https://github.com/ishan9299/nvim-solarized-lua/,,
 https://github.com/nvim-pack/nvim-spectre/,,
+https://github.com/chrisgrieser/nvim-spider/,HEAD,
 https://github.com/kylechui/nvim-surround/,main,
 https://github.com/svermeulen/nvim-teal-maker/,HEAD,
 https://github.com/norcalli/nvim-terminal.lua/,,
@ -616,6 +617,7 @@ https://github.com/motus/pig.vim/,,
 https://github.com/aklt/plantuml-syntax/,,
 https://github.com/nvim-treesitter/playground/,,
 https://github.com/nvim-lua/plenary.nvim/,,
+https://github.com/olivercederborg/poimandres.nvim/,HEAD,
 https://github.com/dleonard0/pony-vim-syntax/,,
 https://github.com/RishabhRD/popfix/,,
 https://github.com/nvim-lua/popup.nvim/,,
--- a/pkgs/applications/misc/chatblade/default.nix
+++ b/pkgs/applications/misc/chatblade/default.nix
@ -0,0 +1,47 @@
+{ lib, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "chatblade";
+  version = "0.2.1";
+  format = "setuptools";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-1syZyqdv+0iyAOWDychv3bGnkHs9SCxsEotxQ+G1UPo=";
+  };
+
+  doCheck = false; # there are no tests
+
+  pythonImportsCheck = [ "chatblade" ];
+  propagatedBuildInputs = with python3Packages; [
+    aiohttp
+    aiosignal
+    async-timeout
+    attrs
+    certifi
+    charset-normalizer
+    frozenlist
+    idna
+    markdown-it-py
+    mdurl
+    multidict
+    openai
+    platformdirs
+    pygments
+    pyyaml
+    regex
+    requests
+    rich
+    tiktoken
+    tqdm
+    urllib3
+    yarl
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/npiv/chatblade/";
+    description = "A CLI Swiss Army Knife for ChatGPT";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ deejayem ];
+  };
+}
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -484,13 +484,13 @@
    "vendorHash": null
  },
  "hcloud": {
-    "hash": "sha256-oFJ2+0qWWmt+lL+Nt0wEPL/G7P8YDtssnLN4K0Pjdsk=",
+    "hash": "sha256-yAUrrIhaJIdwKCsOcsouEev7GFLLJPoXAif1DXD46sU=",
    "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
    "owner": "hetznercloud",
    "repo": "terraform-provider-hcloud",
-    "rev": "v1.38.0",
+    "rev": "v1.38.1",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-popuZxLqK7NB2dt7xC5aP6sWyo8BsuhvVoAPZYWsSXU="
+    "vendorHash": "sha256-gz96b+GOE7AgXzEL4odneYA01wZv4oXwz//Yyu9rg3E="
  },
  "helm": {
    "hash": "sha256-X9keFjAmV86F/8ktxiv/VrnkHOazP9e/aOC9aRw1A48=",
--- a/pkgs/applications/networking/instant-messengers/element/pin.nix
+++ b/pkgs/applications/networking/instant-messengers/element/pin.nix
@ -1,9 +1,9 @@
 {
-  "version" = "1.11.28";
+  "version" = "1.11.29";
  "hashes" = {
-    "desktopSrcHash" = "u8w9rk5N6N4ppyG4tTbtj6YoHWwNnJW+N84cwpadtJk=";
-    "desktopYarnHash" = "0sgc0na93h9qa7n88g2wfd48hw19ydkv20mj6gpkj1dkp8ibfl0b";
-    "webSrcHash" = "CSOkDktlKBen8t1LN2hvadAAJ28YEwRhts0DjxeRCx8=";
-    "webYarnHash" = "1crz34ln5879amqgnjlwc7f1wj5is02hzp46lq8pqd3yvjmidx4c";
+    "desktopSrcHash" = "/q2tMYz2Qu/njoFPzI965Vn69kliLXJqIAhWSB6CnBE=";
+    "desktopYarnHash" = "1v910qx9ij4szs1fyxc1d2lh71zzyga5ry8d9i0pdw9nlwbkqjdh";
+    "webSrcHash" = "tnCaq3k0DFBYnJfS1BY4/OOR9oe+zHMnwATPsOoNAHc=";
+    "webYarnHash" = "0rd7f6ypp64znwdlaxqfahpf6lrr0mn28y3h635bn7ipzfjcqmqk";
  };
 }
--- a/pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix
@ -0,0 +1,61 @@
+{ stdenv
+, lib
+, fetchurl
+, appimageTools
+, makeWrapper
+, electron
+}:
+
+stdenv.mkDerivation rec {
+  pname = "revolt-desktop";
+  version = "1.0.6";
+
+  src = fetchurl {
+    url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-linux.AppImage";
+    sha256 = "sha256-Wsm6ef2Reenq3/aKGaP2yzlOuLKaxKtRHCLLMxvWUUY=";
+  };
+
+  appimageContents = appimageTools.extractType2 {
+    name = "${pname}-${version}";
+    inherit src;
+  };
+
+  dontUnpack = true;
+  dontConfigure = true;
+  dontBuild = true;
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/{applications,revolt-desktop}
+
+    cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
+    cp -a ${appimageContents}/revolt-desktop.desktop $out/share/applications/${pname}.desktop
+    cp -a ${appimageContents}/usr/share/icons $out/share/icons
+
+    substituteInPlace $out/share/applications/${pname}.desktop \
+      --replace 'Exec=AppRun' 'Exec=${pname}'
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    makeWrapper ${electron}/bin/electron $out/bin/${pname} \
+      --add-flags $out/share/${pname}/resources/app.asar
+  '';
+
+  meta = with lib; {
+    description = "An open source user-first chat platform";
+    homepage = "https://revolt.chat/";
+    changelog = "https://github.com/revoltchat/desktop/releases/tag/v${version}";
+    license = licenses.agpl3Only;
+    maintainers = with maintainers; [ heyimnova ];
+    platforms = platforms.linux;
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    mainProgram = "revolt-desktop";
+  };
+}
--- a/pkgs/applications/office/qnotero/default.nix
+++ b/pkgs/applications/office/qnotero/default.nix
@ -26,6 +26,18 @@ python3Packages.buildPythonPackage rec {
    wrapQtApp "$out"/bin/qnotero
  '';

+  postInstall = ''
+    mkdir $out/share
+    mv $out/usr/share/applications $out/share/applications
+
+    substituteInPlace $out/share/applications/qnotero.desktop \
+      --replace "Icon=/usr/share/qnotero/resources/light/qnotero.png" "Icon=qnotero"
+
+    mkdir -p $out/share/icons/hicolor/64x64/apps
+    ln -s $out/usr/share/qnotero/resources/light/qnotero.png \
+      $out/share/icons/hicolor/64x64/apps/qnotero.png
+  '';
+
  # no tests executed
  doCheck = false;

--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@ -21,11 +21,11 @@ let

  self = python3Packages.buildPythonApplication rec {
    pname = "mercurial${lib.optionalString fullBuild "-full"}";
-    version = "6.4";
+    version = "6.4.1";

    src = fetchurl {
      url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
-      sha256 = "sha256-6Iv7y5kR52kEoxuXLlf4bajmzliSuYw53VHTuVmcE0c=";
+      sha256 = "sha256-BbBZoMx/TnJhm+Vz56yunU15YU1HID0geNIXCsBH8K4=";
    };

    format = "other";
@ -35,7 +35,7 @@ let
    cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
      inherit src;
      name = "mercurial-${version}";
-      sha256 = "sha256-jgB9UMuZ9v+euGN2LPzg0vNK0KeEa8GpQxLJYgQzzbw=";
+      sha256 = "sha256-1enrXgQbf2aoBmM8WeAZg1259pR0OhdZnEB4Ax5k2K8=";
      sourceRoot = "mercurial-${version}/rust";
    } else null;
    cargoRoot = if rustSupport then "rust" else null;
@ -110,22 +110,6 @@ let
      gnupg
    ];

-    patches = [
-      # remove dependency over packaging for test runner
-      # https://bz.mercurial-scm.org/show_bug.cgi?id=6805
-      (fetchpatch {
-        url = "https://foss.heptapod.net/mercurial/mercurial-devel/-/commit/5e5e3733082a25856038f0fde66d4e08d8881539.patch";
-        hash = "sha256-JNxESWpWZW3AENz57tNJTV/ALnJjkmG1ZnTWSvTr4qY=";
-      })
-
-      # sligthly different test output matching
-      # https://bz.mercurial-scm.org/show_bug.cgi?id=6807
-      (fetchpatch {
-        url = "https://foss.heptapod.net/mercurial/mercurial-devel/-/commit/2231f7d8a60266bb6907b1708400c970ed799017.patch";
-        hash = "sha256-Lm5qXvM9nbmTpuMuvDoWhY4cQQQN7PFZtmu5e7mQVw4=";
-      })
-    ];
-
    postPatch = ''
      patchShebangs .

@ -168,10 +152,6 @@ let
    # Python 3.10-3.12 deprecation warning: asyncore
    # https://bz.mercurial-scm.org/show_bug.cgi?id=6727
    test-patchbomb-tls.t
-
-    # Test wanting TLS 1.0 and 1.1, not available with OpenSSL v3.
-    # https://bz.mercurial-scm.org/show_bug.cgi?id=6760
-    test-https.t
    EOF

    export HGTEST_REAL_HG="${mercurial}/bin/hg"
--- a/pkgs/applications/video/jellyfin-media-player/default.nix
+++ b/pkgs/applications/video/jellyfin-media-player/default.nix
@ -28,18 +28,18 @@

 mkDerivation rec {
  pname = "jellyfin-media-player";
-  version = "1.8.1";
+  version = "1.9.0";

  src = fetchFromGitHub {
    owner = "jellyfin";
    repo = "jellyfin-media-player";
    rev = "v${version}";
-    sha256 = "sha256-/FqxZd0cFSfkeBQmZ2gU+5FUZZ+WbQ8c2IjaZ4/uGt8=";
+    sha256 = "sha256-PfzBxvGroHgjEz4OchnECSfcb1Ds8xbE28yxneaiPuo=";
  };

  patches = [
-    # the webclient-files are not copied in the regular build script. Copy them just like the linux build
-    ./fix-osx-resources.patch
+    # fix the location of the jellyfin-web path
+    ./fix-web-path.patch
    # disable update notifications since the end user can't simply download the release artifacts to update
    ./disable-update-notifications.patch
  ];
@ -79,9 +79,9 @@ mkDerivation rec {
    "-DLINUX_X11POWER=ON"
  ];

-  preBuild = ''
-    # link the jellyfin-web files to the expected "dist" directory
-    ln -s ${jellyfin-web}/share/jellyfin-web dist
+  preConfigure = ''
+    # link the jellyfin-web files to be copied by cmake (see fix-web-path.patch)
+    ln -s ${jellyfin-web}/share/jellyfin-web .
  '';

  postInstall = lib.optionalString stdenv.isDarwin ''
--- a/pkgs/applications/video/jellyfin-media-player/fix-osx-resources.patch
+++ b/pkgs/applications/video/jellyfin-media-player/fix-osx-resources.patch
@ -1,15 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 780c0d3..d9c2341 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -108,8 +108,8 @@ endif()
- set(RESOURCE_ROOT .)
- if(APPLE)
-   set(RESOURCE_ROOT Resources)
-  add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop)
-  add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
-+  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop)
-+  install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension)
- endif()
- 
- if(NOT APPLE)
--- a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch
+++ b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch
@ -0,0 +1,28 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5abca9b..d09176b 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -107,10 +107,8 @@ endif()
+ set(RESOURCE_ROOT .)
+ if(APPLE)
+   set(RESOURCE_ROOT Resources)
+-  if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/)
+-    add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop)
+-  endif()
+-  add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
+  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop)
+  install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension)
+ endif()
+ 
+ if(NOT APPLE)
+@@ -123,9 +121,7 @@ if(NOT APPLE)
+       install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources)
+     endif()
+   endforeach()
+-  if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/)
+-    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
+-  endif()
+  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
+   install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension)
+ endif()
+ 
--- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
@ -7,7 +7,10 @@
 , wayland
 , wayland-scanner
 , obs-studio
+, libffi
 , libX11
+, libXau
+, libXdmcp
 , libxcb
 , vulkan-headers
 , vulkan-loader
@ -17,13 +20,13 @@

 stdenv.mkDerivation rec {
  pname = "obs-vkcapture";
-  version = "1.3.1";
+  version = "1.3.2";

  src = fetchFromGitHub {
    owner = "nowrep";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-4rEUA8V5WgAVyBeUT0ALVmj14HaAgeASYd2YiBn8MC0=";
+    hash = "sha256-UQQ8oBEnOxmSN4ZyW4LdPZYvd5eB9EmdR0UvE1wgMZw=";
  };

  cmakeFlags = lib.optionals stdenv.isi686 [
@ -35,7 +38,10 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ cmake extra-cmake-modules ninja wayland-scanner ];
  buildInputs = [
    libGL
+    libffi
    libX11
+    libXau
+    libXdmcp
    libxcb
    vulkan-headers
    vulkan-loader
--- a/pkgs/desktops/gnome/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome/apps/cheese/default.nix
@ -28,19 +28,18 @@
 , meson
 , ninja
 , dbus
-, python3
 , pipewire
 }:

 stdenv.mkDerivation rec {
  pname = "cheese";
-  version = "43.0";
+  version = "44.0";

  outputs = [ "out" "man" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "dFdMSjwycyfxotbQs/k3vir7B6YVm21425wZLeZmfws=";
+    sha256 = "3yf/abII9Nz7fYb/YgqT+ThP3G/hBaP0rpO0OO+r9Fw=";
  };

  nativeBuildInputs = [
@ -55,7 +54,6 @@ stdenv.mkDerivation rec {
    meson
    ninja
    pkg-config
-    python3
    vala
    wrapGAppsHook
    glib # for glib-compile-schemas
@ -80,11 +78,6 @@ stdenv.mkDerivation rec {
    pipewire # PipeWire provides a gstreamer plugin for using PipeWire for video
  ];

-  postPatch = ''
-    chmod +x meson_post_install.py
-    patchShebangs meson_post_install.py
-  '';
-
  preFixup = ''
    gappsWrapperArgs+=(
      # Effects
--- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@ -23,7 +23,7 @@

 stdenv.mkDerivation rec {
  pname = "gnome-shell-extension-gsconnect";
-  version = "54";
+  version = "55";

  outputs = [ "out" "installedTests" ];

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
    owner = "GSConnect";
    repo = "gnome-shell-extension-gsconnect";
    rev = "v${version}";
-    hash = "sha256-Dt5T5luuKpSkoOs6MjOBg/yMm52hRfymKBeRklPWy+M=";
+    hash = "sha256-n6NbNgl+2FOhly/BeR7I6BvPOYe7leAdeAegaqhcGJU=";
  };

  patches = [
--- a/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch
+++ b/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch
@ -1,8 +1,8 @@
 diff --git a/data/org.gnome.Shell.Extensions.GSConnect.desktop.in b/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
-index ffb23342..b405c73b 100644
+index 3fb887c3..e8cbe1bd 100644
 --- a/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
 +++ b/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
-@@ -1,7 +1,7 @@
+@@ -5,7 +5,7 @@
 [Desktop Entry]
 Type=Application
 Name=GSConnect
@ -12,10 +12,11 @@ index ffb23342..b405c73b 100644
 NoDisplay=true
 Icon=org.gnome.Shell.Extensions.GSConnect
 diff --git a/src/extension.js b/src/extension.js
-index e7fd971a..8474bb3b 100644
+index 3fae443a..7aa19842 100644
 --- a/src/extension.js
 +++ b/src/extension.js
-@@ -1,5 +1,7 @@
+@@ -4,6 +4,8 @@
+ 
 'use strict';
 
 +'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path));
@ -24,10 +25,11 @@ index e7fd971a..8474bb3b 100644
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
 diff --git a/src/prefs.js b/src/prefs.js
-index 922ea60c..2cd62eb5 100644
+index b8860c82..d6292606 100644
 --- a/src/prefs.js
 +++ b/src/prefs.js
-@@ -1,5 +1,7 @@
+@@ -4,6 +4,8 @@
+ 
 'use strict';
 
 +'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path));
--- a/pkgs/desktops/gnome/extensions/gsconnect/installed-tests-path.patch
+++ b/pkgs/desktops/gnome/extensions/gsconnect/installed-tests-path.patch
@ -1,8 +1,11 @@
 diff --git a/installed-tests/meson.build b/installed-tests/meson.build
-index c7eff2fb..ef4f6052 100644
+index 5bc38bfd..02404c3a 100644
 --- a/installed-tests/meson.build
 +++ b/installed-tests/meson.build
-@@ -1,5 +1,5 @@
+@@ -2,8 +2,8 @@
+ #
+ # SPDX-License-Identifier: GPL-2.0-or-later
+ 
 -installed_tests_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name())
 -installed_tests_metadir = join_paths(datadir, 'installed-tests', meson.project_name())
 +installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
@ -11,10 +14,10 @@ index c7eff2fb..ef4f6052 100644
 installed_tests_srcdir = meson.current_source_dir()
 installed_tests_builddir = meson.current_build_dir()
 diff --git a/meson_options.txt b/meson_options.txt
-index 8912e052..ca6ee5eb 100644
+index 745c541c..b4b602ca 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -116,6 +116,13 @@ option(
+@@ -104,6 +104,13 @@ option(
   description: 'Native Messaging Host directory for Mozilla'
 )
 
--- a/pkgs/development/compilers/cudatoolkit/extension.nix
+++ b/pkgs/development/compilers/cudatoolkit/extension.nix
@ -18,8 +18,14 @@ final: prev: let
  # E.g. for cudaPackages_11_8 we use gcc11 with gcc12's libstdc++
  # Cf. https://github.com/NixOS/nixpkgs/pull/218265 for context
  backendStdenv = final.callPackage ./stdenv.nix {
-    nixpkgsStdenv = prev.pkgs.stdenv;
-    nvccCompatibleStdenv = prev.pkgs.buildPackages."${finalVersion.gcc}Stdenv";
+    # We use buildPackages (= pkgsBuildHost) because we look for a gcc that
+    # runs on our build platform, and that produces executables for the host
+    # platform (= platform on which we deploy and run the downstream packages).
+    # The target platform of buildPackages.gcc is our host platform, so its
+    # .lib output should be the libstdc++ we want to be writing in the runpaths
+    # Cf. https://github.com/NixOS/nixpkgs/pull/225661#discussion_r1164564576
+    nixpkgsCompatibleLibstdcxx = final.pkgs.buildPackages.gcc.cc.lib;
+    nvccCompatibleCC = final.pkgs.buildPackages."${finalVersion.gcc}".cc;
  };

  ### Add classic cudatoolkit package
--- a/pkgs/development/compilers/cudatoolkit/stdenv.nix
+++ b/pkgs/development/compilers/cudatoolkit/stdenv.nix
@ -1,17 +1,33 @@
-{ nixpkgsStdenv
-, nvccCompatibleStdenv
+{ lib
+, nixpkgsCompatibleLibstdcxx
+, nvccCompatibleCC
 , overrideCC
+, stdenv
 , wrapCCWith
 }:

-overrideCC nixpkgsStdenv (wrapCCWith {
-  cc = nvccCompatibleStdenv.cc.cc;
+let
+  cc = wrapCCWith
+    {
+      cc = nvccCompatibleCC;
+
+      # This option is for clang's libcxx, but we (ab)use it for gcc's libstdc++.
+      # Note that libstdc++ maintains forward-compatibility: if we load a newer
+      # libstdc++ into the process, we can still use libraries built against an
+      # older libstdc++. This, in practice, means that we should use libstdc++ from
+      # the same stdenv that the rest of nixpkgs uses.
+      # We currently do not try to support anything other than gcc and linux.
+      libcxx = nixpkgsCompatibleLibstdcxx;
+    };
+  cudaStdenv = overrideCC stdenv cc;
+  passthruExtra = {
+    inherit nixpkgsCompatibleLibstdcxx;
+    # cc already exposed
+  };
+  assertCondition = true;
+in
+lib.extendDerivation
+  assertCondition
+  passthruExtra
+  cudaStdenv

-  # This option is for clang's libcxx, but we (ab)use it for gcc's libstdc++.
-  # Note that libstdc++ maintains forward-compatibility: if we load a newer
-  # libstdc++ into the process, we can still use libraries built against an
-  # older libstdc++. This, in practice, means that we should use libstdc++ from
-  # the same stdenv that the rest of nixpkgs uses.
-  # We currently do not try to support anything other than gcc and linux.
-  libcxx = nixpkgsStdenv.cc.cc.lib;
-})
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@ -107,8 +107,6 @@ let

      # elm-format requires text >= 2.0
      text = self.text_2_0_2;
-      # elm-format-lib requires hspec-golden < 0.2
-      hspec-golden = self.hspec-golden_0_1_0_3;
      # unorderd-container's tests indirectly depend on text < 2.0
      unordered-containers = overrideCabal (drv: { doCheck = false; }) super.unordered-containers;
      # relude-1.1.0.0's tests depend on hedgehog < 1.2, which indirectly depends on text < 2.0
--- a/pkgs/development/compilers/elm/packages/avh4-lib.nix
+++ b/pkgs/development/compilers/elm/packages/avh4-lib.nix
@ -1,26 +1,25 @@
-{ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base, bimap
-, binary, bytestring, containers, directory, fetchgit, filepath
-, lib, mtl, pooled-io, process, relude, tasty, tasty-discover
-, tasty-hspec, tasty-hunit, text
+{ mkDerivation, array, base, bytestring, directory, fetchgit
+, filepath, lib, mtl, pooled-io, process, relude, tasty
+, tasty-discover, tasty-hspec, tasty-hunit, text
 }:
 mkDerivation {
  pname = "avh4-lib";
  version = "0.0.0.1";
  src = fetchgit {
    url = "https://github.com/avh4/elm-format";
-    sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4";
-    rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0";
+    sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi";
+    rev = "b5cca4c26b473dab06e5d73b98148637e4770d45";
    fetchSubmodules = true;
  };
  postUnpack = "sourceRoot+=/avh4-lib; echo source root reset to $sourceRoot";
+  configureFlags = [ "--ghc-option=-Wno-error=unused-packages" ];
  libraryHaskellDepends = [
-    ansi-terminal ansi-wl-pprint array base bimap binary bytestring
-    containers directory filepath mtl pooled-io process relude text
+    array base bytestring directory filepath mtl pooled-io process
+    relude text
  ];
  testHaskellDepends = [
-    ansi-terminal ansi-wl-pprint array base bimap binary bytestring
-    containers directory filepath mtl pooled-io process relude tasty
-    tasty-hspec tasty-hunit text
+    array base bytestring directory filepath mtl pooled-io process
+    relude tasty tasty-hspec tasty-hunit text
  ];
  testToolDepends = [ tasty-discover ];
  doHaddock = false;
--- a/pkgs/development/compilers/elm/packages/elm-format-lib.nix
+++ b/pkgs/development/compilers/elm/packages/elm-format-lib.nix
@ -1,30 +1,27 @@
-{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, array
-, avh4-lib, base, bimap, binary, bytestring, containers, directory
-, elm-format-markdown, elm-format-test-lib, fetchgit, filepath
-, ghc-prim, hspec, lib, mtl, optparse-applicative, process, relude
-, split, tasty, tasty-discover, tasty-hspec, tasty-hunit, text
+{ mkDerivation, aeson, avh4-lib, base, bimap, binary, bytestring
+, containers, elm-format-markdown, elm-format-test-lib, fetchgit
+, hspec, lib, mtl, optparse-applicative, relude, split, tasty
+, tasty-discover, tasty-hspec, tasty-hunit, text
 }:
 mkDerivation {
  pname = "elm-format-lib";
  version = "0.0.0.1";
  src = fetchgit {
    url = "https://github.com/avh4/elm-format";
-    sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4";
-    rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0";
+    sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi";
+    rev = "b5cca4c26b473dab06e5d73b98148637e4770d45";
    fetchSubmodules = true;
  };
  postUnpack = "sourceRoot+=/elm-format-lib; echo source root reset to $sourceRoot";
  libraryHaskellDepends = [
-    aeson ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary
-    bytestring containers directory elm-format-markdown filepath
-    ghc-prim mtl optparse-applicative process relude text
+    aeson avh4-lib base bimap binary bytestring containers
+    elm-format-markdown mtl optparse-applicative relude text
  ];
  testHaskellDepends = [
-    aeson ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary
-    bytestring containers directory elm-format-markdown
-    elm-format-test-lib filepath ghc-prim hspec mtl
-    optparse-applicative process relude split tasty tasty-hspec
-    tasty-hunit text
+    aeson avh4-lib base bimap binary bytestring containers
+    elm-format-markdown elm-format-test-lib hspec mtl
+    optparse-applicative relude split tasty tasty-hspec tasty-hunit
+    text
  ];
  testToolDepends = [ tasty-discover ];
  doHaddock = false;
--- a/pkgs/development/compilers/elm/packages/elm-format-markdown.nix
+++ b/pkgs/development/compilers/elm/packages/elm-format-markdown.nix
@ -4,8 +4,8 @@ mkDerivation {
  version = "0.0.0.1";
  src = fetchgit {
    url = "https://github.com/avh4/elm-format";
-    sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4";
-    rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0";
+    sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi";
+    rev = "b5cca4c26b473dab06e5d73b98148637e4770d45";
    fetchSubmodules = true;
  };
  postUnpack = "sourceRoot+=/elm-format-markdown; echo source root reset to $sourceRoot";
--- a/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix
+++ b/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix
@ -7,14 +7,14 @@ mkDerivation {
  version = "0.0.0.1";
  src = fetchgit {
    url = "https://github.com/avh4/elm-format";
-    sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4";
-    rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0";
+    sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi";
+    rev = "b5cca4c26b473dab06e5d73b98148637e4770d45";
    fetchSubmodules = true;
  };
  postUnpack = "sourceRoot+=/elm-format-test-lib; echo source root reset to $sourceRoot";
  libraryHaskellDepends = [
    avh4-lib base containers filepath hspec hspec-core hspec-golden mtl
-    split tasty tasty-hspec tasty-hunit text
+    split tasty-hunit text
  ];
  testHaskellDepends = [
    avh4-lib base containers filepath hspec hspec-core hspec-golden mtl
--- a/pkgs/development/compilers/elm/packages/elm-format.nix
+++ b/pkgs/development/compilers/elm/packages/elm-format.nix
@ -1,29 +1,28 @@
-{ mkDerivation, aeson, ansi-wl-pprint, avh4-lib, base, bimap
-, bytestring, containers, elm-format-lib, elm-format-test-lib
-, fetchgit, hspec, lib, mtl, optparse-applicative, QuickCheck
-, quickcheck-io, relude, tasty, tasty-hspec, tasty-hunit
-, tasty-quickcheck, text
+{ mkDerivation, aeson, ansi-wl-pprint, avh4-lib, base, bytestring
+, elm-format-lib, elm-format-test-lib, fetchgit, hspec, lib
+, optparse-applicative, QuickCheck, quickcheck-io, relude, tasty
+, tasty-hspec, tasty-hunit, tasty-quickcheck, text
 }:
 mkDerivation rec {
  pname = "elm-format";
-  version = "0.8.6";
+  version = "0.8.7";
  src = fetchgit {
    url = "https://github.com/avh4/elm-format";
-    sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4";
-    rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0";
+    sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi";
+    rev = "b5cca4c26b473dab06e5d73b98148637e4770d45";
    fetchSubmodules = true;
  };
  isLibrary = false;
  isExecutable = true;
  executableHaskellDepends = [
-    aeson ansi-wl-pprint avh4-lib base bytestring containers
-    elm-format-lib optparse-applicative relude text
+    aeson ansi-wl-pprint avh4-lib base bytestring elm-format-lib
+    optparse-applicative relude text
  ];
  testHaskellDepends = [
-    aeson ansi-wl-pprint avh4-lib base bimap bytestring containers
-    elm-format-lib elm-format-test-lib hspec mtl optparse-applicative
-    QuickCheck quickcheck-io relude tasty tasty-hspec tasty-hunit
-    tasty-quickcheck text
+    aeson ansi-wl-pprint avh4-lib base bytestring elm-format-lib
+    elm-format-test-lib hspec optparse-applicative QuickCheck
+    quickcheck-io relude tasty tasty-hspec tasty-hunit tasty-quickcheck
+    text
  ];
  doHaddock = false;
  homepage = "https://elm-lang.org";
--- a/pkgs/development/compilers/rust/make-rust-platform.nix
+++ b/pkgs/development/compilers/rust/make-rust-platform.nix
@ -1,8 +1,8 @@
-{ buildPackages, callPackage, stdenv, runCommand }@prev:
+{ buildPackages, callPackage, cargo-auditable, stdenv, runCommand }@prev:

 { rustc
 , cargo
-, cargo-auditable ? null
+, cargo-auditable ? prev.cargo-auditable
 , stdenv ? prev.stdenv
 , ...
 }:
--- a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix
@ -9,10 +9,12 @@ mkCoqDerivation {

  defaultVersion = with lib.versions;
     lib.switch [ coq.coq-version mathcomp-algebra.version ] [
+       { cases = [ (range "8.16" "8.17") (isGe "1.15") ]; out = "1.1.1"; }
       { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; }
     ] null;

  release."1.0.0".sha256 = "sha256-kszARPBizWbxSQ/Iqpf2vLbxYc6AjpUCLnSNlPcNfls=";
+  release."1.1.1".sha256 = "sha256-5wItMeeTRoJlRBH3zBNc2VUZn6pkDde60YAvXTx+J3U=";

  propagatedBuildInputs = [ mathcomp-algebra coq-elpi mathcomp-zify ];

--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@ -17,11 +17,11 @@

 stdenv.mkDerivation rec {
  pname = "ldb";
-  version = "2.6.1";
+  version = "2.6.2";

  src = fetchurl {
    url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
-    sha256 = "sha256-RnQD9334Z4LDlluxdUQLqi7XUan+uVYBlL2MBr8XNsk=";
+    hash = "sha256-XLxjw1KTwjSzn5S6n/yonW0HiSXX+QIfgIZz3t8tkl4=";
  };

  outputs = [ "out" "dev" ];
--- a/pkgs/development/libraries/relibc/default.nix
+++ b/pkgs/development/libraries/relibc/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, buildPackages, makeRustPlatform }:
+{ lib, stdenvNoCC, buildPackages }:

 let
  rpath = lib.makeLibraryPath [
@ -73,6 +73,9 @@ redoxRustPlatform.buildRustPackage rec {
    };
  };

+  # error: Usage of `RUSTC_WORKSPACE_WRAPPER` requires `-Z unstable-options`
+  auditable = false;
+
  meta = with lib; {
    homepage = "https://gitlab.redox-os.org/redox-os/relibc";
    description = "C Library in Rust for Redox and Linux";
--- a/pkgs/development/libraries/science/math/tensorrt/extension.nix
+++ b/pkgs/development/libraries/science/math/tensorrt/extension.nix
@ -31,22 +31,91 @@ final: prev: let
    inherit buildTensorRTPackage;
  } // allBuilds // defaultBuild;

+  tarballURL =
+  {fullVersion, fileVersionCuda, fileVersionCudnn ? null} :
+    "TensorRT-${fullVersion}.Linux.x86_64-gnu.cuda-${fileVersionCuda}"
+    + lib.optionalString (fileVersionCudnn != null) ".cudnn${fileVersionCudnn}"
+    + ".tar.gz";
+
  tensorRTVersions = {
+    "8.6.0" = [
+      rec {
+        fileVersionCuda = "11.8";
+        fullVersion = "8.6.0.12";
+        sha256 = "sha256-wXMqEJPFerefoLaH8GG+Np5EnJwXeStmDzZj7Nj6e2M=";
+        tarball = tarballURL { inherit fileVersionCuda fullVersion; };
+        supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ];
+      }
+    ];
+    "8.5.3" = [
+      rec {
+        fileVersionCuda = "11.8";
+        fileVersionCudnn = "8.6";
+        fullVersion = "8.5.3.1";
+        sha256 = "sha256-BNeuOYvPTUAfGxI0DVsNrX6Z/FAB28+SE0ptuGu7YDY=";
+        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
+        supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ];
+      }
+      rec {
+        fileVersionCuda = "10.2";
+        fileVersionCudnn = "8.6";
+        fullVersion = "8.5.3.1";
+        sha256 = "sha256-WCt6yfOmFbrjqdYCj6AE2+s2uFpISwk6urP+2I0BnGQ=";
+        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
+        supportedCudaVersions = [ "10.2" ];
+      }
+    ];
+    "8.5.2" = [
+      rec {
+        fileVersionCuda = "11.8";
+        fileVersionCudnn = "8.6";
+        fullVersion = "8.5.2.2";
+        sha256 = "sha256-Ov5irNS/JETpEz01FIFNMs9YVmjGHL7lSXmDpgCdgao=";
+        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
+        supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ];
+      }
+      rec {
+        fileVersionCuda = "10.2";
+        fileVersionCudnn = "8.6";
+        fullVersion = "8.5.2.2";
+        sha256 = "sha256-UruwQShYcHLY5d81lKNG7XaoUsZr245c+PUpUN6pC5E=";
+        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
+        supportedCudaVersions = [ "10.2" ];
+      }
+    ];
+    "8.5.1" = [
+      rec {
+        fileVersionCuda = "11.8";
+        fileVersionCudnn = "8.6";
+        fullVersion = "8.5.1.7";
+        sha256 = "sha256-Ocx/B3BX0TY3lOj/UcTPIaXb7M8RFrACC6Da4PMGMHY=";
+        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
+        supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ];
+      }
+      rec {
+        fileVersionCuda = "10.2";
+        fileVersionCudnn = "8.6";
+        fullVersion = "8.5.1.7";
+        sha256 = "sha256-CcFGJhw7nFdPnSYYSxcto2MHK3F84nLQlJYjdIw8dPM=";
+        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
+        supportedCudaVersions = [ "10.2" ];
+      }
+    ];
    "8.4.0" = [
      rec {
        fileVersionCuda = "11.6";
        fileVersionCudnn = "8.3";
        fullVersion = "8.4.0.6";
        sha256 = "sha256-DNgHHXF/G4cK2nnOWImrPXAkOcNW6Wy+8j0LRpAH/LQ=";
-        tarball = "TensorRT-${fullVersion}.Linux.x86_64-gnu.cuda-${fileVersionCuda}.cudnn${fileVersionCudnn}.tar.gz";
-        supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" ];
+        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
+        supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" ];
      }
      rec {
        fileVersionCuda = "10.2";
        fileVersionCudnn = "8.3";
        fullVersion = "8.4.0.6";
        sha256 = "sha256-aCzH0ZI6BrJ0v+e5Bnm7b8mNltA7NNuIa8qRKzAQv+I=";
-        tarball = "TensorRT-${fullVersion}.Linux.x86_64-gnu.cuda-${fileVersionCuda}.cudnn${fileVersionCudnn}.tar.gz";
+        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
        supportedCudaVersions = [ "10.2" ];
      }
    ];
@ -62,7 +131,8 @@ final: prev: let
    "11.4" = "8.4.0";
    "11.5" = "8.4.0";
    "11.6" = "8.4.0";
-    "11.7" = "8.4.0";
+    "11.7" = "8.5.3";
+    "11.8" = "8.5.3";
  }.${cudaVersion} or "8.4.0";

 in tensorRTPackages
--- a/pkgs/development/libraries/science/math/tensorrt/generic.nix
+++ b/pkgs/development/libraries/science/math/tensorrt/generic.nix
@ -9,13 +9,13 @@
 }:

 { fullVersion
-, fileVersionCudnn
+, fileVersionCudnn ? null
 , tarball
 , sha256
 , supportedCudaVersions ? [ ]
 }:

-assert lib.assertMsg (lib.strings.versionAtLeast cudnn.version fileVersionCudnn)
+assert fileVersionCudnn == null || lib.assertMsg (lib.strings.versionAtLeast cudnn.version fileVersionCudnn)
  "This version of TensorRT requires at least cuDNN ${fileVersionCudnn} (current version is ${cudnn.version})";

 backendStdenv.mkDerivation rec {
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@ -1121,6 +1121,29 @@ buildLuarocksPackage {
  };
 }) {};

+lua-curl = callPackage({ lua, buildLuarocksPackage, fetchzip, luaOlder, luaAtLeast }:
+buildLuarocksPackage {
+  pname = "lua-curl";
+  version = "0.3.13-1";
+  knownRockspec = (fetchurl {
+    url    = "mirror://luarocks/lua-curl-0.3.13-1.rockspec";
+    sha256 = "0lz534sm35hxazf1w71hagiyfplhsvzr94i6qyv5chjfabrgbhjn";
+  }).outPath;
+  src = fetchzip {
+    url    = "https://github.com/Lua-cURL/Lua-cURLv3/archive/v0.3.13.zip";
+    sha256 = "0gn59bwrnb2mvl8i0ycr6m3jmlgx86xlr9mwnc85zfhj7zhi5anp";
+  };
+
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
+  propagatedBuildInputs = [ lua ];
+
+  meta = {
+    homepage = "https://github.com/Lua-cURL";
+    description = "Lua binding to libcurl";
+    license.fullName = "MIT/X11";
+  };
+}) {};
+
 lua-iconv = callPackage({ fetchurl, lua, buildLuarocksPackage, luaOlder }:
 buildLuarocksPackage {
  pname = "lua-iconv";
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@ -1,6 +1,7 @@
 # do not add pkgs, it messes up splicing
 { stdenv
 , cmake
+, curl
 , cyrus_sasl
 , dbus
 , expat
@ -255,6 +256,12 @@ with prev;
    ];
  });

+  lua-curl = prev.luaLib.overrideLuarocks prev.lua-curl (drv: {
+    buildInputs = [
+      curl
+    ];
+  });
+
  lua-iconv = prev.luaLib.overrideLuarocks prev.lua-iconv (drv: {
    buildInputs = [
      libiconv
--- a/pkgs/development/mobile/maestro/default.nix
+++ b/pkgs/development/mobile/maestro/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "maestro";
-  version = "1.25.0";
+  version = "1.26.0";

  src = fetchurl {
    url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
-    sha256 = "0rkm2rgbbr4rbycg2kz5in2wjklv23jr7ms5p49j3bpa6nkv4jq3";
+    sha256 = "1ad5s5125hcqv3cf9zz0yyxcfck0jylppd1n5vpd4s2yshz0lqnj";
  };

  dontUnpack = true;
--- a/pkgs/development/python-modules/aioswitcher/default.nix
+++ b/pkgs/development/python-modules/aioswitcher/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "aioswitcher";
-  version = "3.2.2";
+  version = "3.3.0";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "TomerFi";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-17LTNQjI2UfgtlNNkSRSWMNnhgokBXn/7KGuKo5Ai4E=";
+    hash = "sha256-dg3oGSwRoOFkX97ZBk7fgOv0fZjOZ+FRXNO9DKEU6Zk=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/jaxlib/default.nix
+++ b/pkgs/development/python-modules/jaxlib/default.nix
@ -49,7 +49,7 @@
 }:

 let
-  inherit (cudaPackages) cudatoolkit cudaFlags cudnn nccl;
+  inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn nccl;

  pname = "jaxlib";
  version = "0.3.22";
@ -81,7 +81,7 @@ let
  cudatoolkit_cc_joined = symlinkJoin {
    name = "${cudatoolkit.cc.name}-merged";
    paths = [
-      cudatoolkit.cc
+      backendStdenv.cc
      binutils.bintools # for ar, dwp, nm, objcopy, objdump, strip
    ];
  };
@ -271,6 +271,7 @@ let
          sed -i 's@include/pybind11@pybind11@g' $src
        done
      '' + lib.optionalString cudaSupport ''
+        export NIX_LDFLAGS+=" -L${backendStdenv.nixpkgsCompatibleLibstdcxx}/lib"
        patchShebangs ../output/external/org_tensorflow/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
      '' + lib.optionalString stdenv.isDarwin ''
        # Framework search paths aren't added by bintools hook
--- a/pkgs/development/python-modules/jupyter-server-fileid/default.nix
+++ b/pkgs/development/python-modules/jupyter-server-fileid/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "jupyter-server-fileid";
-  version = "0.8.0";
+  version = "0.9.0";

  disables = pythonOlder "3.7";

@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "jupyter-server";
    repo = "jupyter_server_fileid";
    rev = "refs/tags/v${version}";
-    hash = "sha256-gJ+OM2b4JrdBObPnltqCWGK3e5p3K2XcoUohej3nDIM=";
+    hash = "sha256-3dwj8GV0FmbhSsC2uWOLcU5ofrvBBGJ/2F/noFh4RCU=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@ -21,7 +21,7 @@

 buildPythonPackage rec {
  pname = "mautrix";
-  version = "0.19.7";
+  version = "0.19.9";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@ -30,7 +30,7 @@ buildPythonPackage rec {
    owner = "mautrix";
    repo = "python";
    rev = "refs/tags/v${version}";
-    hash = "sha256-uL4eNMe+NXyE+kLy87zZPNBDuMnAt3KHT01ryFVfBZU=";
+    hash = "sha256-GyviaWFPiT0ka0IUFU53DLPT8R8kRhTztvKTG9b7ads=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/omnikinverter/default.nix
+++ b/pkgs/development/python-modules/omnikinverter/default.nix
@ -1,7 +1,6 @@
 { lib
 , aiohttp
 , aresponses
-, asynctest
 , buildPythonPackage
 , fetchFromGitHub
 , poetry-core
@ -13,7 +12,7 @@

 buildPythonPackage rec {
  pname = "omnikinverter";
-  version = "0.9.0";
+  version = "0.9.1";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -22,7 +21,7 @@ buildPythonPackage rec {
    owner = "klaasnicolaas";
    repo = "python-omnikinverter";
    rev = "refs/tags/v${version}";
-    hash = "sha256-V7rppl1u5QTzxkeLYgCFwgU6XuVENtb7EW/n+glwtSk=";
+    hash = "sha256-Vjfnwk9iIe5j+s/zJHQ2X095Eexp/aKtIi/k0sK45q0=";
  };

  nativeBuildInputs = [
@ -36,7 +35,6 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    aresponses
-    asynctest
    pytest-asyncio
    pytestCheckHook
  ];
@ -55,6 +53,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Python module for the Omnik Inverter";
    homepage = "https://github.com/klaasnicolaas/python-omnikinverter";
+    changelog = "https://github.com/klaasnicolaas/python-omnikinverter/releases/tag/v${version}";
    license = with licenses; [ mit ];
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "pontos";
-  version = "23.4.1";
+  version = "23.4.2";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "greenbone";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-siaOZClcqivFZlscPiEo3skL6oVjDEWrabP8I+IvQJ8=";
+    hash = "sha256-z7mZVcL7zu4SJZm22S6hbEWROb6OwesuqRNKFpXCe+U=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@ -4,7 +4,7 @@ assert dcompiler != null;

 stdenv.mkDerivation rec {
  pname = "dub";
-  version = "1.23.0";
+  version = "1.30.0";

  enableParallelBuilding = true;

@ -12,18 +12,17 @@ stdenv.mkDerivation rec {
    owner = "dlang";
    repo = "dub";
    rev = "v${version}";
-    sha256 = "06a4whsl1m600k096nwif83n7za3vr7pj1xwapncy5fcad1gmady";
+    sha256 = "sha256-iVl7bjblvIxvrUX7Phq6h4AIAmZjNVkGYYFA1hhsE7c=";
  };

-  postUnpack = ''
-      patchShebangs .
-  '';
-
-  # Can be removed with https://github.com/dlang/dub/pull/1368
  dubvar = "\\$DUB";
  postPatch = ''
-      substituteInPlace test/fetchzip.sh \
-          --replace "dub remove" "\"${dubvar}\" remove"
+    patchShebangs test
+
+
+    # Can be removed with https://github.com/dlang/dub/pull/1368
+    substituteInPlace test/fetchzip.sh \
+        --replace "dub remove" "\"${dubvar}\" remove"
  '';

  nativeBuildInputs = [ dcompiler libevent rsync ];
@ -50,7 +49,7 @@ stdenv.mkDerivation rec {
  checkPhase = ''
    export DUB=$NIX_BUILD_TOP/source/bin/dub
    export PATH=$PATH:$NIX_BUILD_TOP/source/bin/
-    export DC=${dcompiler.out}/bin/${dcompiler.pname}
+    export DC=${dcompiler.out}/bin/${if dcompiler.pname=="ldc" then "ldc2" else dcompiler.pname}
    echo "DC out --> $DC"
    export HOME=$TMP

@ -103,6 +102,7 @@ stdenv.mkDerivation rec {
    rm test/single-file-sdl-default-name.sh
    rm test/subpackage-common-with-sourcefile-globbing.sh
    rm test/issue934-path-dep.sh
+    rm -r test/issue2258-dynLib-exe-dep # requires files below
    rm -r test/1-dynLib-simple
    rm -r test/1-exec-simple-package-json
    rm -r test/1-exec-simple
@ -136,6 +136,7 @@ stdenv.mkDerivation rec {
    rm -r test/issue97-targettype-none-onerecipe
    rm -r test/path-subpackage-ref
    rm -r test/sdl-package-simple
+    rm -r test/dpath-variable # requires execution of dpath-variable.sh

    ./test/run-unittest.sh
  '';
--- a/pkgs/development/tools/cue/default.nix
+++ b/pkgs/development/tools/cue/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "cue";
-  version = "0.4.3";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "cue-lang";
    repo = "cue";
    rev = "v${version}";
-    hash = "sha256-v9MYrijnbtJpTgRZ4hmkaekisOyujldGewCRNbkVzWw=";
+    hash = "sha256-4E50VrekIkVXhzHVNehgm6/DbkofvqlNSgX9oK9SLu4=";
  };

  postPatch = ''
@ -16,7 +16,7 @@ buildGoModule rec {
    rm -f cmd/cue/cmd/script_test.go
  '';

-  vendorHash = "sha256-jTfV8DJlr5LxS3HjOEBkVzBvZKiySrmINumXSUIq2mI=";
+  vendorHash = "sha256-0N0bZdimGHu3vkLe+eGKBTm/YeSQOnp+Pxhz3LVniTk=";

  excludedPackages = [ "internal/ci/updatetxtar" "internal/cmd/embedpkg" "internal/cmd/qgo" "pkg/gen" ];

--- a/pkgs/development/tools/rust/cargo-lambda/Cargo.lock
+++ b/pkgs/development/tools/rust/cargo-lambda/Cargo.lock
--- a/pkgs/development/tools/rust/cargo-lambda/default.nix
+++ b/pkgs/development/tools/rust/cargo-lambda/default.nix
@ -1,33 +1,51 @@
 { lib
+, cacert
+, curl
 , rustPlatform
 , fetchFromGitHub
 , makeWrapper
+, pkg-config
+, openssl
 , stdenv
+, CoreServices
 , Security
-, cargo-watch
 , zig
 }:

 rustPlatform.buildRustPackage rec {
  pname = "cargo-lambda";
-  version = "0.13.0";
+  version = "0.18.1";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-JwrTwCn4qXcjXjy4cPYM3WCblJS0J5Xxnc6WESMwCpU=";
+    sha256 = "sha256-un+GQflxhMHCMH5UEeUVsYx59ryn7MR4ApooeOuhccc=";
  };

-  cargoSha256 = "sha256-p3q5S6IFQQgNp/MHGSUE1DVLFyMLWDTv/dxrUACKSWo=";
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "cargo-test-macro-0.1.0" = "sha256-XvTKAbP/r1BthpEM84CYZ2yfJczxqzscGkN4JXLgvfA=";
+    };
+  };

-  nativeBuildInputs = [ makeWrapper ];
+  nativeCheckInputs = [cacert];

-  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+  nativeBuildInputs = [ makeWrapper pkg-config ];
+
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl CoreServices Security ];

  checkFlags = [
-    # Disabled because it accesses the network.
+    # Disabled because they accesses the network.
+    "--skip=test_build_basic_extension"
+    "--skip=test_build_basic_function"
+    "--skip=test_build_http_function"
+    "--skip=test_build_logs_extension"
+    "--skip=test_build_telemetry_extension"
    "--skip=test_download_example"
+    "--skip=test_init_subcommand"
+    "--skip=test_init_subcommand_without_override"
  ];

  # remove date from version output to make reproducible
@ -36,7 +54,7 @@ rustPlatform.buildRustPackage rec {
  '';

  postInstall = ''
-    wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ cargo-watch zig ]}
+    wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ zig ]}
  '';

  CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)";
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@ -2,40 +2,25 @@
 , lib
 , callPackage
 , fetchFromGitHub
-, fetchpatch
 , rustPlatform
 , installShellFiles
 , tinycc
 , libiconv
-, libobjc
-, Security
-, CoreServices
-, Metal
-, Foundation
-, QuartzCore
+, darwin
 , librusty_v8 ? callPackage ./librusty_v8.nix { }
 }:

 rustPlatform.buildRustPackage rec {
  pname = "deno";
-  version = "1.31.1";
+  version = "1.32.3";

  src = fetchFromGitHub {
    owner = "denoland";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-0S5BSXWnv4DMcc8cijRQx6NyDReg5aJJT65TeNFlkkw=";
+    hash = "sha256-zltMn8ped1Euia/zRCvkpSUzJwFTpbZgrnot21x5tSA=";
  };
-  cargoHash = "sha256-7Xfnc91yQiAwAF5fvtiwnELUDb7LJeye3GtXNzYkUo8=";
-
-  cargoPatches = [
-    # resolved in 1.31.2
-    (fetchpatch {
-      name = "CVE-2023-28446.patch";
-      url = "https://github.com/denoland/deno/commit/78d430103a8f6931154ddbbe19d36f3b8630286d.patch";
-      hash = "sha256-kXwr9wWxk1OaaubCr8pfmSp3TrJMQkbAg72nIHp/seA=";
-    })
-  ];
+  cargoHash = "sha256-XDs3f44ta9MaJlaMWRVkNZd9DaOfoSHJluUmL68DWOw=";

  postPatch = ''
    # upstream uses lld on aarch64-darwin for faster builds
@ -44,8 +29,10 @@ rustPlatform.buildRustPackage rec {
  '';

  nativeBuildInputs = [ installShellFiles ];
-  buildInputs = lib.optionals stdenv.isDarwin
-    [ libiconv libobjc Security CoreServices Metal Foundation QuartzCore ];
+  buildInputs = lib.optionals stdenv.isDarwin (
+    [ libiconv darwin.libobjc ] ++
+    (with darwin.apple_sdk.frameworks; [ Security CoreServices Metal Foundation QuartzCore ])
+  );

  buildAndTestSubdir = "cli";

--- a/pkgs/development/web/deno/librusty_v8.nix
+++ b/pkgs/development/web/deno/librusty_v8.nix
@ -11,11 +11,11 @@ let
  };
 in
 fetch_librusty_v8 {
-  version = "0.63.0";
+  version = "0.68.0";
  shas = {
-    x86_64-linux = "sha256-D1NLAFMD1B4NOaBFsKBin5Gs+hmNC9LgNy3Z+w/1VGs=";
-    aarch64-linux = "sha256-3V2WWMCjJNiuCRmx66ISBk+pzvCKCqvOE9F3YWESABo=";
-    x86_64-darwin = "sha256-rUWSHxlFDT4cDoTLhSgRr04+2/oroeIiWURHbNDcMF8=";
-    aarch64-darwin = "sha256-LaoIjHrBqWn0BIpAOaiHAg5qCGoPlSHtFhiAi4og9q0=";
+    x86_64-linux = "sha256-yq7YPD2TM6Uw0EvCqIsZ/lbE1RLgIg7a42qDVrr5fX4=";
+    aarch64-linux = "sha256-uZFm3hAeyEUUXqRJFLM3OBVfglH3AecjFKVgeJZu3L0=";
+    x86_64-darwin = "sha256-YkxoggK0I4rT/KNJ30StDPLUc02Mdjwal3JH+s/YTQo=";
+    aarch64-darwin = "sha256-aXE7W3sSzbhvC661BYTTHyHlihmVVtFSv85nSjGOLkU=";
  };
 }
--- a/pkgs/development/web/deno/update/src.ts
+++ b/pkgs/development/web/deno/update/src.ts
@ -15,12 +15,12 @@ interface Replacer {

 const log = logger("src");

-const prefetchSha256 = (nixpkgs: string, version: string) =>
+const prefetchHash = (nixpkgs: string, version: string) =>
  run("nix-prefetch", ["-f", nixpkgs, "deno.src", "--rev", version]);
-const prefetchCargoSha256 = (nixpkgs: string) =>
+const prefetchCargoHash = (nixpkgs: string) =>
  run(
    "nix-prefetch",
-    [`{ sha256 }: (import ${nixpkgs} {}).deno.cargoDeps.overrideAttrs (_: { inherit sha256; })`],
+    [`{ sha256 }: (import ${nixpkgs} {}).deno.cargoDeps.overrideAttrs (_: { hash = sha256; })`],
  );

 const replace = (str: string, replacers: Replacer[]) =>
@ -45,23 +45,23 @@ export async function updateSrc(
  denoVersion: string,
 ) {
  log("Starting src update");
-  const trimVersion = denoVersion.substr(1);
-  log("Fetching sha256 for:", trimVersion);
-  const sha256 = await prefetchSha256(nixpkgs, denoVersion);
+  const trimVersion = denoVersion.substring(1);
+  log("Fetching hash for:", trimVersion);
+  const sha256 = await prefetchHash(nixpkgs, denoVersion);
  log("sha256 to update:", sha256);
  await updateNix(
    filePath,
    [
      genVerReplacer("version", trimVersion),
-      genShaReplacer("sha256", sha256),
+      genShaReplacer("hash", sha256),
    ],
  );
-  log("Fetching cargoSha256 for:", sha256);
-  const cargoSha256 = await prefetchCargoSha256(nixpkgs);
-  log("cargoSha256 to update:", cargoSha256);
+  log("Fetching cargoHash for:", sha256);
+  const cargoHash = await prefetchCargoHash(nixpkgs);
+  log("cargoHash to update:", cargoHash);
  await updateNix(
    filePath,
-    [genShaReplacer("cargoSha256", cargoSha256)],
+    [genShaReplacer("cargoHash", cargoHash)],
  );
  log("Finished src update");
 }
--- a/pkgs/games/katago/default.nix
+++ b/pkgs/games/katago/default.nix
@ -14,28 +14,26 @@
 , openssl
 , writeShellScriptBin
 , enableAVX2 ? stdenv.hostPlatform.avx2Support
+, backend ? "opencl"
 , enableBigBoards ? false
-, enableCuda ? false
 , enableContrib ? false
-, enableGPU ? true
 , enableTcmalloc ? true
 }:

-assert !enableGPU -> (
-  !enableCuda);
+assert lib.assertOneOf "backend" backend [ "opencl" "cuda" "tensorrt" "eigen" ];

 # N.b. older versions of cuda toolkit (e.g. 10) do not support newer versions
 # of gcc.  If you need to use cuda10, please override stdenv with gcc8Stdenv
 stdenv.mkDerivation rec {
  pname = "katago";
-  version = "1.11.0";
-  githash = "d8d0cd76cf73df08af3d7061a639488ae9494419";
+  version = "1.12.4";
+  githash = "75280bf26582090dd4985dca62bc7124116c856d";

  src = fetchFromGitHub {
    owner = "lightvector";
    repo = "katago";
    rev = "v${version}";
-    sha256 = "sha256-TZKkkYe2PPzgPhItBZBSJDwU3anhsujuCGIYru55OtU=";
+    sha256 = "sha256-1rznAxEFJ/Ah5/WiSwc+rtITOUOPYOua5BLKeqHOBr0=";
  };

  fakegit = writeShellScriptBin "git" "echo ${githash}";
@ -48,13 +46,17 @@ stdenv.mkDerivation rec {
  buildInputs = [
    libzip
    boost
-  ] ++ lib.optionals (!enableGPU) [
+  ] ++ lib.optionals (backend == "eigen") [
    eigen
-  ] ++ lib.optionals (enableGPU && enableCuda) [
+  ] ++ lib.optionals (backend == "cuda") [
    cudaPackages.cudnn
    cudaPackages.cudatoolkit
    mesa.drivers
-  ] ++ lib.optionals (enableGPU && !enableCuda) [
+  ] ++ lib.optionals (backend == "tensorrt") [
+      cudaPackages.cudatoolkit
+      cudaPackages.tensorrt
+      mesa.drivers
+  ] ++ lib.optionals (backend == "opencl") [
    opencl-headers
    ocl-icd
  ] ++ lib.optionals enableContrib [
@ -65,13 +67,15 @@ stdenv.mkDerivation rec {

  cmakeFlags = [
    "-DNO_GIT_REVISION=ON"
-  ] ++ lib.optionals (!enableGPU) [
-    "-DUSE_BACKEND=EIGEN"
  ] ++ lib.optionals enableAVX2 [
    "-DUSE_AVX2=ON"
-  ] ++ lib.optionals (enableGPU && enableCuda) [
+  ] ++ lib.optionals (backend == "eigen") [
+    "-DUSE_BACKEND=EIGEN"
+  ] ++ lib.optionals (backend == "cuda") [
    "-DUSE_BACKEND=CUDA"
-  ] ++ lib.optionals (enableGPU && !enableCuda) [
+  ] ++ lib.optionals (backend == "tensorrt") [
+    "-DUSE_BACKEND=TENSORRT"
+  ] ++ lib.optionals (backend == "opencl") [
    "-DUSE_BACKEND=OPENCL"
  ] ++ lib.optionals enableContrib [
    "-DBUILD_DISTRIBUTED=1"
@ -85,7 +89,7 @@ stdenv.mkDerivation rec {

  preConfigure = ''
    cd cpp/
-  '' + lib.optionalString enableCuda ''
+  '' + lib.optionalString (backend == "cuda" || backend == "tensorrt") ''
    export CUDA_PATH="${cudaPackages.cudatoolkit}"
    export EXTRA_LDFLAGS="-L/run/opengl-driver/lib"
  '';
@ -93,7 +97,7 @@ stdenv.mkDerivation rec {
  installPhase = ''
    runHook preInstall
    mkdir -p $out/bin; cp katago $out/bin;
-  '' + lib.optionalString enableCuda ''
+  '' + lib.optionalString (backend == "cuda" || backend == "tensorrt") ''
    wrapProgram $out/bin/katago \
      --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib"
  '' + ''
--- a/pkgs/games/path-of-building/default.nix
+++ b/pkgs/games/path-of-building/default.nix
@ -0,0 +1,69 @@
+{ stdenv, lib, fetchFromGitHub, runCommand, unzip, meson, ninja, pkg-config, qtbase, qttools, wrapQtAppsHook, luajit }:
+let
+  dataVersion = "2.28.0";
+  frontendVersion = "unstable-2023-04-09";
+in
+stdenv.mkDerivation {
+  pname = "path-of-building";
+  version = "${dataVersion}-${frontendVersion}";
+
+  src = fetchFromGitHub {
+    owner = "ernstp";
+    repo = "pobfrontend";
+    rev = "9faa19aa362f975737169824c1578d5011487c18";
+    hash = "sha256-zhw2PZ6ZNMgZ2hG+a6AcYBkeg7kbBHNc2eSt4if17Wk=";
+  };
+
+  data = runCommand "path-of-building-data" {
+    src = fetchFromGitHub {
+      owner = "PathOfBuildingCommunity";
+      repo = "PathOfBuilding";
+      rev = "v${dataVersion}";
+      hash = "sha256-IO6qUE6OcjNibljNzcJQlwji3DZqrBm7cvHedKuAwpM=";
+    };
+
+    nativeBuildInputs = [ unzip ];
+  }
+  ''
+    # I have absolutely no idea how this file is generated
+    # and I don't think I want to know. The Flatpak also does this.
+    unzip -j -d $out $src/runtime-win32.zip lua/sha1.lua
+
+    # Install the actual data
+    cp -r $src/src $src/runtime/lua/*.lua $src/manifest.xml $out
+
+    # Pretend this is an official build so we don't get the ugly "dev mode" warning
+    substituteInPlace $out/manifest.xml --replace '<Version' '<Version platform="nixos"'
+    touch $out/installed.cfg
+
+    # Completely stub out the update check
+    chmod +w $out/src/UpdateCheck.lua
+    echo 'return "none"' > $out/src/UpdateCheck.lua
+  '';
+
+  nativeBuildInputs = [ meson ninja pkg-config qttools wrapQtAppsHook ];
+  buildInputs = [ qtbase luajit luajit.pkgs.lua-curl ];
+  dontWrapQtApps = true;
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm555 pobfrontend $out/bin/pobfrontend
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    wrapQtApp $out/bin/pobfrontend \
+      --set LUA_PATH "$LUA_PATH" \
+      --set LUA_CPATH "$LUA_CPATH" \
+      --chdir "$data"
+  '';
+
+  meta = {
+    description = "Offline build planner for Path of Exile";
+    homepage = "https://pathofbuilding.community/";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.k900 ];
+    mainProgram = "pobfrontend";
+    broken = stdenv.isDarwin;  # doesn't find uic6 for some reason
+  };
+}
--- a/pkgs/servers/monitoring/grafana-agent/default.nix
+++ b/pkgs/servers/monitoring/grafana-agent/default.nix
@ -2,16 +2,17 @@

 buildGoModule rec {
  pname = "grafana-agent";
-  version = "0.30.2";
+  version = "0.32.1";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "grafana";
    repo = "agent";
-    sha256 = "sha256-yexCK4GBA997CShtuQQTs1GBsXoknUnWWO0Uotb9EG8=";
+    sha256 = "sha256-t5rQSNLpX0ktK4mKgX6OhNLkANQ1LbFEjmQo/r7UHOM=";
  };

-  vendorHash = "sha256-Cl3oygH1RPF+ZdJvkDmr7eyU5daxaZwNE8pQOHK/qP4=";
+  vendorHash = "sha256-5beHG1mZkNcDhccleqTlMA+uiV5d6SSh2QWiL4g3O28=";
+  proxyVendor = true; # darwin/linux hash mismatch

  ldflags = let
    prefix = "github.com/grafana/agent/pkg/build";
@ -32,26 +33,21 @@ buildGoModule rec {
  ];

  subPackages = [
-    "cmd/agent"
-    "cmd/agentctl"
+    "cmd/grafana-agent"
+    "cmd/grafana-agentctl"
  ];

  # uses go-systemd, which uses libsystemd headers
  # https://github.com/coreos/go-systemd/issues/351
  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isLinux [ "-I${lib.getDev systemd}/include" ]);

-  # tries to access /sys: https://github.com/grafana/agent/issues/333
-  preBuild = ''
-    rm pkg/integrations/node_exporter/node_exporter_test.go
-  '';
-
  # go-systemd uses libsystemd under the hood, which does dlopen(libsystemd) at
  # runtime.
  # Add to RUNPATH so it can be found.
  postFixup = lib.optionalString stdenv.isLinux ''
    patchelf \
-      --set-rpath "${lib.makeLibraryPath [ (lib.getLib systemd) ]}:$(patchelf --print-rpath $out/bin/agent)" \
-      $out/bin/agent
+      --set-rpath "${lib.makeLibraryPath [ (lib.getLib systemd) ]}:$(patchelf --print-rpath $out/bin/grafana-agent)" \
+      $out/bin/grafana-agent
  '';

  passthru.tests.grafana-agent = nixosTests.grafana-agent;
@ -60,6 +56,6 @@ buildGoModule rec {
    description = "A lightweight subset of Prometheus and more, optimized for Grafana Cloud";
    license = licenses.asl20;
    homepage = "https://grafana.com/products/cloud";
-    maintainers = with maintainers; [ flokli ];
+    maintainers = with maintainers; [ flokli indeednotjames ];
  };
 }
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@ -28,6 +28,8 @@ buildGoModule rec {
    "cmd/logcli"
  ];

+  tags = ["promtail_journal_enabled"];
+
  nativeBuildInputs = [ makeWrapper ];
  buildInputs = lib.optionals stdenv.isLinux [ systemd.dev ];

--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@ -51,11 +51,11 @@ with lib;

 stdenv.mkDerivation rec {
  pname = "samba";
-  version = "4.17.5";
+  version = "4.17.7";

  src = fetchurl {
    url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
-    hash = "sha256-67eIDUdP/AnXO1/He8vWV/YjWRAzczGpwk1/acoRRCs=";
+    hash = "sha256-lcnBa2VKiM+u/ZWAUt1XPi+F7N8RTk7Owxh1N6CU2Rk=";
  };

  outputs = [ "out" "dev" "man" ];
--- a/pkgs/tools/graphics/mangohud/default.nix
+++ b/pkgs/tools/graphics/mangohud/default.nix
@ -13,7 +13,6 @@
 , hwdata
 , libX11
 , mangohud32
-, vulkan-headers
 , appstream
 , glslang
 , makeWrapper
@ -22,7 +21,6 @@
 , ninja
 , pkg-config
 , unzip
-, vulkan-loader
 , libXNVCtrl
 , wayland
 , glew
@ -69,6 +67,21 @@ let
      sha256 = "sha256-PDjyddV5KxKGORECWUMp6YsXc3kks0T5gxKrCZKbdL4=";
    };
  };
+
+  # Derived from subprojects/vulkan-headers.wrap
+  vulkan-headers = rec {
+    version = "1.2.158";
+    src = fetchFromGitHub {
+      owner = "KhronosGroup";
+      repo = "Vulkan-Headers";
+      rev = "v${version}";
+      hash = "sha256-5uyk2nMwV1MjXoa3hK/WUeGLwpINJJEvY16kc5DEaks=";
+    };
+    patch = fetchurl {
+      url = "https://wrapdb.mesonbuild.com/v2/vulkan-headers_${version}-2/get_patch";
+      hash = "sha256-hgNYz15z9FjNHoj4w4EW0SOrQh1c4uQSnsOOrt2CDhc=";
+    };
+  };
 in stdenv.mkDerivation rec {
  pname = "mangohud";
  version = "0.6.8";
@ -88,8 +101,11 @@ in stdenv.mkDerivation rec {
    cd "$sourceRoot/subprojects"
    cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version}
    cp -R --no-preserve=mode,ownership ${spdlog.src} spdlog-${spdlog.version}
+    cp -R --no-preserve=mode,ownership ${vulkan-headers.src} Vulkan-Headers-${vulkan-headers.version}
  )'';

+  env.NIX_CFLAGS_COMPILE = "-I${vulkan-headers.src}/include";
+
  patches = [
    # Hard code dependencies. Can't use makeWrapper since the Vulkan
    # layer can be used without the mangohud executable by setting MANGOHUD=1.
@ -126,11 +142,10 @@ in stdenv.mkDerivation rec {
    cd subprojects
    unzip ${imgui.patch}
    unzip ${spdlog.patch}
+    unzip ${vulkan-headers.patch}
  )'';

  mesonFlags = [
-    "-Duse_system_vulkan=enabled"
-    "-Dvulkan_datadir=${vulkan-headers}/share"
    "-Dwith_wayland=enabled"
  ] ++ lib.optionals gamescopeSupport [
    "-Dmangoapp_layer=true"
@ -147,7 +162,6 @@ in stdenv.mkDerivation rec {
    ninja
    pkg-config
    unzip
-    vulkan-loader
  ];

  buildInputs = [
@ -159,7 +173,6 @@ in stdenv.mkDerivation rec {
    glew
    glfw
    nlohmann_json
-    vulkan-headers
    xorg.libXrandr
  ];

--- a/pkgs/tools/misc/qmk/default.nix
+++ b/pkgs/tools/misc/qmk/default.nix
@ -11,12 +11,12 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "qmk";
-  version = "1.1.1";
+  version = "1.1.2";
  format = "pyproject";

  src = python3.pkgs.fetchPypi {
    inherit pname version;
-    hash = "sha256-3QKOCevNYfi9+MuCkp36/A4AfZelo4A7RYGbRkF3Mmk=";
+    hash = "sha256-+HH4jxoMoxujGgCdcWQX5GvFOKT4347eaoAckHbCKZg=";
  };

  nativeBuildInputs = with python3.pkgs; [
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@ -14,13 +14,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "starship";
-  version = "1.14.1";
+  version = "1.14.2";

  src = fetchFromGitHub {
    owner = "starship";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-KhuAgC58oEdUiCWZjUShfDpNe0m0ENfn2QJVOlzpIyo=";
+    hash = "sha256-t+Ur6QmemMz6WAZnii7f2O+9R7hPp+5oej4PuaifznE=";
  };

  nativeBuildInputs = [ installShellFiles cmake ];
@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
      --zsh <($out/bin/starship completions zsh)
  '';

-  cargoHash = "sha256-gdJzH2/gJDg3sNR28Daq4B+KEn565jXhkxZFsrVx/uI=";
+  cargoHash = "sha256-NSUId0CXTRF1Qqo9XPDgxY2vMyMBuJtJYGGuQ0HHk90=";

  nativeCheckInputs = [ git ];

--- a/pkgs/tools/misc/twm/default.nix
+++ b/pkgs/tools/misc/twm/default.nix
@ -0,0 +1,32 @@
+{ lib
+, fetchFromGitHub
+, stdenv
+, rustPlatform
+, openssl
+, pkg-config
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "twm";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "vinnymeller";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-YURzNHbmGLEqNEcc4FImIqn/KcRwGdxYXM5QzM3dxbo=";
+  };
+
+  cargoHash = "sha256-sc2/eQZjY1x5KIzQ+yr8NgAMKJ6iHWwCy6fRSBp7Fw4=";
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with lib; {
+    description = "A customizable workspace manager for tmux";
+    homepage = "https://github.com/vinnymeller/twm";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ vinnymeller ];
+  };
+}
--- a/pkgs/tools/misc/zellij/default.nix
+++ b/pkgs/tools/misc/zellij/default.nix
@ -15,16 +15,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "zellij";
-  version = "0.35.2";
+  version = "0.36.0";

  src = fetchFromGitHub {
    owner = "zellij-org";
    repo = "zellij";
    rev = "v${version}";
-    sha256 = "sha256-2wgv84Qm/X5mcEcM5ch7tFHZVg/xassUOtssSzbr0fs=";
+    sha256 = "sha256-6hd4vZfcztD+i3hRP057Z9kYbl/QYK7e5X18tKRmNVQ=";
  };

-  cargoSha256 = "sha256-GAPzWmFUtLWlcDAGHhEowvjM/OKRUuuD/0aa1tbmKuI=";
+  cargoSha256 = "sha256-71HQ/75tl6ogGm5geDPZtz8oYCxUkAWUrU1lhK2AG0c=";

  nativeBuildInputs = [
    mandown
--- a/pkgs/tools/networking/qrcp/default.nix
+++ b/pkgs/tools/networking/qrcp/default.nix
@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "qrcp";
-  version = "0.10.0";
+  version = "0.10.1";

  src = fetchFromGitHub {
    owner = "claudiodangelis";
    repo = "qrcp";
    rev = version;
-    sha256 = "sha256-pGFqKnOZhwuyN0lHmQPLQ4bJhMsMYoxbh0oEJdK1wAQ=";
+    sha256 = "sha256-3GPZ6+gx5i/xULM3lq7D+b0onBC6clgeZsI1CvZ943s=";
  };

  vendorSha256 = "sha256-XVBDPhQsnUdftS+jZ1zWZlfSbFXxXrKSqiGTPpLq5i0=";
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -3180,9 +3180,7 @@ with pkgs;

  cudd = callPackage ../development/libraries/cudd { };

-  cue = callPackage ../development/tools/cue {
-    buildGoModule = buildGo118Module; # tests fail with 1.19
-  };
+  cue = callPackage ../development/tools/cue { };

  writeCueValidator = callPackage ../development/tools/cue/validator.nix { };

@ -6390,6 +6388,8 @@ with pkgs;

  changetower = callPackage ../tools/networking/changetower { };

+  chatblade = callPackage ../applications/misc/chatblade { };
+
  checkbashisms = callPackage ../development/tools/misc/checkbashisms { };

  checkmate = callPackage ../development/tools/checkmate { };
@ -6624,11 +6624,7 @@ with pkgs;

  deer = callPackage ../shells/zsh/zsh-deer { };

-  deno = callPackage ../development/web/deno {
-    inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks)
-      Security CoreServices Metal Foundation QuartzCore;
-  };
+  deno = callPackage ../development/web/deno { };

  detox = callPackage ../tools/misc/detox { };

@ -11408,6 +11404,8 @@ with pkgs;
    inherit (qt5) qttools;
  };

+  revolt-desktop = callPackage ../applications/networking/instant-messengers/revolt-desktop { };
+
  rbw = callPackage ../tools/security/rbw {
    inherit (darwin.apple_sdk.frameworks) Security;
  };
@ -13027,6 +13025,10 @@ with pkgs;

  ttylog = callPackage ../tools/misc/ttylog { };

+  twm = callPackage ../tools/misc/twm {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
  txtpbfmt = callPackage ../development/tools/txtpbfmt { };

  ipbt = callPackage ../tools/misc/ipbt { };
@ -16085,7 +16087,7 @@ with pkgs;
  };
  cargo-insta = callPackage ../development/tools/rust/cargo-insta { };
  cargo-lambda = callPackage ../development/tools/rust/cargo-lambda {
-    inherit (darwin.apple_sdk.frameworks) Security;
+    inherit (darwin.apple_sdk.frameworks) CoreServices Security;
  };
  cargo-limit = callPackage ../development/tools/rust/cargo-limit { };
  cargo-make = callPackage ../development/tools/rust/cargo-make {
@ -36022,11 +36024,15 @@ with pkgs;
  katago = callPackage ../games/katago { };

  katagoWithCuda = katago.override {
-    enableCuda = true;
+    backend = "cuda";
  };

  katagoCPU = katago.override {
-    enableGPU = false;
+    backend = "eigen";
+  };
+
+  katagoTensorRT = katago.override {
+    backend = "tensorrt";
  };

  klavaro = callPackage ../games/klavaro { };
@ -36250,6 +36256,8 @@ with pkgs;

  papermc = callPackage ../games/papermc { };

+  path-of-building = qt6Packages.callPackage ../games/path-of-building {};
+
  pentobi = libsForQt5.callPackage ../games/pentobi { };

  performous = callPackage ../games/performous { };