Merge master into haskell-updates

2023-03-14 00:12:36 +00:00 · 2023-03-14 00:12:36 +00:00 · 484fe9b796
commit 484fe9b796
parent 89bea5dba8 49e2b72425
174 changed files with 5933 additions and 1770 deletions
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@ -333,6 +333,66 @@ rec {
      ) (attrNames set)
    );

+   /*
+    Like builtins.foldl' but for attribute sets.
+    Iterates over every name-value pair in the given attribute set.
+    The result of the callback function is often called `acc` for accumulator. It is passed between callbacks from left to right and the final `acc` is the return value of `foldlAttrs`.
+
+    Attention:
+      There is a completely different function
+      `lib.foldAttrs`
+      which has nothing to do with this function, despite the similar name.
+
+    Example:
+      foldlAttrs
+        (acc: name: value: {
+          sum = acc.sum + value;
+          names = acc.names ++ [name];
+        })
+        { sum = 0; names = []; }
+        {
+          foo = 1;
+          bar = 10;
+        }
+      ->
+        {
+          sum = 11;
+          names = ["bar" "foo"];
+        }
+
+      foldlAttrs
+        (throw "function not needed")
+        123
+        {};
+      ->
+        123
+
+      foldlAttrs
+        (_: _: v: v)
+        (throw "initial accumulator not needed")
+        { z = 3; a = 2; };
+      ->
+        3
+
+      The accumulator doesn't have to be an attrset.
+      It can be as simple as a number or string.
+
+      foldlAttrs
+        (acc: _: v: acc * 10 + v)
+        1
+        { z = 1; a = 2; };
+      ->
+        121
+
+    Type:
+      foldlAttrs :: ( a -> String -> b -> a ) -> a -> { ... :: b } -> a
+  */
+  foldlAttrs = f: init: set:
+    foldl'
+      (acc: name: f acc name set.${name})
+      init
+      (attrNames set);
+
  /* Apply fold functions to values grouped by key.

     Example:
--- a/lib/default.nix
+++ b/lib/default.nix
@ -78,7 +78,7 @@ let
      composeManyExtensions makeExtensible makeExtensibleWithCustomName;
    inherit (self.attrsets) attrByPath hasAttrByPath setAttrByPath
      getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs
-      filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs
+      filterAttrsRecursive foldlAttrs foldAttrs collect nameValuePair mapAttrs
      mapAttrs' mapAttrsToList concatMapAttrs mapAttrsRecursive mapAttrsRecursiveCond
      genAttrs isDerivation toDerivation optionalAttrs
      zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@ -533,6 +533,37 @@ runTests {
    };
  };

+  # code from example
+  testFoldlAttrs = {
+    expr = {
+      example = foldlAttrs
+        (acc: name: value: {
+          sum = acc.sum + value;
+          names = acc.names ++ [ name ];
+        })
+        { sum = 0; names = [ ]; }
+        {
+          foo = 1;
+          bar = 10;
+        };
+      # should just return the initial value
+      emptySet = foldlAttrs (throw "function not needed") 123 { };
+      # should just evaluate to the last value
+      accNotNeeded = foldlAttrs (_acc: _name: v: v) (throw "accumulator not needed") { z = 3; a = 2; };
+      # the accumulator doesnt have to be an attrset it can be as trivial as being just a number or string
+      trivialAcc = foldlAttrs (acc: _name: v: acc * 10 + v) 1 { z = 1; a = 2; };
+    };
+    expected = {
+      example = {
+        sum = 11;
+        names = [ "bar" "foo" ];
+      };
+      emptySet = 123;
+      accNotNeeded = 3;
+      trivialAcc = 121;
+    };
+  };
+
  # code from the example
  testRecursiveUpdateUntil = {
    expr = recursiveUpdateUntil (path: l: r: path == ["foo"]) {
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -578,6 +578,12 @@
    githubId = 43479487;
    name = "Titouan Biteau";
  };
+  aleksana = {
+    email = "me@aleksana.moe";
+    github = "Aleksanaa";
+    githubId = 42209822;
+    name = "Aleksana QwQ";
+  };
  alekseysidorov = {
    email = "sauron1987@gmail.com";
    github = "alekseysidorov";
@ -8678,6 +8684,12 @@
      fingerprint = "74F5 E5CC 19D3 B5CB 608F  6124 68FF 81E6 A785 0F49";
    }];
  };
+  longer = {
+    email = "michal@mieszczak.com.pl";
+    name = "Michał Mieszczak";
+    github = "LongerHV";
+    githubId = 46924944;
+  };
  lourkeur = {
    name = "Louis Bettens";
    email = "louis@bettens.info";
@ -9191,6 +9203,12 @@
    githubId = 50230945;
    name = "Marcus Boyd";
  };
+  marcusramberg = {
+    email = "marcus@means.no";
+    github = "marcusramberg";
+    githubId = 5526;
+    name = "Marcus Ramberg";
+  };
  marenz = {
    email = "marenz@arkom.men";
    github = "marenz2569";
@ -11279,6 +11297,15 @@
    githubId = 111265;
    name = "Ozan Sener";
  };
+  ostrolucky = {
+    email = "gabriel.ostrolucky@gmail.com";
+    github = "ostrolucky";
+    githubId = 496233;
+    name = "Gabriel Ostrolucký";
+    keys = [{
+      fingerprint = "6611 22A7 B778 6E4A E99A  9D6E C79A D015 19EF B134";
+    }];
+  };
  otavio = {
    email = "otavio.salvador@ossystems.com.br";
    github = "otavio";
@ -15047,6 +15074,12 @@
      fingerprint = "7F3E EEAA EE66 93CC 8782  042A 7550 7BE2 56F4 0CED";
    }];
  };
+  Tungsten842 = {
+    name = "Tungsten842";
+    email = "886724vf@anonaddy.me";
+    github = "Tungsten842";
+    githubId = 24614168;
+  };
  tiagolobocastro = {
    email = "tiagolobocastro@gmail.com";
    github = "tiagolobocastro";
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@ -69,6 +69,8 @@ In addition to numerous new and upgraded packages, this release has the followin

 - [sharing](https://github.com/parvardegr/sharing), a command-line tool to share directories and files from the CLI to iOS and Android devices without the need of an extra client app. Available as [programs.sharing](#opt-programs.sharing.enable).

+- [nimdow](https://github.com/avahe-kellenberger/nimdow), a window manager written in Nim, inspired by dwm.
+
 ## Backward Incompatibilities {#sec-release-23.05-incompatibilities}

 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@ -127,9 +127,6 @@ if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") {
 push @kernelModules, "kvm-intel" if hasCPUFeature "vmx";
 push @kernelModules, "kvm-amd" if hasCPUFeature "svm";

-push @attrs, "hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "AuthenticAMD";
-push @attrs, "hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "GenuineIntel";
-

 # Look at the PCI devices and add necessary modules.  Note that most
 # modules are auto-detected so we don't need to list them here.
@ -324,11 +321,15 @@ if ($virt eq "systemd-nspawn") {
 }


-# Provide firmware for devices that are not detected by this script,
-# unless we're in a VM/container.
-push @imports, "(modulesPath + \"/installer/scan/not-detected.nix\")"
-    if $virt eq "none";
+# Check if we're on bare metal, not in a VM/container.
+if ($virt eq "none") {
+    # Provide firmware for devices that are not detected by this script.
+    push @imports, "(modulesPath + \"/installer/scan/not-detected.nix\")";

+    # Update the microcode.
+    push @attrs, "hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "AuthenticAMD";
+    push @attrs, "hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "GenuineIntel";
+}

 # For a device name like /dev/sda1, find a more stable path like
 # /dev/disk/by-uuid/X or /dev/disk/by-label/Y.
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -1273,6 +1273,7 @@
  ./services/x11/window-managers/bspwm.nix
  ./services/x11/window-managers/katriawm.nix
  ./services/x11/window-managers/metacity.nix
+  ./services/x11/window-managers/nimdow.nix
  ./services/x11/window-managers/none.nix
  ./services/x11/window-managers/twm.nix
  ./services/x11/window-managers/windowlab.nix
--- a/nixos/modules/programs/atop.nix
+++ b/nixos/modules/programs/atop.nix
@ -151,6 +151,8 @@ in
                  if ! ${pkgs.diffutils}/bin/cmp -s "$logfile" "$logfile".new
                  then
                    ${pkgs.coreutils}/bin/mv -v -f "$logfile".new "$logfile"
+                  else
+                    ${pkgs.coreutils}/bin/rm -f "$logfile".new
                  fi
                done
              '';
--- a/nixos/modules/services/x11/window-managers/nimdow.nix
+++ b/nixos/modules/services/x11/window-managers/nimdow.nix
@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.windowManager.nimdow;
+in
+{
+  options = {
+    services.xserver.windowManager.nimdow.enable = mkEnableOption (lib.mdDoc "nimdow");
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
+      name = "nimdow";
+      start = ''
+        ${pkgs.nimdow}/bin/nimdow &
+        waitPID=$!
+      '';
+    };
+    environment.systemPackages = [ pkgs.nimdow ];
+  };
+}
--- a/nixos/tests/garage/default.nix
+++ b/nixos/tests/garage/default.nix
@ -49,5 +49,5 @@ in
  })
  {}
  [
-    "0_8_0"
+    "0_8"
  ]
--- a/pkgs/applications/audio/easyeffects/default.nix
+++ b/pkgs/applications/audio/easyeffects/default.nix
@ -37,13 +37,13 @@

 stdenv.mkDerivation rec {
  pname = "easyeffects";
-  version = "7.0.0";
+  version = "7.0.1";

  src = fetchFromGitHub {
    owner = "wwmm";
    repo = "easyeffects";
    rev = "v${version}";
-    sha256 = "sha256-SjhJj5kClPd8DT1vzbSdqJ9AJw0XiX9Q8/R8SDnxGPQ=";
+    sha256 = "sha256-PI29TJSYa/dARlSHe4mO4ejV+muhGFhwVvhA10jziTA=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/editors/neovim/neovim-gtk.nix
+++ b/pkgs/applications/editors/neovim/neovim-gtk.nix
@ -0,0 +1,40 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, wrapGAppsHook4
+, pkg-config
+, gdk-pixbuf
+, gtk4
+, pango
+, vte-gtk4
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "neovim-gtk";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "Lyude";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-inva7pYwOw3bXvFeKZ4aKSQ65iCat5HxM+NME8jN4/I=";
+  };
+
+  cargoHash = "sha256-9eZwCOP4xQtFOieqVRBAdXZrXmzdnae6PexGJ/eCyYc=";
+
+  nativeBuildInputs = [ wrapGAppsHook4 pkg-config ];
+
+  buildInputs = [ gdk-pixbuf gtk4 pango vte-gtk4 ];
+
+  postInstall = ''
+    make PREFIX=$out install-resources
+  '';
+
+  meta = with lib; {
+    description = "Gtk ui for neovim";
+    homepage = "https://github.com/Lyude/neovim-gtk";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ aleksana ];
+    mainProgram = "nvim-gtk";
+  };
+}
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -29,12 +29,12 @@ final: prev:

  ChatGPT-nvim = buildVimPluginFrom2Nix {
    pname = "ChatGPT.nvim";
-    version = "2023-03-11";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "jackMort";
      repo = "ChatGPT.nvim";
-      rev = "3ad20aeee036378478bfb75788c6e287964ece8e";
-      sha256 = "1wjj3gv3qpa9liy7sz14ah7np6k3qw5vnkx6qggm9rzcrqf7jidp";
+      rev = "783a23c70ca6b43b4591fce9bdfeda408e2d6415";
+      sha256 = "0a9ys9d2b6hj0vi7x6x20s6dh09slm851wy9kn7ya43vycvx4v2h";
    };
    meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
  };
@ -293,12 +293,12 @@ final: prev:

  SchemaStore-nvim = buildVimPluginFrom2Nix {
    pname = "SchemaStore.nvim";
-    version = "2023-03-10";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "b0o";
      repo = "SchemaStore.nvim";
-      rev = "083485d0ec106c46eb38b525342dc8e23a9921c9";
-      sha256 = "1bcjh8a3mqvnbgp12c3ln7snwaarrdsn33bi1lwvcdas341gk23v";
+      rev = "1dc606bf07e1419d785e04d6dbb8585987d817cc";
+      sha256 = "0l7vmvr5rfn7bjaia505aqwwvvhpbc3f6mfn8q49an3nngwf2plh";
    };
    meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
  };
@ -703,12 +703,12 @@ final: prev:

  aurora = buildVimPluginFrom2Nix {
    pname = "aurora";
-    version = "2023-03-08";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "ray-x";
      repo = "aurora";
-      rev = "31113f89c8b558f59cf3867079c8c5520b6945ba";
-      sha256 = "02ivk0fvgvryjnhgvh8la9minmrg90dgvmgbwav2y17ir5ypv45p";
+      rev = "560fb5aa401bee5f2ee86084f338f300ff57aede";
+      sha256 = "1avznnh7z48nshxab7d3rlkcjqanwx9x95rxpzbg4vcn3fp1szb6";
    };
    meta.homepage = "https://github.com/ray-x/aurora/";
  };
@ -835,12 +835,12 @@ final: prev:

  barbecue-nvim = buildVimPluginFrom2Nix {
    pname = "barbecue.nvim";
-    version = "2023-03-07";
+    version = "2023-03-11";
    src = fetchFromGitHub {
      owner = "utilyre";
      repo = "barbecue.nvim";
-      rev = "65df9a7d51f11df6bd4f8bd9f0d8b378e92bb9b0";
-      sha256 = "1kaa12cr02bc1p9ywr9l6zd0pb1dpjdcn6m4m65fxd97sdqn97wj";
+      rev = "d60fb8d8e240e5be04a20636f5b35b05a0d4712c";
+      sha256 = "1lf4kwzpx87hvihzgmmpgm83wpkpzf7iav5yb46b3bf3b4cfjl9j";
    };
    meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
  };
@ -1063,12 +1063,12 @@ final: prev:

  ccc-nvim = buildVimPluginFrom2Nix {
    pname = "ccc.nvim";
-    version = "2023-03-11";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "uga-rosa";
      repo = "ccc.nvim";
-      rev = "4869fb385990ec0495e0f175fdd01bd388a7e839";
-      sha256 = "0bb79zj40792grrw1lzqd6ssxqacacblb3szxwvnm9pwps9nc1jw";
+      rev = "f99a9e49f2f3e929364850a1aaa1b23aef5fca62";
+      sha256 = "1942iipkm67ibyvwbll6prsfqhjxq638spcwdw4k9hgzb1f3n3cy";
    };
    meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
  };
@ -2095,24 +2095,24 @@ final: prev:

  coq-artifacts = buildVimPluginFrom2Nix {
    pname = "coq.artifacts";
-    version = "2023-03-05";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq.artifacts";
-      rev = "3a32343a473cce5288a9732f90df67c533642427";
-      sha256 = "0vr3l8f251qdn986pnwl6pwl1mf66wddd0kj8bhzcfi4zjg5sp1q";
+      rev = "ee1814e2183bd424ca5528f82f3d6ce8f64e6f90";
+      sha256 = "0r4hl4w29mg9yg847ivsv1xhm3lq664989l2s8gzxbwypfs3kv3v";
    };
    meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
  };

  coq-thirdparty = buildVimPluginFrom2Nix {
    pname = "coq.thirdparty";
-    version = "2023-03-05";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq.thirdparty";
-      rev = "0c42b34cf7f53bd90c378cc9ddd5b85344ac08f6";
-      sha256 = "0m90yvbnr79xhj7jgkbj3qk7wdidmqf88bda94s5yl8rjjb50am7";
+      rev = "e7c186c9cca268e9337077256544fa9fb86e7bbb";
+      sha256 = "11wv9cgs7nbknvgc4nsgwgs4yv234wy7z78x0z58ci3r55zhablw";
    };
    meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
  };
@ -2131,12 +2131,12 @@ final: prev:

  coq_nvim = buildVimPluginFrom2Nix {
    pname = "coq_nvim";
-    version = "2023-03-10";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq_nvim";
-      rev = "b33c5e010067a2d9674ad5253858da6489ae65d6";
-      sha256 = "1s23c1j95a73cxc1fxwbncv4z74gf8pw9p0kk6qz22xpk6zcypv7";
+      rev = "4b4b93dbbfc871a3d32a244a4276ee06696c21bb";
+      sha256 = "1fkj6ps167sq12y96cdksf7ipfgrh01z1p107x7akynfnyrlny1r";
    };
    meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
  };
@ -2167,12 +2167,12 @@ final: prev:

  crates-nvim = buildVimPluginFrom2Nix {
    pname = "crates.nvim";
-    version = "2023-03-11";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "saecki";
      repo = "crates.nvim";
-      rev = "8d96e24fc244a04cd5a7de1666b077b1b4deef73";
-      sha256 = "0y4nhwwwyp83gzax1klw5w72l8f3v89b7pkac3xph5qvxk06njn1";
+      rev = "aa94d3844d6a12b1a8bf73c8a242ff2f540fb749";
+      sha256 = "19k9p5jamm5vax66swyy594am4zw97i2p8sx57b3xhwssp6mvx48";
    };
    meta.homepage = "https://github.com/saecki/crates.nvim/";
  };
@ -2275,12 +2275,12 @@ final: prev:

  dashboard-nvim = buildVimPluginFrom2Nix {
    pname = "dashboard-nvim";
-    version = "2023-03-09";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "glepnir";
      repo = "dashboard-nvim";
-      rev = "6e31bf683a1852399ace9914edfd3aa1be3e5e23";
-      sha256 = "17h3awklj9x8k3w09c8hzy01nv07i5hwg5qm3y443xi6gs578apv";
+      rev = "937524714999c3c5a096f839dc22dd77344e1567";
+      sha256 = "0fy0pqzifkf5wsaqskjn9ca3dbnm7s0p55an47y2z101b7akbrcs";
    };
    meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
  };
@ -2661,12 +2661,12 @@ final: prev:

  diffview-nvim = buildVimPluginFrom2Nix {
    pname = "diffview.nvim";
-    version = "2023-03-11";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "sindrets";
      repo = "diffview.nvim";
-      rev = "e783ed49acc6b210b295af5c792de811f99559be";
-      sha256 = "0xngir0bsg9p9hkqk0sjhrarjrynd5vmyxx32ckdsvccxlqqiwqf";
+      rev = "ebcbe90401555272025006db00da0972f7e0db63";
+      sha256 = "1zcapd1dwwqz9035h3rg2z582v7z49d03h0g28yi208xjm1wmwih";
    };
    meta.homepage = "https://github.com/sindrets/diffview.nvim/";
  };
@ -2757,12 +2757,12 @@ final: prev:

  editorconfig-vim = buildVimPluginFrom2Nix {
    pname = "editorconfig-vim";
-    version = "2023-03-10";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "editorconfig";
      repo = "editorconfig-vim";
-      rev = "6e2b0920f5836aaf882b43ee52700d3f509cdd1d";
-      sha256 = "0qq4v8ya84rnq6rhmfsannpczqyqb8jw1iflnyw6875fa3rf3qn3";
+      rev = "5b875ac1aeba22abce3c499c0d5e4f33558fdf2c";
+      sha256 = "1pnbhhqbaxp5jhdgs4g1a6fym7x2855lss2ykj5wdd21wna77rhn";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
@ -2843,12 +2843,12 @@ final: prev:

  falcon = buildVimPluginFrom2Nix {
    pname = "falcon";
-    version = "2023-03-03";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "fenetikm";
      repo = "falcon";
-      rev = "722deb460aae7f94e36bb3b069c787ed5fa357c3";
-      sha256 = "04fks4xz0f50dak837775dlydphg2hxhqm69v3k1950jw7nh20q4";
+      rev = "634cef5919b14d0c68cec6fc7b094554e8ef9d7f";
+      sha256 = "1vrnvn7xgzdz1zn0wi516l96nkmi5jnwqzar5v9x0xdszjhqa553";
    };
    meta.homepage = "https://github.com/fenetikm/falcon/";
  };
@ -2988,12 +2988,12 @@ final: prev:

  flatten-nvim = buildVimPluginFrom2Nix {
    pname = "flatten.nvim";
-    version = "2023-03-11";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "willothy";
      repo = "flatten.nvim";
-      rev = "438c8b8ff8bc02e5c6650d55ec0094f56697f70a";
-      sha256 = "1kby1448pqi3fgmmkkfd5ms1ln13hab3g4xnnm1cy9bppa441p24";
+      rev = "17bbf3e51d67f77f6adacbfc965734a3dccb02a3";
+      sha256 = "0jmkx1alfsz1xmf39alwky7l4nl2m79nsqwad7sfi1vp8y3b7p99";
    };
    meta.homepage = "https://github.com/willothy/flatten.nvim/";
  };
@ -3022,6 +3022,18 @@ final: prev:
    meta.homepage = "https://github.com/ncm2/float-preview.nvim/";
  };

+  floating-input-nvim = buildVimPluginFrom2Nix {
+    pname = "floating-input.nvim";
+    version = "2023-03-09";
+    src = fetchFromGitHub {
+      owner = "liangxianzhe";
+      repo = "floating-input.nvim";
+      rev = "2ac3b4b75de72ea715a04d6d1b8d92c7718d2c64";
+      sha256 = "165jk5dhi8lv6fcbfwk395vw5yikmm1v2r74l0nvpa3j6xl1h7zm";
+    };
+    meta.homepage = "https://github.com/liangxianzhe/floating-input.nvim/";
+  };
+
  floating-nvim = buildVimPluginFrom2Nix {
    pname = "floating.nvim";
    version = "2021-07-19";
@ -3048,12 +3060,12 @@ final: prev:

  flutter-tools-nvim = buildVimPluginFrom2Nix {
    pname = "flutter-tools.nvim";
-    version = "2023-03-05";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "akinsho";
      repo = "flutter-tools.nvim";
-      rev = "31f75ae70780cb593bbd3b5179203a9e2b05cefa";
-      sha256 = "0yh8idxnsi9m6y33ma4a9zxailfvygag51i6g2nfcjx7jazijjbw";
+      rev = "467847f694beb2e6496c83e56631d7dfae901a9d";
+      sha256 = "0ydmd6yvwjrrsb1b13i4d2v26bdivfbzlv54ggylwyi7bzfm28xm";
    };
    meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/";
  };
@ -3084,12 +3096,12 @@ final: prev:

  friendly-snippets = buildVimPluginFrom2Nix {
    pname = "friendly-snippets";
-    version = "2023-03-03";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "rafamadriz";
      repo = "friendly-snippets";
-      rev = "009887b76f15d16f69ae1341f86a7862f61cf2a1";
-      sha256 = "01haswbnqmjb4lyg25kimy09bsnwf9dn78bgy6jib4fkhv598dpw";
+      rev = "2f5b8a41659a19bd602497a35da8d81f1e88f6d9";
+      sha256 = "11h9i5b675p9h7h92lcn7vkn2hnkmn1kifji1932xkh45rizyshl";
    };
    meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
  };
@ -3192,12 +3204,12 @@ final: prev:

  fzf-lua = buildVimPluginFrom2Nix {
    pname = "fzf-lua";
-    version = "2023-03-11";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "ibhagwan";
      repo = "fzf-lua";
-      rev = "a553b614f1b89fdbf645efef977f4b7aa0fa6c19";
-      sha256 = "1b0xny4w8g9r1rr17lnl675qplb5smkx8jyq0z15192i2714ksgi";
+      rev = "60ce55d8546188de614cd111f4d26932c70f0fb7";
+      sha256 = "15v9s2bq55nnirwpkkqb3d5ldfibnvqm4wf4afjkqj64bgk7kga2";
    };
    meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
  };
@ -3240,12 +3252,12 @@ final: prev:

  gentoo-syntax = buildVimPluginFrom2Nix {
    pname = "gentoo-syntax";
-    version = "2023-03-09";
+    version = "2023-03-11";
    src = fetchFromGitHub {
      owner = "gentoo";
      repo = "gentoo-syntax";
-      rev = "347fa38461e86eda45f10a275b038386d4f608e1";
-      sha256 = "0yhsch3z41jgnbi7972sqzycpfmirxp8mkfg383xkz1wbk62x1i6";
+      rev = "d4659a919096a0488694338a9cf4fbb749080779";
+      sha256 = "100qlgf6w0fpxfck77ag7m4rkx9k51dn2dk655rapzd1dnry241v";
    };
    meta.homepage = "https://github.com/gentoo/gentoo-syntax/";
  };
@ -3408,12 +3420,12 @@ final: prev:

  go-nvim = buildVimPluginFrom2Nix {
    pname = "go.nvim";
-    version = "2023-03-10";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "ray-x";
      repo = "go.nvim";
-      rev = "f80661a7109373aedee491acd8ddadc57e5c60aa";
-      sha256 = "1fzc99r07hb5fis0jxzasblzwvczs6vpqldlj8nmcx06flis53ll";
+      rev = "3b5b6b8aacfa5be9944b4cfe2673feb68a08655a";
+      sha256 = "1pd8lqqdmyy3lz8x9i6g5kh02w7wydr90rqgzdm4f4cl5lm80p96";
    };
    meta.homepage = "https://github.com/ray-x/go.nvim/";
  };
@ -3528,24 +3540,24 @@ final: prev:

  gruvbox-material = buildVimPluginFrom2Nix {
    pname = "gruvbox-material";
-    version = "2023-02-27";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "sainnhe";
      repo = "gruvbox-material";
-      rev = "a0dc84816b913e9afcf6b8a5ade304bfb47a6f65";
-      sha256 = "0i79v09f92vdznv2bad825kfqfa345jk81ls6imgak84vsigfvhf";
+      rev = "4a6582f4137f4f303eb7d54ee31403ac0b675774";
+      sha256 = "11n7hhwcjq5g583q6qq81ixhh3nprwbcgkz4r70p0sb9r6f0m1wj";
    };
    meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
  };

  gruvbox-nvim = buildVimPluginFrom2Nix {
    pname = "gruvbox.nvim";
-    version = "2023-03-10";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "ellisonleao";
      repo = "gruvbox.nvim";
-      rev = "331507561a46d6ce484f576299e0297e277bac7f";
-      sha256 = "1myvjfyh8dyy0rpnbfcpljyamlnphavjhw4mzbrrq4wwm2lwcwb4";
+      rev = "c6ef9c5a3a2ece0f8635460291eb4a4c06ed3dcc";
+      sha256 = "1cnjdzg8l1dvr8lw3d5m4v880z7wd2y08ac5cl93p6wyzkz9m12i";
    };
    meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
  };
@ -3611,12 +3623,12 @@ final: prev:

  haskell-tools-nvim = buildNeovimPluginFrom2Nix {
    pname = "haskell-tools.nvim";
-    version = "2023-03-09";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "MrcJkb";
      repo = "haskell-tools.nvim";
-      rev = "344a3d968987f8e347053a89daadc6b026c8c458";
-      sha256 = "14111h5fgrwj33s9kng7nzz9j8656xqcylw55qdddd07d2clcyph";
+      rev = "47d30b754753da4b70a18dbfbcec89cf6f067dcd";
+      sha256 = "1sb21nrbmyrl0ahqyjxksa34n9vbwwkd52bdhwj1nwp3yy7k4spb";
    };
    meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
  };
@ -4079,12 +4091,12 @@ final: prev:

  kanagawa-nvim = buildVimPluginFrom2Nix {
    pname = "kanagawa.nvim";
-    version = "2023-03-10";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "rebelot";
      repo = "kanagawa.nvim";
-      rev = "3579d55c47366a536e07cf83df397a9f5f806813";
-      sha256 = "1h40m2scxi8cswdjdxm5wq6bpv5ciza7zd0x3zdwi01cg73r5gyr";
+      rev = "99d9f72122e92ba816c86e10ce8e97c555be99ba";
+      sha256 = "0g6kly4kxik3bqh7iisypawrp4hrp104bim72wqbik92b079swav";
    };
    meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
  };
@ -4235,12 +4247,12 @@ final: prev:

  leap-nvim = buildVimPluginFrom2Nix {
    pname = "leap.nvim";
-    version = "2023-03-07";
+    version = "2023-03-11";
    src = fetchFromGitHub {
      owner = "ggandor";
      repo = "leap.nvim";
-      rev = "dd4cabf7699ae8e2e17cfc29910ec605da32226d";
-      sha256 = "0ymgfbn7hgvb7d5fqpi3q4gxrmy7m5njb5cc7rnvfg9wi5ici7np";
+      rev = "2ff8eac67bed41005ea2032728a0336c784de611";
+      sha256 = "1sfnxias9i1s3ppxpkg084bk1dpcxyd3f34sk9jxdr6v9101zpls";
    };
    meta.homepage = "https://github.com/ggandor/leap.nvim/";
  };
@ -4690,12 +4702,12 @@ final: prev:

  luasnip = buildVimPluginFrom2Nix {
    pname = "luasnip";
-    version = "2023-03-08";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "l3mon4d3";
      repo = "luasnip";
-      rev = "836d4f5a9970819b60b1010fd8709a2ff88416d8";
-      sha256 = "1kskc6wyw4f7l2vwyyrc9bww3h6r2mqdxqyj66p9bhip97qr4i3d";
+      rev = "54e06334a440b476fcc184fcf555cfd4ad9110c0";
+      sha256 = "1pl7rndvvgy143aj6xc4znihp7c8skx790kah5ww94cq4mk2x6zs";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@ -4763,12 +4775,12 @@ final: prev:

  mason-lspconfig-nvim = buildVimPluginFrom2Nix {
    pname = "mason-lspconfig.nvim";
-    version = "2023-03-06";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "williamboman";
      repo = "mason-lspconfig.nvim";
-      rev = "a31e011135a79d63c71254c250c9158e1056a1cb";
-      sha256 = "0wqkq7qa64xrpw58hymq4skpx23nzcsfbbjlm76kv7hz4pp9q5a7";
+      rev = "a81503f0019942111fe464209237f8b4e85f4687";
+      sha256 = "0cc6yb5nb9nf27dp6dzrk8ynzbzsjg0qxsagggiv1w6bk8npgj24";
    };
    meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
  };
@ -4787,12 +4799,12 @@ final: prev:

  mason-nvim = buildVimPluginFrom2Nix {
    pname = "mason.nvim";
-    version = "2023-03-10";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "williamboman";
      repo = "mason.nvim";
-      rev = "e52225531a8b622ff79c6e11ffd3df9acea8327b";
-      sha256 = "0k5c43jwxg4f0xpdrx4qzf83nc00170grx2crd593kij5aljmn50";
+      rev = "10ff879fc56160e10437da5c1ca558371ddb6989";
+      sha256 = "16m8iaikbfhff80f0yil330r7b0fcar346fkf1w8spkv6kj3qy3b";
    };
    meta.homepage = "https://github.com/williamboman/mason.nvim/";
  };
@ -4859,12 +4871,12 @@ final: prev:

  mini-nvim = buildVimPluginFrom2Nix {
    pname = "mini.nvim";
-    version = "2023-03-10";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "echasnovski";
      repo = "mini.nvim";
-      rev = "82693318b691de0676c17457b5d7d26a7798f761";
-      sha256 = "0vks9yl7a3314yfq8kjghxbl4ag3zaxnjgara075wm7x9nkn0ycf";
+      rev = "59d743370aa623ba2c5c1e48f3718058b13ec7b6";
+      sha256 = "1zivc2pwr2k6ixqc8p86cf3ql0p2pf2nd7lvkhwj3904pkyfxk3h";
    };
    meta.homepage = "https://github.com/echasnovski/mini.nvim/";
  };
@ -5195,12 +5207,12 @@ final: prev:

  neo-tree-nvim = buildVimPluginFrom2Nix {
    pname = "neo-tree.nvim";
-    version = "2023-03-01";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "nvim-neo-tree";
      repo = "neo-tree.nvim";
-      rev = "aec592bb1f0cf67f7e1123053d1eb17700aa9ed4";
-      sha256 = "0axp9qaqczb3lir7ddb3i33c4nhyxckgln4vnv833a921hn0sg24";
+      rev = "205184aa0e0f08e8a1249d9bb37b45bae85f01b9";
+      sha256 = "166mgm7k7as2jppfw9x0mr64ynxqvkd4rbaq0hwbpq30najl2jlm";
    };
    meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
  };
@ -5219,12 +5231,12 @@ final: prev:

  neoconf-nvim = buildVimPluginFrom2Nix {
    pname = "neoconf.nvim";
-    version = "2023-03-10";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "neoconf.nvim";
-      rev = "36b0be969326e70143bcd878d4a27f574eabc292";
-      sha256 = "0cr4s1j1crfqh6ds5abxa4miqjky5pv7h24824i51ji2yv7vz8mm";
+      rev = "48178e12a8b722f36ca9f0e8ff0a5487b45de493";
+      sha256 = "03lnz99vg21qpraca8y6bkbmy1m04x5idxgxlad1y4gf9a6x1cag";
    };
    meta.homepage = "https://github.com/folke/neoconf.nvim/";
  };
@ -5243,12 +5255,12 @@ final: prev:

  neodev-nvim = buildVimPluginFrom2Nix {
    pname = "neodev.nvim";
-    version = "2023-03-11";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "neodev.nvim";
-      rev = "418c54441da2506ee9c99150c38e3f350bcad8c4";
-      sha256 = "1g9dzf2dhfm4vxqpcr075nh6gb62l79gv88khiq1y5958qw095cr";
+      rev = "abdc346ff59c414698de551f876bcf3f223ed224";
+      sha256 = "0vvhay3addl5pp48k2qifj88dimkspajx4am5lypiwifgq1gnjqk";
    };
    meta.homepage = "https://github.com/folke/neodev.nvim/";
  };
@ -5399,24 +5411,24 @@ final: prev:

  neotest = buildVimPluginFrom2Nix {
    pname = "neotest";
-    version = "2023-02-23";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "nvim-neotest";
      repo = "neotest";
-      rev = "95f95e346090ad96c657f021ad4d47f93c915598";
-      sha256 = "1mimygy2815jd0k9fgh2f93dq3pgm44j6vibj5hbqz083vhvlp9m";
+      rev = "631a7ccc7072fdc76e3597c2fc8030faf35771d1";
+      sha256 = "14vvs18g7cy8amvy6pnq5342ryvx5h1s5078ml6ql2y04avhs1xa";
    };
    meta.homepage = "https://github.com/nvim-neotest/neotest/";
  };

  neotest-haskell = buildVimPluginFrom2Nix {
    pname = "neotest-haskell";
-    version = "2023-03-10";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "MrcJkb";
      repo = "neotest-haskell";
-      rev = "9776e8881e976a340f1df693a04fd570b9198193";
-      sha256 = "0kc7kqma8nz4hfy6c11mm2aa9jz2b5083qa38wqpshmz408va729";
+      rev = "072f6fec596869b6cc5f58e86ef1ffd4d40135c4";
+      sha256 = "1c9nmxcrlyf0qd027rdg5zhxpic8pkks7mqipkq86c23l3jyq483";
    };
    meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
  };
@ -5543,12 +5555,12 @@ final: prev:

  nightfox-nvim = buildVimPluginFrom2Nix {
    pname = "nightfox.nvim";
-    version = "2023-03-11";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "EdenEast";
      repo = "nightfox.nvim";
-      rev = "a8044b084e0114609ec2c59cc4fa94c709a457d4";
-      sha256 = "0pdszkzhlfi2fd3i04gxs8gy880qvbqicz6jf7db9abxby2zmfx3";
+      rev = "8bb6713c56458aae339575b205234d820ec2046a";
+      sha256 = "1895g32d00wgnfnj5r29q01ir0kgl3psa4bpwpqy6v4jzq45xz6g";
    };
    meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
  };
@ -5567,24 +5579,24 @@ final: prev:

  nix-develop-nvim = buildVimPluginFrom2Nix {
    pname = "nix-develop.nvim";
-    version = "2023-01-11";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "figsoda";
      repo = "nix-develop.nvim";
-      rev = "ce61f6d964232c86b522c292667841f42ebee618";
-      sha256 = "0yfs2iws6d370scq4jgc7gq3n5r3a0lwqfs7awcliks524768c6j";
+      rev = "c66642813d1e31a6d133d78ecf964404e15a89fc";
+      sha256 = "03qys9038ybc9062w5imdmrs6dlnbp1asggd5czzw7zccvw42db0";
    };
    meta.homepage = "https://github.com/figsoda/nix-develop.nvim/";
  };

  nlsp-settings-nvim = buildVimPluginFrom2Nix {
    pname = "nlsp-settings.nvim";
-    version = "2023-03-09";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "tamago324";
      repo = "nlsp-settings.nvim";
-      rev = "1b9fed5dec33c6c731dc8ff91d337091930474be";
-      sha256 = "0bs6j61fjd4ycvhyr54h40v2rj3rymn2s7ncnzbdsczgp3y9wzxi";
+      rev = "9d8dae1a780432e2bf6984515a77cc25697e45ae";
+      sha256 = "1wygxab1sqinnnh527w1llcv1bb9qydns6w9vvh9bsbag7a9wgs6";
    };
    meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
  };
@ -5627,24 +5639,24 @@ final: prev:

  noice-nvim = buildVimPluginFrom2Nix {
    pname = "noice.nvim";
-    version = "2023-03-03";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "noice.nvim";
-      rev = "c22651651da01239fc4afac4cdb7261797d5f02e";
-      sha256 = "01zbk00di167npblpf126dqcsyc97k2w72nn88mkkhvhsna28x6x";
+      rev = "e2a04d480a9fba6b698c01998582ea17aa213ba3";
+      sha256 = "0m4iz32zr3mw8b7mdfqcrvz53xzsrf0dz17xw67knyia85m4h9l5";
    };
    meta.homepage = "https://github.com/folke/noice.nvim/";
  };

  nord-nvim = buildVimPluginFrom2Nix {
    pname = "nord.nvim";
-    version = "2023-01-20";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "shaunsingh";
      repo = "nord.nvim";
-      rev = "9824b8511dcb7d89de628d7e9bab5fa65c9d59d1";
-      sha256 = "0y6paf8kyj30kkkwi9w2hank27b6f68l0swnly3w6abxfariwnpz";
+      rev = "be318c83a233cb877ba08faa15380a54241272b1";
+      sha256 = "1wk40p9sh6i7gljixnrx57ik8fw57dh8kzmf53kqigafxayzj0sa";
    };
    meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
  };
@ -5687,12 +5699,12 @@ final: prev:

  null-ls-nvim = buildVimPluginFrom2Nix {
    pname = "null-ls.nvim";
-    version = "2023-03-10";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "jose-elias-alvarez";
      repo = "null-ls.nvim";
-      rev = "e172e1e3011e3d032dbeba6414644ba968570828";
-      sha256 = "1srbfrjx1zzkkvvd9h9g0hyhrqs4yh6z8znwmzxr9xajg2f7m6kd";
+      rev = "09e99259f4cdd929e7fb5487bf9d92426ccf7cc1";
+      sha256 = "05py2p82srijkvrr5nc8393v25hdgdgiqmnsy5qiiab82qkyvhhj";
    };
    meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
  };
@ -6063,8 +6075,8 @@ final: prev:
    src = fetchFromGitHub {
      owner = "Iron-E";
      repo = "nvim-highlite";
-      rev = "6336cf91dcd7a3919a57d8cfba582b7651eb9d60";
-      sha256 = "0w008x0xsn7rp94kpjnyx06hl730pp7fscj1dnwwgphwr41r41wz";
+      rev = "9cce41f5b760ab98bb2c2b0b8a6daf353ec1bb43";
+      sha256 = "0wm61s1w25inx9spy8cdif1iwmcdijjiy0j8yiywld3q7ixvdbqq";
    };
    meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
  };
@ -6203,12 +6215,12 @@ final: prev:

  nvim-luadev = buildVimPluginFrom2Nix {
    pname = "nvim-luadev";
-    version = "2022-01-26";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "bfredl";
      repo = "nvim-luadev";
-      rev = "2a2c242bd751c289cfc1bc27f357925f68eba098";
-      sha256 = "0prwzxgg6fqkfmqqs41c1c81lch2x4qrs7287l5b104rz3alcinn";
+      rev = "395b7cf3af3e543332c74e883c33eb52364b0b4f";
+      sha256 = "0fxx7gn184l00hrskhcsr9dr39r4bwdkn9h5r2g79qp64i0cqmsh";
    };
    meta.homepage = "https://github.com/bfredl/nvim-luadev/";
  };
@ -6443,36 +6455,36 @@ final: prev:

  nvim-tree-lua = buildVimPluginFrom2Nix {
    pname = "nvim-tree.lua";
-    version = "2023-03-05";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "nvim-tree";
      repo = "nvim-tree.lua";
-      rev = "bbb6d4891009de7dab05ad8fc2d39f272d7a751c";
-      sha256 = "1a7wjglszsssm8h31322bz05gfgp86pp4yral9za3gaib2p534v3";
+      rev = "fe980baa945100d92f77fe55e2ca113cae1b1bd3";
+      sha256 = "12kkn975dj634yix140qjrx4n5dbx6ga50clgbrik74gmq07nj1d";
    };
    meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
  };

  nvim-treesitter = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter";
-    version = "2023-03-11";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "5d59d18d3e6559e525fd933c41070303c5bae32b";
-      sha256 = "10ppmv3ijr49g5k05lf1ydkxdi5v38aynm0y2mj89c2p83dps8gv";
+      rev = "834f1dcb8736c82b1269227b4bfe830310b5b6a1";
+      sha256 = "1gdlypc4qkxh7fghac12562l54hzwlyq74y4p3gsvqzf49m0s9w3";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };

  nvim-treesitter-context = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter-context";
-    version = "2023-03-11";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter-context";
-      rev = "67dcaf9d913d31a9e87d8deceb7eaecf1c33bb22";
-      sha256 = "1q56y6y3kf7by39nfsg1l466yzjwjjbdnrqfjiqrnjv32pm7nfa9";
+      rev = "cb6252b00d19c8b57e8e66de19a601df28455dd1";
+      sha256 = "06i741381w7hah0mlgg23hrlb57k3qvibgpnncqiw5c17mas01a6";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
  };
@ -6503,12 +6515,12 @@ final: prev:

  nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter-textobjects";
-    version = "2023-03-09";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter-textobjects";
-      rev = "542e0879d524ba717234fcba049b6c2da7989d5a";
-      sha256 = "0v5rjjjlfh9rddn4w7g1b5ng5z613gsg650i6yqvpsl2z7bgxdyx";
+      rev = "5b2bcb9ca8315879181f468b37a897100d631005";
+      sha256 = "0ij8jgvhyqrlw077296dx9ck0agjdd2p5r5fiizsvxrwv0jc6ikj";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
  };
@ -6551,11 +6563,11 @@ final: prev:

  nvim-ts-rainbow2 = buildVimPluginFrom2Nix {
    pname = "nvim-ts-rainbow2";
-    version = "2023-03-07";
+    version = "2023-03-12";
    src = fetchgit {
      url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
-      rev = "6bcb1472c321a15eef5a7a015b4fefa8758e6513";
-      sha256 = "1shym9028sv5zs2ianyvivm2ij3j013d098yc4vrs0yf5l9vpdy4";
+      rev = "7711a873d1f16a9f3049715b63cdd71973108871";
+      sha256 = "0kwx3mcs3l56hvr1c0fapfdggfjg25z7nyxvn8v5ch087zfm5kjy";
    };
    meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
  };
@ -6574,12 +6586,12 @@ final: prev:

  nvim-web-devicons = buildVimPluginFrom2Nix {
    pname = "nvim-web-devicons";
-    version = "2023-03-07";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "nvim-tree";
      repo = "nvim-web-devicons";
-      rev = "4af94fec29f508159ceab5413383e5dedd6c24e3";
-      sha256 = "0v4ajp8s4450qfbbxradka0kbh1k4fdvia9h0r15ah9qrlczfaih";
+      rev = "b8d0c99578dcb9d084a45ca4b3a4a502712c2741";
+      sha256 = "1mm33s20x4mrxjzxacal2fjxjyqwc3rnbj1f7zvi4ml00wcwiaps";
    };
    meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
  };
@ -6670,12 +6682,12 @@ final: prev:

  oil-nvim = buildVimPluginFrom2Nix {
    pname = "oil.nvim";
-    version = "2023-03-07";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "stevearc";
      repo = "oil.nvim";
-      rev = "33d5701a8de02bdba171d0795e4422e002f61742";
-      sha256 = "1x3x4dmvmjrsay4x0kfz18jkp1aq9cgndgmwnlli1f432hmf3nps";
+      rev = "383971b0cfd8248ec3d00d4a3154d69ebd5e394e";
+      sha256 = "149lcp5pjyw976r1a83mxfgz75kfnrb5nknqynjqlla191z13ddv";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/stevearc/oil.nvim/";
@ -6731,12 +6743,12 @@ final: prev:

  onedarkpro-nvim = buildVimPluginFrom2Nix {
    pname = "onedarkpro.nvim";
-    version = "2023-03-11";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "olimorris";
      repo = "onedarkpro.nvim";
-      rev = "6e9afac9fc4e3c866086c7a73951683959bb04b0";
-      sha256 = "0dmnph1lsv5lb79f6wwnhxz41yw499648j53q215vsjaqxql6drv";
+      rev = "61cfeceb812ab2c616c3267090e38d0be00d0564";
+      sha256 = "0zpb4h4mx1xp0d68cl2ywd1w27ww6p5fh6xr68m9hj58gmpa5saj";
    };
    meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
  };
@ -6755,12 +6767,12 @@ final: prev:

  onenord-nvim = buildVimPluginFrom2Nix {
    pname = "onenord.nvim";
-    version = "2023-03-08";
+    version = "2023-03-11";
    src = fetchFromGitHub {
      owner = "rmehri01";
      repo = "onenord.nvim";
-      rev = "c2181be38edea8c8629353163b528ed217f11116";
-      sha256 = "07hrppbj1njnjdyq4v6vxx3nfycr4dx45my23h0ix2kwqhw8f4ad";
+      rev = "9a59d47db81e566d4e254904479f129cfffe5f21";
+      sha256 = "07052ni5kjm5xcc6wl1hvrwayif1srjhlaggawpn8icahhrpn25r";
    };
    meta.homepage = "https://github.com/rmehri01/onenord.nvim/";
  };
@ -7417,12 +7429,12 @@ final: prev:

  satellite-nvim = buildVimPluginFrom2Nix {
    pname = "satellite.nvim";
-    version = "2023-01-20";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "lewis6991";
      repo = "satellite.nvim";
-      rev = "d522369aa50cf8c0116c952ddc55253c505e8bf7";
-      sha256 = "1sbq1akv33sj3apqyw8sc7zpw36cyxk8m1inhmwdwgampzhl9sxc";
+      rev = "da81fe4573ed3f203fa7aa8db6f125b6a5380390";
+      sha256 = "1dgdfwij1w0q2jcvyz56pav1fhzbihpkzgvgcx8hmlxx7p30hmby";
    };
    meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
  };
@ -7463,6 +7475,18 @@ final: prev:
    meta.homepage = "https://github.com/cakebaker/scss-syntax.vim/";
  };

+  searchbox-nvim = buildVimPluginFrom2Nix {
+    pname = "searchbox-nvim";
+    version = "2022-11-01";
+    src = fetchFromGitHub {
+      owner = "VonHeikemen";
+      repo = "searchbox.nvim";
+      rev = "110949af8963185b4e732b45ae57beb731bfcede";
+      hash = "sha256-Bx4Msp96hlcYVDvDC3gBv78zmde0T5XacxgiZt+LULU=";
+    };
+    meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim";
+  };
+
  securemodelines = buildVimPluginFrom2Nix {
    pname = "securemodelines";
    version = "2019-02-09";
@ -8322,12 +8346,12 @@ final: prev:

  telescope-manix = buildNeovimPluginFrom2Nix {
    pname = "telescope-manix";
-    version = "2023-03-08";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "MrcJkb";
      repo = "telescope-manix";
-      rev = "0f198947a50587119f678635a889d0461ada710b";
-      sha256 = "0l4sj1mdvf4q5skzjdwq564px6fsx64bdviwb9lkyn6crh65ffa1";
+      rev = "a7cfacda4dc8a56383b30d402ab9eedcffc24c49";
+      sha256 = "071fdpxqv0l2zxjy71p0xi8p84jacqfpi9wzv0nm5w5dv8irr304";
    };
    meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
  };
@ -8646,12 +8670,12 @@ final: prev:

  todo-comments-nvim = buildVimPluginFrom2Nix {
    pname = "todo-comments.nvim";
-    version = "2023-01-23";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "todo-comments.nvim";
-      rev = "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1";
-      sha256 = "1k42l9ghpkds2fqxj8f0anlh4gkpiid28zwkhy29k2br21m7q5fq";
+      rev = "6ccb0bebeb22dbe31940776a750db54b844ae653";
+      sha256 = "1dmvry7m4rdwrqmb7kaa4zx9mcda8n1yagabyg7nds7jyld671gw";
    };
    meta.homepage = "https://github.com/folke/todo-comments.nvim/";
  };
@ -8683,24 +8707,24 @@ final: prev:

  toggleterm-nvim = buildVimPluginFrom2Nix {
    pname = "toggleterm.nvim";
-    version = "2023-03-11";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "akinsho";
      repo = "toggleterm.nvim";
-      rev = "fd63194901fa80c65f6ff2951b8a975b0c13d9b1";
-      sha256 = "0mzhj00d6k4apzq2bl1cajx16pvcin0zpq0mhavlviwb1r37yri7";
+      rev = "c8e982ad2739eeb0b13d0fecb14820c9bf5e3da0";
+      sha256 = "1cg2qhzfdmw501v8w667n3i7kcl31ci3h71f7ia9p3c5fx85xbww";
    };
    meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
  };

  tokyonight-nvim = buildVimPluginFrom2Nix {
    pname = "tokyonight.nvim";
-    version = "2023-03-08";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "tokyonight.nvim";
-      rev = "3ebc29df627c5cf70eb6acb8f0843c9ea9cf6348";
-      sha256 = "16iq60snxaw6n7gxmcvahahzmb1b3pw07rc9cab597qh3vhhszy9";
+      rev = "27203d70747094527d13575ed08f6a714e7a43f8";
+      sha256 = "0mrwy3519wb59g42aafnhn8xlpc7yhwdni0q91napcbnjrx8s4r5";
    };
    meta.homepage = "https://github.com/folke/tokyonight.nvim/";
  };
@ -8731,12 +8755,12 @@ final: prev:

  treesj = buildVimPluginFrom2Nix {
    pname = "treesj";
-    version = "2023-03-05";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "Wansmer";
      repo = "treesj";
-      rev = "19e1150d52ae16bac2465bcd7633c05702b5ae59";
-      sha256 = "0d1c0674v26lnwy1q9fg1jsiiyq6lxq49dxmgm3k37z9kw3j61jy";
+      rev = "bde69d35d37477dc1997f00cc08047f49aa90f7a";
+      sha256 = "0fc7kayzzvz8knmrdd4wsd3vppxkd8dsasp53lm3951xyjb18mlc";
    };
    meta.homepage = "https://github.com/Wansmer/treesj/";
  };
@ -12730,12 +12754,12 @@ final: prev:

  vim-snipmate = buildVimPluginFrom2Nix {
    pname = "vim-snipmate";
-    version = "2022-06-11";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "garbas";
      repo = "vim-snipmate";
-      rev = "525f331320427bf7aeb07651e2536b1f8a23df03";
-      sha256 = "0qfai0x9zg52n43ikgxx5x9y1nl3x420q8564csxirnbhnbn5xgx";
+      rev = "074fe09bca0dbe49aea9c5202edba0d1c7ead10c";
+      sha256 = "01h3cha6xh6srrkhsk89r7xfh577k5ivrgvnxakgnna95mf94r02";
    };
    meta.homepage = "https://github.com/garbas/vim-snipmate/";
  };
@ -13367,24 +13391,24 @@ final: prev:

  vim-vsnip = buildVimPluginFrom2Nix {
    pname = "vim-vsnip";
-    version = "2022-12-20";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "hrsh7th";
      repo = "vim-vsnip";
-      rev = "8dde8c0ef10bb1afdbb301e2bd7eb1c153dd558e";
-      sha256 = "09vxb458xglzrmxjahxabnqkrkb0cbl6sf9jplp01v0cy3jjfmmw";
+      rev = "7753ba9c10429c29d25abfd11b4c60b76718c438";
+      sha256 = "1l8myq6c5rckk6jr3s5rx9jpnrgzk1a65yky1b28mvayd6yff4vs";
    };
    meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
  };

  vim-vsnip-integ = buildVimPluginFrom2Nix {
    pname = "vim-vsnip-integ";
-    version = "2022-11-09";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "hrsh7th";
      repo = "vim-vsnip-integ";
-      rev = "1cf89903f12777b90dd79eb4b3d7fbc0b9a254a1";
-      sha256 = "00a5kdcdlfnn5f2yv6cavy91f91w0aqckcgpqvchgs631ypjqbp4";
+      rev = "1930f0fc234521945afd48db2bff09d925211571";
+      sha256 = "1am4r68awdvjk51r6cyvvkkzj9zpiz394kn6qbjgz9qdc3xbsf1k";
    };
    meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";
  };
@ -13752,12 +13776,12 @@ final: prev:

  vimwiki = buildVimPluginFrom2Nix {
    pname = "vimwiki";
-    version = "2023-03-10";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "vimwiki";
      repo = "vimwiki";
-      rev = "acff8a5b1dd0f9f29797d979819b6e96efa5a656";
-      sha256 = "1d39cqn1v2pzqc3znprsq27i79mvvyi1g0qk582965ha17569l0k";
+      rev = "34ceee8aaa760d2afc2b220916c8844575fd8d17";
+      sha256 = "1gfyi75xxphg6b2cikq3lh353nzyrkw54gflw1pglhcrfxb34y82";
    };
    meta.homepage = "https://github.com/vimwiki/vimwiki/";
  };
@ -14113,12 +14137,12 @@ final: prev:

  catppuccin-nvim = buildVimPluginFrom2Nix {
    pname = "catppuccin-nvim";
-    version = "2023-03-09";
+    version = "2023-03-13";
    src = fetchFromGitHub {
      owner = "catppuccin";
      repo = "nvim";
-      rev = "90c4d1c6e1f8dd2cff9962b36a70b1e681947621";
-      sha256 = "1y5sp0g2r3x9vmwp45p0rxd0369bvrc5z2f9fk54n278qrg3xi7l";
+      rev = "839d015ce9b6c9447fd8b40e43a6411ccc87ebf1";
+      sha256 = "1xaq3pamnvxl0fwqxzppjddgmd9453kqqsj1y1mxiqvaphsifxya";
    };
    meta.homepage = "https://github.com/catppuccin/nvim/";
  };
@ -14137,12 +14161,12 @@ final: prev:

  chad = buildVimPluginFrom2Nix {
    pname = "chad";
-    version = "2023-03-05";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "chadtree";
-      rev = "1188c4a39167237d551d279c9f84a3e34c7c2329";
-      sha256 = "11igiz9l5r7qj6hj1xn5wgzx6a5acgldqq6vjs9w6viwc9cvvin7";
+      rev = "62028983c38d849f0b918e02538bd0feb524c5b7";
+      sha256 = "11sbp59d1p3a8842b8a8ib7pcfb21y3pfsj5cjy7k5mr156jzr5y";
    };
    meta.homepage = "https://github.com/ms-jpq/chadtree/";
  };
@ -14233,12 +14257,12 @@ final: prev:

  rose-pine = buildVimPluginFrom2Nix {
    pname = "rose-pine";
-    version = "2023-03-09";
+    version = "2023-03-12";
    src = fetchFromGitHub {
      owner = "rose-pine";
      repo = "neovim";
-      rev = "63821c18a2840b3172fc5df15d9268d80f46fa17";
-      sha256 = "1m85hwk6y321q7m95s4xd2alby7r3ipgybhf9jrkzjwi3z3yfmmq";
+      rev = "1883d8b417403f1d8c56d52d90445bbbe6be4b80";
+      sha256 = "1wx9bb4qhd4ap030zrbninfwk409chlr8xsr88zw77pjhc1srzv2";
    };
    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
@ -299,7 +299,6 @@
      rev = "ea30a05d0f0446a96d8b096ad11828ad4f8ad849";
      hash = "sha256-ZiUMIsjVMxpchxmJQ3g2yXIn+/kAWPwTzMzx3IlW93o=";
    };
-    generate = true;
    meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree";
  };
  dhall = buildGrammar {
@ -356,7 +355,7 @@
      hash = "sha256-Cch6WCYq9bsWGypzDGapxBLJ0ZB432uAl6YjEjBJ5yg=";
    };
    location = "crates/tree-sitter-ebnf";
-    meta.homepage = "https://github.com/RubixDev/ebnf.git";
+    meta.homepage = "https://github.com/RubixDev/ebnf";
  };
  eex = buildGrammar {
    language = "eex";
@ -576,7 +575,6 @@
      rev = "f4685bf11ac466dd278449bcfe5fd014e94aa504";
      hash = "sha256-MjoY1tlVZgN6JqoTjhhg0zSdHzc8yplMr8824sfIKp8=";
    };
-    generate = true;
    meta.homepage = "https://github.com/shunsambongi/tree-sitter-gitignore";
  };
  gleam = buildGrammar {
@ -632,7 +630,6 @@
      rev = "b6ef0768711086a86b3297056f9ffb5cc1d77b4a";
      hash = "sha256-ws/8nL+HOoPb6Hcdh4pihjPoRw90R1fy7MB0V9Lb9ik=";
    };
-    generate = true;
    meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-godot-resource";
  };
  gomod = buildGrammar {
@ -1225,12 +1222,12 @@
  };
  php = buildGrammar {
    language = "php";
-    version = "f860e59";
+    version = "d5e7cac";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-php";
-      rev = "f860e598194f4a71747f91789bf536b393ad4a56";
-      hash = "sha256-j4RJUBbp2zvCHsZwnz62t2Tf6Cy1LOKrhg/pi8cqzAs=";
+      rev = "d5e7cacb6c27e0e131c7f76c0dbfee56dfcc61e3";
+      hash = "sha256-cSCHXREt3J6RSpug2EFKWYQNDUqrQeC0vDZ3SrRmLBY=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
  };
@ -1390,12 +1387,12 @@
  };
  racket = buildGrammar {
    language = "racket";
-    version = "c2f7baa";
+    version = "ed5369a";
    src = fetchFromGitHub {
      owner = "6cdh";
      repo = "tree-sitter-racket";
-      rev = "c2f7baa22053a66b4dba852cdba3f14f34bb6985";
-      hash = "sha256-P6p2IOECsqCLBgtLE+xqzZuMS8d/lTfAHfTeONClVbY=";
+      rev = "ed5369ad17166c0749ab7241d826c438bd69338d";
+      hash = "sha256-/vvmVirIXH6uAtqEGvG//3XobLFzWCYXIGe4e0N1DsU=";
    };
    meta.homepage = "https://github.com/6cdh/tree-sitter-racket";
  };
@ -1489,23 +1486,23 @@
  };
  scala = buildGrammar {
    language = "scala";
-    version = "2275b75";
+    version = "6f9bc5a";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-scala";
-      rev = "2275b754360de8539e02e84106fa38f7cb6de275";
-      hash = "sha256-xc8/N2h9i7gZ+zPUzNpuwPg9++vZo8KvdOnjFF5YIo4=";
+      rev = "6f9bc5ab749d90bb2ac4ad083891f9d0481d768d";
+      hash = "sha256-41cRG67Gb9qpaOEVtAtNkjvPurFGgtftHa0MedvJvnU=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
  };
  scheme = buildGrammar {
    language = "scheme";
-    version = "38aef90";
+    version = "9a23ff3";
    src = fetchFromGitHub {
      owner = "6cdh";
      repo = "tree-sitter-scheme";
-      rev = "38aef90f54ef8f2e8e402b1f6f036ed19c636759";
-      hash = "sha256-RftYAEUwqlJrOnDs1Cmz5KmJMMBz5h5m7jXpNjWjDYQ=";
+      rev = "9a23ff3df8f03da555f7679ab640a98a9e851c79";
+      hash = "sha256-qEJgMSS6+q3lqks2CzG3XLZrd0Pl3b8jJiD/GA5TBOc=";
    };
    meta.homepage = "https://github.com/6cdh/tree-sitter-scheme";
  };
@ -1644,12 +1641,12 @@
  };
  swift = buildGrammar {
    language = "swift";
-    version = "fe2e325";
+    version = "449d597";
    src = fetchFromGitHub {
      owner = "alex-pinkus";
      repo = "tree-sitter-swift";
-      rev = "fe2e325a45056cdb3fcda821c03b8cef0d79e508";
-      hash = "sha256-ldPHpYhuAbodMPY8t8X7UiMY8kcds28r75R3Hqnlqv8=";
+      rev = "449d5974981d402181ca721e0573346f8c17f726";
+      hash = "sha256-P7JEkB9MF9DmxQ/3G2IA2l4pzArzAP1rJQl4MNhu3Bo=";
    };
    generate = true;
    meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@ -1703,12 +1700,12 @@
  };
  thrift = buildGrammar {
    language = "thrift";
-    version = "e0c3e50";
+    version = "d4deb1b";
    src = fetchFromGitHub {
      owner = "duskmoon314";
      repo = "tree-sitter-thrift";
-      rev = "e0c3e50e17846230e88becdce28fbb1b41dcabba";
-      hash = "sha256-yqdGQabEE1unk7Rel+E3/MRXTEOz9XxrBVH9nj+mm/Q=";
+      rev = "d4deb1bd9e848f2dbe81103a151d99e8546de480";
+      hash = "sha256-MCa7319E8bo3r2kDClBmjOvvs+yZDlE1E+52WqJqvMI=";
    };
    meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift";
  };
@ -1758,12 +1755,12 @@
  };
  tsx = buildGrammar {
    language = "tsx";
-    version = "c6e56d4";
+    version = "b66d19b";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-typescript";
-      rev = "c6e56d44c686a67c89e29e773e662567285d610f";
-      hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0=";
+      rev = "b66d19b9b6ec3edf3d8aff0c20646acbdaa0afb3";
+      hash = "sha256-YJrjxU2VmkVHTHta531fsJrx+K4Xih5kpFVEEqmvz34=";
    };
    location = "tsx";
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@ -1792,12 +1789,12 @@
  };
  typescript = buildGrammar {
    language = "typescript";
-    version = "c6e56d4";
+    version = "b66d19b";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-typescript";
-      rev = "c6e56d44c686a67c89e29e773e662567285d610f";
-      hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0=";
+      rev = "b66d19b9b6ec3edf3d8aff0c20646acbdaa0afb3";
+      hash = "sha256-YJrjxU2VmkVHTHta531fsJrx+K4Xih5kpFVEEqmvz34=";
    };
    location = "typescript";
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -252,6 +252,7 @@ https://github.com/andviro/flake8-vim/,,
 https://github.com/willothy/flatten.nvim/,HEAD,
 https://github.com/ggandor/flit.nvim/,HEAD,
 https://github.com/ncm2/float-preview.nvim/,,
+https://github.com/liangxianzhe/floating-input.nvim/,HEAD,
 https://github.com/fhill2/floating.nvim/,,
 https://github.com/floobits/floobits-neovim/,,
 https://github.com/akinsho/flutter-tools.nvim/,HEAD,
@ -627,6 +628,7 @@ https://github.com/lewis6991/satellite.nvim/,HEAD,
 https://github.com/tiagovla/scope.nvim/,HEAD,
 https://github.com/Xuyuanp/scrollbar.nvim/,,
 https://github.com/cakebaker/scss-syntax.vim/,,
+https://github.com/VonHeikemen/searchbox.nvim/,,
 https://github.com/RobertAudi/securemodelines/,,
 https://github.com/megaannum/self/,,
 https://github.com/jaxbot/semantic-highlight.vim/,,
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@ -15,11 +15,11 @@ let
  archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";

  sha256 = {
-    x86_64-linux = "11w2gzhp0vlpygk93cksxhkimc9y8w862gn9450xkzi1jsps5lj4";
-    x86_64-darwin = "0ya17adx2vbi800ws5sfqq03lrjjk6kbclrfrc2zfij2ha05xl8z";
-    aarch64-linux = "15kzjs1ha5x2hcq28nkbb0rim1v694jj6p9sz226rai3bmq9airg";
-    aarch64-darwin = "1cggppblr42jzpcz3g8052w5y1b9392iizpvg6y7001kw66ndp3n";
-    armv7l-linux = "01qqhhl5ffvba1pk4jj3q7sbahq7cvy81wvmgng1cmaj5b8m8dgp";
+    x86_64-linux = "0q3wp1n67f8w0j35saf4mlnsfd2481f9yl28428vycq32m10q96k";
+    x86_64-darwin = "1820a01a97vvv1d2553czv1g2z7mg3f6l8i8168g63zvvnad0f1c";
+    aarch64-linux = "03gzfp5n6z6dzinsnwpvmmlj0lqa53152a4mylaj1rg540jv2xh7";
+    aarch64-darwin = "0mbwavi3palh353i19an94hr6xs0i5bxqcvkmr5qv3xvpwlaandl";
+    armv7l-linux = "0wpnjd9fqlnv360q6061kmi1z699kd4q9igdczp8gwqyz2x4d3yz";
  }.${system} or throwSystem;

  sourceRoot = if stdenv.isDarwin then "" else ".";
@ -29,7 +29,7 @@ in

    # Please backport all compatible updates to the stable release.
    # This is important for the extension ecosystem.
-    version = "1.76.0.23062";
+    version = "1.76.1.23069";
    pname = "vscodium";

    executableName = "codium";
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@ -1,7 +1,7 @@
 { stdenv, lib, pkgArches, callPackage, makeSetupHook,
  pname, version, src, mingwGccs, monos, geckos, platforms,
  bison, flex, fontforge, makeWrapper, pkg-config,
-  autoconf, hexdump, perl, nixosTests,
+  nixosTests,
  supportFlags,
  patches,
  moltenvk,
@ -54,11 +54,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
    fontforge
    makeWrapper
    pkg-config
-
-    # Required by staging
-    autoconf
-    hexdump
-    perl
  ]
  ++ lib.optionals supportFlags.mingwSupport (mingwGccs
    ++ lib.optional stdenv.isDarwin setupHookDarwin);
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@ -73,9 +73,9 @@ in rec {

  unstable = fetchurl rec {
    # NOTE: Don't forget to change the hash for staging as well.
-    version = "8.1";
+    version = "8.3";
    url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz";
-    hash = "sha256-QSDuaz8pTZeq8scwNM8cLL8ToZXJTFx0pkaoH5JBJZg=";
+    hash = "sha256-QQJpAAKSw7+t0lYf3eBtm8sryVi0mwPpY/FBd6J2MfA=";
    inherit (stable) gecko32 gecko64 patches;

    mono = fetchurl rec {
@ -105,7 +105,7 @@ in rec {
  staging = fetchFromGitHub rec {
    # https://github.com/wine-staging/wine-staging/releases
    inherit (unstable) version;
-    hash = "sha256-5AzXXaRGyvfYxd3yXtAlZREv1wp6UqWdDRdnwmKVaUg=";
+    hash = "sha256-b49WFyiEbkJFUp1n9rz+A1c6iseSfV+5DrpA6AwKa+4=";
    owner = "wine-staging";
    repo = "wine-staging";
    rev = "v${version}";
@ -113,7 +113,7 @@ in rec {
    disabledPatchsets = [ ];
  };

-  wayland = fetchFromGitLab rec {
+  wayland = fetchFromGitLab {
    # https://gitlab.collabora.com/alf/wine/-/tree/wayland
    version = "8.0";
    hash = "sha256-whRnm21UyKZ4AQufNmctzivISVobnCeidmpYz65vlyk=";
--- a/pkgs/applications/emulators/wine/staging.nix
+++ b/pkgs/applications/emulators/wine/staging.nix
@ -1,4 +1,4 @@
-{ lib, callPackage, wineUnstable }:
+{ lib, callPackage, autoconf, hexdump, perl, python3, wineUnstable }:

 with callPackage ./util.nix {};

@ -9,17 +9,16 @@ in assert lib.getVersion wineUnstable == patch.version;

 (lib.overrideDerivation wineUnstable (self: {
  buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs;
+  nativeBuildInputs = [ autoconf hexdump perl python3 ] ++ self.nativeBuildInputs;

  name = "${self.name}-staging";

  prePatch = self.prePatch or "" + ''
    patchShebangs tools
-    cp -r ${patch}/patches .
+    cp -r ${patch}/patches ${patch}/staging .
    chmod +w patches
-    cd patches
-    patchShebangs gitapply.sh
-    ./patchinstall.sh DESTDIR="$PWD/.." --all ${lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets}
-    cd ..
+    patchShebangs ./patches/gitapply.sh
+    python3 ./staging/patchinstall.py DESTDIR="$PWD" --all ${lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets}
  '';
 })) // {
  meta = wineUnstable.meta // {
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@ -47,13 +47,13 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "imagemagick";
-  version = "7.1.1-0";
+  version = "7.1.1-2";

  src = fetchFromGitHub {
    owner = "ImageMagick";
    repo = "ImageMagick";
    rev = finalAttrs.version;
-    hash = "sha256-FaoiB8qnzgREaslEXRituToIbU9tK3FnvC5ptFkctjA=";
+    hash = "sha256-5B8grg05n+MkHZU76QBsrrU5Z3VZRGMRHX35HXtTbe8=";
  };

  outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
--- a/pkgs/applications/misc/confy/default.nix
+++ b/pkgs/applications/misc/confy/default.nix
@ -0,0 +1,57 @@
+{ appstream-glib
+, desktop-file-utils
+, fetchurl
+, gobject-introspection
+, gtk3
+, lib
+, libnotify
+, libhandy
+, meson
+, ninja
+, pkg-config
+, python3
+, stdenv
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "confy";
+  version = "0.6.4";
+
+  src = fetchurl {
+    url = "https://git.sr.ht/~fabrixxm/confy/archive/${version}.tar.gz";
+    sha256 = "0v74pdyihj7r9gb3k2rkvbphan27ajlvycscd8xzrnsv74lcmbpm";
+  };
+
+  nativeBuildInputs = [
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gobject-introspection
+    gtk3
+    libhandy
+    libnotify
+    (python3.withPackages (ps: with ps; [
+      icalendar
+      pygobject3
+    ]))
+  ];
+
+  postPatch = ''
+    # Remove executable bits so that meson runs the script with our Python interpreter
+    chmod -x build-aux/meson/postinstall.py
+  '';
+
+  meta = with lib; {
+    description = "Conferences schedule viewer";
+    homepage = "https://confy.kirgroup.net/";
+    changelog = "https://git.sr.ht/~fabrixxm/confy/refs/${version}";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ michaelgrahamevans ];
+  };
+}
--- a/pkgs/applications/misc/jetbrains-toolbox/default.nix
+++ b/pkgs/applications/misc/jetbrains-toolbox/default.nix
@ -0,0 +1,74 @@
+{ stdenv
+, lib
+, fetchzip
+, copyDesktopItems
+, makeDesktopItem
+, makeWrapper
+, runCommand
+, appimageTools
+, patchelf
+}:
+let
+  pname = "jetbrains-toolbox";
+  version = "1.27.3.14493";
+
+  src = fetchzip {
+    url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";
+    sha256 = "sha256-aK5T95Yg8Us8vkznWlDHnPiPAKiUtlU0Eswl9rD01VY=";
+    stripRoot = false;
+  };
+
+  appimageContents = runCommand "${pname}-extracted"
+    {
+      nativeBuildInputs = [ appimageTools.appimage-exec ];
+    }
+    ''
+      appimage-exec.sh -x $out ${src}/${pname}-${version}/${pname}
+    '';
+
+  appimage = appimageTools.wrapAppImage {
+    inherit pname version;
+    src = appimageContents;
+    extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs);
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "JetBrains Toolbox";
+    exec = "jetbrains-toolbox";
+    comment = "JetBrains Toolbox";
+    desktopName = "JetBrains Toolbox";
+    type = "Application";
+    icon = "jetbrains-toolbox";
+    terminal = false;
+    categories = [ "Development" ];
+    startupWMClass = "jetbrains-toolbox";
+    startupNotify = false;
+  };
+in
+stdenv.mkDerivation {
+  inherit pname version src appimage;
+
+  nativeBuildInputs = [ makeWrapper copyDesktopItems ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 ${appimageContents}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg
+    makeWrapper ${appimage}/bin/${pname}-${version} $out/bin/${pname} --append-flags "--update-failed"
+
+    runHook postInstall
+  '';
+
+  desktopItems = [ desktopItem ];
+
+  # Disabling the tests, this seems to be very difficult to test this app.
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Jetbrains Toolbox";
+    homepage = "https://jetbrains.com/";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ AnatolyPopov ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
--- a/pkgs/applications/misc/megacmd/default.nix
+++ b/pkgs/applications/misc/megacmd/default.nix
@ -23,13 +23,13 @@

 stdenv.mkDerivation rec {
  pname = "megacmd";
-  version = "1.5.1";
+  version = "1.6.0";

  src = fetchFromGitHub {
    owner = "meganz";
    repo = "MEGAcmd";
    rev = "${version}_Linux";
-    sha256 = "sha256-qOXw/KGt3DyWQGBe/pbMujQITCMItHobxuK+1r00ZIs=";
+    sha256 = "sha256-EPY2BjTECia0eBGmv8tmeil1WibIA6R+DK7MmOMufLw=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@ -28,13 +28,13 @@
 }:
 mkDerivation rec {
  pname = "megasync";
-  version = "4.6.7.0";
+  version = "4.9.0.0";

  src = fetchFromGitHub {
    owner = "meganz";
    repo = "MEGAsync";
    rev = "v${version}_Linux";
-    sha256 = "sha256-vJSXvSTYEhxuG3KUQ+lBcppC8M70UnYlBLPHhYJSNOE=";
+    sha256 = "sha256-s0E8kJ4PJmhaxVcWPCyCk/KbcX4V3IESdZhSosPlZuM=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/misc/shell-genie/default.nix
+++ b/pkgs/applications/misc/shell-genie/default.nix
@ -1,20 +1,19 @@
 { lib
 , python3
 , fetchFromGitHub
-, poetry
 }:

 with python3.pkgs;

 buildPythonPackage rec {
  pname = "shell-genie";
-  version = "0.2.6";
+  version = "0.2.8";
  format = "pyproject";

  src = fetchPypi {
    pname = "shell_genie";
    inherit version;
-    hash = "sha256-MgQFHsBXrihfWBB/cz45ITf8oJG2gSenf1wzdbrAbjw=";
+    hash = "sha256-6miqTjiGLK7r6evfchwuAXTHj+JwoH/CqgRoa5+jDJI=";
  };

  nativeBuildInputs = [
@ -28,7 +27,7 @@ buildPythonPackage rec {
    rich
    shellingham
    typer
-  ];
+  ] ++ typer.optional-dependencies.all;

  # No tests available
  doCheck = false;
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@ -38,7 +38,7 @@
  buildPythonApplication = if isQt6 then python3Packages.buildPythonApplication else mkDerivationWith python3Packages.buildPythonApplication;

  pname = "qutebrowser";
-  version = if isQt6 then "unstable-2022-09-16" else "2.5.2";
+  version = if isQt6 then "unstable-2022-09-16" else "2.5.3";

 in

@ -60,7 +60,7 @@ buildPythonApplication {
  # the release tarballs are different from the git checkout!
   else fetchurl {
    url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-qb/OFN3EA94N6y7t+YPCMc4APgdZmV7H706jTkl06Qg=";
+    hash = "sha256-hF7yJDTQIztUcZJae20HVhfGlLprvz6GWrgpSwLJ14E=";
  };

  # Needs tox
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@ -21,11 +21,19 @@ let
  vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
  pname = "vivaldi";
-  version = "5.7.2921.53";
+  version = "5.7.2921.63";
+
+  suffix = {
+    aarch64-linux = "arm64";
+    x86_64-linux = "amd64";
+  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

  src = fetchurl {
-    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb";
-    sha256 = "sha256-qkKCoHJCRji3XfXk71n4BfjFyQpXZ+BariHmbYPAuv8=";
+    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
+    hash = {
+      aarch64-linux = "sha256-Os2A3kbeuMIn9TFp8Ze+TwHDYLkVvECJF3UDMsQq5yU=";
+      x86_64-linux = "sha256-t9CYf3I+IrKjOD96tBZQGR3xwzPrZvnD1JvPMgTjz0M=";
+    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
  };

  unpackPhase = ''
@ -100,12 +108,14 @@ in stdenv.mkDerivation rec {
    runHook postInstall
  '';

+  passthru.updateScript = ./update-vivaldi.sh;
+
  meta = with lib; {
    description = "A Browser for our Friends, powerful and personal";
    homepage    = "https://vivaldi.com";
    license     = licenses.unfree;
    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
    maintainers = with maintainers; [ otwieracz badmutex ];
-    platforms   = [ "x86_64-linux" ];
+    platforms   = [ "x86_64-linux" "aarch64-linux" ];
  };
 }
--- a/pkgs/applications/networking/browsers/vivaldi/update-vivaldi.sh
+++ b/pkgs/applications/networking/browsers/vivaldi/update-vivaldi.sh
@ -0,0 +1,16 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl common-updater-scripts
+
+set -eu -o pipefail
+
+version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-1_amd64\.deb.*/\1/p')
+
+update_hash() {
+    url="https://downloads.vivaldi.com/stable/vivaldi-stable_$version-1_$2.deb"
+    hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$url"))
+    update-source-version vivaldi 0 sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB= --system=$1
+    update-source-version vivaldi "$version" "$hash" --system=$1
+}
+
+update_hash aarch64-linux arm64
+update_hash x86_64-linux amd64
--- a/pkgs/applications/networking/browsers/vivaldi/update.sh
+++ b/pkgs/applications/networking/browsers/vivaldi/update.sh
@ -14,26 +14,23 @@ version() {
 vivaldi_version_old=$(version vivaldi)
 vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-1_amd64\.deb.*/\1/p')

-if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then
-  echo "vivaldi is already up-to-date"
+if [[ ! "$vivaldi_version" = "$vivaldi_version_old" ]]; then
+  echo "vivaldi is not up-to-date, not updating codecs"
+  (cd "$root" && nix-shell maintainers/scripts/update.nix --argstr package vivaldi)
  exit
 fi

-# Download vivaldi and save hash and file path.
+echo "vivaldi is up-to-date, updating codecs"
+
+# Download vivaldi and save file path.
 url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}-1_amd64.deb"
 mapfile -t prefetch < <(nix-prefetch-url --print-path "$url")
-hash=${prefetch[0]}
 path=${prefetch[1]}

 nixpkgs="$(git rev-parse --show-toplevel)"
 default_nix="$nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix"
 ffmpeg_nix="$nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix"

-(cd "$root" && update-source-version vivaldi "$vivaldi_version" "$hash")
-
-git add "${default_nix}"
-git commit -m "vivaldi: ${vivaldi_version_old} -> ${vivaldi_version}"
-
 # Check vivaldi-ffmpeg-codecs version.
 chromium_version_old=$(version vivaldi-ffmpeg-codecs)
 ffmpeg_update_script=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/update-ffmpeg)
--- a/pkgs/applications/networking/calls/default.nix
+++ b/pkgs/applications/networking/calls/default.nix
@ -33,7 +33,7 @@

 stdenv.mkDerivation rec {
  pname = "calls";
-  version = "43.2";
+  version = "43.3";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
    repo = pname;
    rev = "v${version}";
    fetchSubmodules = true;
-    hash = "sha256-gHlhbQGtdIjKLMAkTxfc2QOjvNUPGKKL+OK8/vm0Oac=";
+    hash = "sha256-GNICAk9SPrLc+zm3tHVwkQdiS20j4MVktGIbNWEEMHs=";
  };

  outputs = [ "out" "devdoc" ];
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@ -2,15 +2,15 @@

 buildGoModule rec {
  pname = "kubernetes-helm";
-  version = "3.11.1";
+  version = "3.11.2";

  src = fetchFromGitHub {
    owner = "helm";
    repo = "helm";
    rev = "v${version}";
-    sha256 = "sha256-TrjPpKFHMF+dPz9AqXVkYPUNWeWEeH8bA37Dpxr7b8s=";
+    sha256 = "sha256-aUzVICPCxAUoPvnE7pqz+bscfukbEwB+iGmXAYuQ/eE=";
  };
-  vendorSha256 = "sha256-LRMDrBSl5EGQqQt5FUU4JJHqdwfYt5qsVpe76jUQBVI=";
+  vendorSha256 = "sha256-Hf4ElC3H5sJkzKFELeDygTmfuqBHLqRhaHG1bfnqigM=";

  subPackages = [ "cmd/helm" ];
  ldflags = [
--- a/pkgs/applications/networking/cluster/kubedog/default.nix
+++ b/pkgs/applications/networking/cluster/kubedog/default.nix
@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "kubedog";
-  version = "0.9.6";
+  version = "0.9.9";

  src = fetchFromGitHub {
    owner = "werf";
    repo = "kubedog";
    rev = "v${version}";
-    hash = "sha256-mwITvv2MuqzH1aB4iTVaFfZljyqOAu7vl4cORHT/OXQ=";
+    hash = "sha256-j7LR6+c2ZZJCqmHihXodtiF5bJhNR8eizDEqwm9IUn0=";
  };

-  vendorHash = "sha256-HBo26cPiWJPDpsjPYUEBraHB2SZsUttrlBKpB9/SS6o=";
+  vendorHash = "sha256-UPfB3nOzJpqh14xLKZP2mLfg7C55nQivrkmh3B7aKzo=";

  subPackages = [ "cmd/kubedog" ];

--- a/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix
@ -0,0 +1,27 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "kubernetes-metrics-server";
+  version = "0.6.2";
+
+  src = fetchFromGitHub {
+    owner = "kubernetes-sigs";
+    repo = "metrics-server";
+    rev = "v${version}";
+    sha256 = "sha256-TTI+dNBQ/jKt6Yhud3/OO+zOkeO46CmUz6J6ByX26JE=";
+  };
+
+  vendorSha256 = "sha256-lpSMvHYlPtlJQUqsdXJ6ewBEBiwLPvP/rsUgYzJhOxc=";
+
+  preCheck = ''
+    # the e2e test breaks the sandbox, so let's skip that
+    rm test/e2e_test.go
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/kubernetes-sigs/metrics-server";
+    description = "Kubernetes container resource metrics collector";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ eskytthe ];
+  };
+}
--- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@ -44,11 +44,11 @@ in

 stdenv.mkDerivation rec {
  pname = "bluejeans";
-  version = "2.31.0.83";
+  version = "2.32.1.3";

  src = fetchurl {
    url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm";
-    sha256 = "sha256-dzT6S6124l70uYqkB6fGgCpqZBXS2irgwOfkmupN8HU=";
+    sha256 = "sha256-lsUS7JymCMOa5wlWJOwLFm4KRnAYixi9Kk5CYHB17Ac=";
  };

  nativeBuildInputs = [ rpmextract makeWrapper ];
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@ -3,7 +3,7 @@ let
  versions = if stdenv.isLinux then {
    stable = "0.0.25";
    ptb = "0.0.39";
-    canary = "0.0.148";
+    canary = "0.0.149";
  } else {
    stable = "0.0.264";
    ptb = "0.0.59";
@ -22,7 +22,7 @@ let
      };
      canary = fetchurl {
        url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        sha256 = "sha256-2ZrSDyPj3AHriCWZ/bb303H3J97TTun//WjmInNEmwk=";
+        sha256 = "sha256-8DHr7adczIv9FXaxPxSfZPn+8ogWLWHRp9l0JpKhoiY=";
      };
    };
    x86_64-darwin = {
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@ -2,15 +2,15 @@

 buildGoModule rec {
  pname = "ipfs-cluster";
-  version = "1.0.5";
+  version = "1.0.6";

-  vendorHash = "sha256-sLCgPXyOiGaigcVuwUU4+Lmb7SjopWKhCReBzrZyuRs=";
+  vendorHash = "sha256-IRR10wC05dv4d170Iweuxdy/JEnYjvdW0h5nS1ht9cg=";

  src = fetchFromGitHub {
    owner = "ipfs-cluster";
    repo = "ipfs-cluster";
    rev = "v${version}";
-    hash = "sha256-c0COSf4ktFxkPJwzq/0RyG1JvNUvhdWpeRlrbAirGec=";
+    hash = "sha256-2En7morOodWvtNZGAZhl1EZJCCHdrYSUA1WBYGkjnYI=";
  };

  meta = with lib; {
--- a/pkgs/applications/networking/localsend/default.nix
+++ b/pkgs/applications/networking/localsend/default.nix
@ -0,0 +1,64 @@
+{ lib, stdenv, appimageTools, fetchurl, undmg }:
+
+let
+  pname = "localsend";
+  version = "1.8.0";
+
+  srcs = {
+    x86_64-linux = fetchurl {
+      url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.AppImage";
+      hash = "sha256-Setxw0urfJCiHI+Ms+Igroi1CLCgB0H5BsV6RkxyBME=";
+    };
+    x86_64-darwin = fetchurl {
+      url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg";
+      hash = "sha256-uVZ/ULhr8CiV/wL9Yaw6q2IYAHNqld606ADKab/EVlU=";
+    };
+  };
+  src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+
+  appimageContents = appimageTools.extract { inherit pname version src; };
+
+  linux = appimageTools.wrapType2 rec {
+    inherit pname version src meta;
+
+    extraPkgs = p: [ p.libepoxy ];
+
+    extraInstallCommands = ''
+      mv $out/bin/${pname}-${version} $out/bin/${pname}
+
+      install -m 444 -D ${appimageContents}/org.localsend.localsend_app.desktop \
+        $out/share/applications/${pname}.desktop
+      substituteInPlace $out/share/applications/${pname}.desktop \
+        --replace 'Icon=application-vnd.appimage' 'Icon=${pname}' \
+        --replace 'Exec=localsend_app' 'Exec=$out/bin/localsend'
+
+      install -m 444 -D ${appimageContents}/application-vnd.appimage.svg \
+        $out/share/icons/hicolor/scalable/apps/${pname}.svg
+    '';
+  };
+
+  darwin = stdenv.mkDerivation {
+    inherit pname version src meta;
+
+    nativeBuildInputs = [ undmg ];
+
+    sourceRoot = ".";
+
+    installPhase = ''
+      mkdir -p $out/Applications
+      cp -r *.app $out/Applications
+    '';
+  };
+
+  meta = with lib; {
+    description = "An open source cross-platform alternative to AirDrop";
+    homepage = "https://localsend.org/";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ sikmir ];
+    platforms = builtins.attrNames srcs;
+  };
+in
+if stdenv.isDarwin
+then darwin
+else linux
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@ -24,11 +24,11 @@

 stdenv.mkDerivation rec {
  pname = "liferea";
-  version = "1.14.0";
+  version = "1.14.1";

  src = fetchurl {
    url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    sha256 = "uC3ksJ4nNXBjQYqNOS4qK6aCK6/Wzf27YXHbM73TpdU=";
+    sha256 = "5g74oN+NiKm/hnBLZvDxnAcBuP6B4y1Nsvb6nShZBnw=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/office/super-productivity/default.nix
+++ b/pkgs/applications/office/super-productivity/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "super-productivity";
-  version = "7.12.2";
+  version = "7.13.1";

  src = fetchurl {
    url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage";
-    sha256 = "sha256-iWKe4l3n5e0CWd2h+tUtbPfmTznJb+UuKo3shAUDs1E=";
+    sha256 = "sha256-ZZnyPdwzIX0WNywcD2uYxaDG/cbgU8nyiwe0r3YIrs0=";
    name = "${pname}-${version}.AppImage";
  };

--- a/pkgs/applications/version-management/git-workspace/default.nix
+++ b/pkgs/applications/version-management/git-workspace/default.nix
@ -12,16 +12,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "git-workspace";
-  version = "1.1.0";
+  version = "1.2.1";

  src = fetchFromGitHub {
    owner = "orf";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-rCy6+cjjFgcMqYn48Gfw+tTIMmsTD9lz8h14EfXWatI=";
+    sha256 = "sha256-Ppb42u31/iJd743vKX+5RdI7aITsWg9Jg0Aheguep5s=";
  };

-  cargoSha256 = "sha256-aO9DYD20KQL2cLWy3uIQLJ1oR4PHNbgZLYi/Y8O6UHk=";
+  cargoSha256 = "sha256-O0wyNdgY1meEBJh/tEHxwzjNQdzxbKn5Ji+gdd146vQ=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch
+++ b/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch
@ -8,13 +8,13 @@ Subject: [PATCH] Remove geo from database.yml
 1 file changed, 28 deletions(-)

 diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
-index 5329a8e9fd7..a4daab1fd0c 100644
+index c1b1247b5b08..a81437d1e1b5 100644
 --- a/config/database.yml.postgresql
 +++ b/config/database.yml.postgresql
-@@ -18,13 +18,6 @@ production:
-     #     port: 8600
-     #     record: secondary.postgresql.service.consul
-     #     interval: 300
+@@ -26,13 +26,6 @@ production:
+   #   username: git
+   #   password: "secure password"
+   #   host: localhost
 -  geo:
 -    adapter: postgresql
 -    encoding: unicode
@ -25,10 +25,10 @@ index 5329a8e9fd7..a4daab1fd0c 100644
 
 #
 # Development specific
-@@ -39,13 +32,6 @@ development:
-     host: localhost
-     variables:
-       statement_timeout: 15s
+@@ -57,13 +50,6 @@ development:
+   #   host: localhost
+   #   variables:
+   #     statement_timeout: 15s
 -  geo:
 -    adapter: postgresql
 -    encoding: unicode
@ -39,10 +39,10 @@ index 5329a8e9fd7..a4daab1fd0c 100644
 
 #
 # Staging specific
-@@ -58,13 +44,6 @@ staging:
-     username: git
-     password: "secure password"
-     host: localhost
+@@ -84,13 +70,6 @@ staging:
+   #   username: git
+   #   password: "secure password"
+   #   host: localhost
 -  geo:
 -    adapter: postgresql
 -    encoding: unicode
@ -53,10 +53,10 @@ index 5329a8e9fd7..a4daab1fd0c 100644
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
-@@ -80,10 +59,3 @@ test: &test
-     prepared_statements: false
-     variables:
-       statement_timeout: 15s
+@@ -117,10 +96,3 @@ test: &test
+   #   prepared_statements: false
+   #   variables:
+   #     statement_timeout: 15s
 -  geo:
 -    adapter: postgresql
 -    encoding: unicode
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@ -1,14 +1,14 @@
 {
-  "version": "15.8.4",
-  "repo_hash": "sha256-8R2a934nC6n482Am7EruV3yHgxFSICuGcKgRBCy7GGI=",
-  "yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az",
+  "version": "15.9.3",
+  "repo_hash": "sha256-WYzhKknxx3NwCsXsQCPNQNdoya010YbVh9uTpcHgSl4=",
+  "yarn_hash": "0msrbzqz5hgyl0c6dcxyzi6qnf2k3fmg44d201pa578p08xb0lld",
  "owner": "gitlab-org",
  "repo": "gitlab",
-  "rev": "v15.8.4-ee",
+  "rev": "v15.9.3-ee",
  "passthru": {
-    "GITALY_SERVER_VERSION": "15.8.4",
-    "GITLAB_PAGES_VERSION": "15.8.4",
-    "GITLAB_SHELL_VERSION": "14.15.0",
-    "GITLAB_WORKHORSE_VERSION": "15.8.4"
+    "GITALY_SERVER_VERSION": "15.9.3",
+    "GITLAB_PAGES_VERSION": "15.9.3",
+    "GITLAB_SHELL_VERSION": "14.17.0",
+    "GITLAB_WORKHORSE_VERSION": "15.9.3"
  }
 }
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@ -166,6 +166,7 @@ stdenv.mkDerivation {
    # path, not their relative state directory path. This gets rid of
    # warnings and means we don't have to link back to lib from the
    # state directory.
+    ${replace}/bin/replace-literal -f -r -e '../../lib' "$out/share/gitlab/lib" config
    ${replace}/bin/replace-literal -f -r -e '../lib' "$out/share/gitlab/lib" config
    ${replace}/bin/replace-literal -f -r -e "require_relative 'application'" "require_relative '$out/share/gitlab/config/application'" config
  '';
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@ -1,10 +1,10 @@
 source 'https://rubygems.org'

-gem 'rugged', '~> 1.2'
-gem 'gitlab-markup', '~> 1.7.1'
-gem 'activesupport', '~> 6.1.6.1'
-gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools
-gem 'sentry-raven', '~> 3.0', require: false
+gem 'rugged', '~> 1.5.1'
+gem 'gitlab-markup', '~> 1.8.0'
+gem 'activesupport', '~> 6.1.7.2'
+gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools in ../tools/protogem
+gem 'sentry-raven', '~> 3.1', require: false
 gem 'rbtrace', require: false

 # The Gitaly Gem contains the Protobuf and gRPC definitions required by the
@ -12,13 +12,14 @@ gem 'rbtrace', require: false
 gem 'gitaly', '~> 15.5.0'

 # Labkit provides observability functionality
-gem 'gitlab-labkit', '~> 0.29'
+gem 'gitlab-labkit', '~> 0.31'

 # Detects the open source license the repository includes
 # This version needs to be in sync with GitLab CE/EE
 gem 'licensee', '~> 9.15'

 gem 'google-protobuf', '~> 3.21.12'
+gem 'nokogiri', '~> 1.14'

 # Rails is currently blocked on the upgrade to the new major version for Redis,
 # so we don't upgrade either until the issue is resolved. This is an indirect
@ -26,12 +27,11 @@ gem 'google-protobuf', '~> 3.21.12'
 gem 'redis', '~> 4.8.0'

 group :development, :test do
-  gem 'rubocop', '~> 0.69', require: false
-  gem 'rspec', require: false
+  gem 'rubocop', '~> 1.38', require: false
+  gem 'rspec', '~> 3.12.0', require: false
  gem 'rspec-parameterized', require: false
-  gem 'timecop', require: false
  gem 'factory_bot', require: false
-  gem 'pry', '~> 0.12.2', require: false
+  gem 'pry', '~> 0.13.1', require: false
 end

 # Gems required in omnibus-gitlab pipeline
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@ -1,52 +1,46 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    abstract_type (0.0.7)
-    actionpack (6.1.6.1)
-      actionview (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionpack (6.1.7.2)
+      actionview (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      rack (~> 2.0, >= 2.0.9)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionview (6.1.7.2)
+      activesupport (= 6.1.7.2)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.6.1)
+    activesupport (6.1.7.2)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
      tzinfo (~> 2.0)
      zeitwerk (~> 2.3)
-    adamantium (0.2.0)
-      ice_nine (~> 0.11.0)
-      memoizable (~> 0.4.0)
    addressable (2.8.0)
      public_suffix (>= 2.0.2, < 5.0)
    ast (2.4.2)
-    binding_ninja (0.2.3)
+    binding_of_caller (1.0.0)
+      debug_inspector (>= 0.0.1)
    builder (3.2.4)
    coderay (1.1.2)
-    concord (0.1.5)
-      adamantium (~> 0.2.0)
-      equalizer (~> 0.0.9)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
    crass (1.0.6)
+    debug_inspector (1.1.0)
    diff-lcs (1.3)
    dotenv (2.7.6)
-    equalizer (0.0.11)
-    erubi (1.11.0)
-    factory_bot (5.0.2)
-      activesupport (>= 4.2.0)
+    erubi (1.12.0)
+    factory_bot (6.2.1)
+      activesupport (>= 5.0.0)
    faraday (1.0.1)
      multipart-post (>= 1.2, < 3)
    ffi (1.15.5)
    gitaly (15.5.0)
      grpc (~> 1.0)
-    gitlab-labkit (0.29.0)
+    gitlab-labkit (0.31.0)
      actionpack (>= 5.0.0, < 8.0.0)
      activesupport (>= 5.0.0, < 8.0.0)
      grpc (>= 1.37)
@ -61,7 +55,7 @@ GEM
      tomlrb (>= 1.3, < 2.1)
      with_env (= 1.1.0)
      xml-simple (~> 1.1.5)
-    gitlab-markup (1.7.1)
+    gitlab-markup (1.8.1)
    google-protobuf (3.21.12)
    googleapis-common-protos-types (1.4.0)
      google-protobuf (~> 3.14)
@ -70,10 +64,10 @@ GEM
      googleapis-common-protos-types (~> 1.0)
    i18n (1.12.0)
      concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
    jaeger-client (1.1.0)
      opentracing (~> 0.3)
      thrift
+    json (2.6.3)
    licensee (9.15.2)
      dotenv (~> 2.0)
      octokit (~> 4.20)
@ -83,14 +77,12 @@ GEM
    loofah (2.19.1)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
-    memoizable (0.4.2)
-      thread_safe (~> 0.3, >= 0.3.1)
-    method_source (0.9.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    method_source (1.0.0)
+    mini_portile2 (2.8.1)
+    minitest (5.17.0)
    msgpack (1.3.3)
    multipart-post (2.1.1)
-    nokogiri (1.13.10)
+    nokogiri (1.14.1)
      mini_portile2 (~> 2.8.0)
      racc (~> 1.4)
    octokit (4.20.0)
@ -98,120 +90,118 @@ GEM
      sawyer (~> 0.8.0, >= 0.5.3)
    opentracing (0.5.0)
    optimist (3.0.1)
-    parallel (1.19.2)
-    parser (3.0.3.2)
+    parallel (1.22.1)
+    parser (3.2.0.0)
      ast (~> 2.4.1)
-    pg_query (2.2.0)
+    pg_query (2.2.1)
      google-protobuf (>= 3.19.2)
    proc_to_ast (0.1.0)
      coderay
      parser
      unparser
-    procto (0.0.3)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
    public_suffix (4.0.7)
-    racc (1.6.1)
-    rack (2.2.4)
+    racc (1.6.2)
+    rack (2.2.6.2)
    rack-test (2.0.2)
      rack (>= 1.3)
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
      loofah (~> 2.19, >= 2.19.1)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
    rbtrace (0.4.14)
      ffi (>= 1.0.6)
      msgpack (>= 0.4.3)
      optimist (>= 3.0.0)
    redis (4.8.0)
-    regexp_parser (1.8.1)
+    regexp_parser (2.6.2)
    reverse_markdown (1.4.0)
      nokogiri
    rexml (3.2.5)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-parameterized (0.4.2)
-      binding_ninja (>= 0.2.3)
+      rspec-support (~> 3.12.0)
+    rspec-parameterized (1.0.0)
+      rspec-parameterized-core (< 2)
+      rspec-parameterized-table_syntax (< 2)
+    rspec-parameterized-core (1.0.0)
      parser
      proc_to_ast
      rspec (>= 2.13, < 4)
      unparser
-    rspec-support (3.8.0)
-    rubocop (0.86.0)
+    rspec-parameterized-table_syntax (1.0.0)
+      binding_of_caller
+      rspec-parameterized-core (< 2)
+    rspec-support (3.12.0)
+    rubocop (1.44.0)
+      json (~> 2.3)
      parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.2.0.0)
      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
-      rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.2.0)
-      parser (>= 2.7.0.1)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.24.1)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
    rubyzip (2.3.2)
-    rugged (1.2.0)
+    rugged (1.5.1)
    sawyer (0.8.2)
      addressable (>= 2.3.5)
      faraday (> 0.8, < 2.0)
-    sentry-raven (3.0.4)
+    sentry-raven (3.1.2)
      faraday (>= 1.0)
    thor (1.1.0)
-    thread_safe (0.3.6)
    thrift (0.17.0)
-    timecop (0.9.1)
    tomlrb (2.0.1)
    tzinfo (2.0.5)
      concurrent-ruby (~> 1.0)
-    unicode-display_width (1.7.0)
-    unparser (0.4.7)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2.0)
-      concord (~> 0.1.5)
+    unicode-display_width (2.4.2)
+    unparser (0.6.7)
      diff-lcs (~> 1.3)
-      equalizer (~> 0.0.9)
-      parser (>= 2.6.5)
-      procto (~> 0.0.2)
+      parser (>= 3.2.0)
    with_env (1.1.0)
    xml-simple (1.1.9)
      rexml
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.6)

 PLATFORMS
  ruby

 DEPENDENCIES
-  activesupport (~> 6.1.6.1)
+  activesupport (~> 6.1.7.2)
  factory_bot
  gitaly (~> 15.5.0)
-  gitlab-labkit (~> 0.29)
+  gitlab-labkit (~> 0.31)
  gitlab-license_finder
-  gitlab-markup (~> 1.7.1)
+  gitlab-markup (~> 1.8.0)
  google-protobuf (~> 3.21.12)
  grpc (~> 1.42.0)
  licensee (~> 9.15)
-  pry (~> 0.12.2)
+  nokogiri (~> 1.14)
+  pry (~> 0.13.1)
  rbtrace
  redis (~> 4.8.0)
-  rspec
+  rspec (~> 3.12.0)
  rspec-parameterized
-  rubocop (~> 0.69)
-  rugged (~> 1.2)
-  sentry-raven (~> 3.0)
-  timecop
+  rubocop (~> 1.38)
+  rugged (~> 1.5.1)
+  sentry-raven (~> 3.1)

 BUNDLED WITH
-   2.3.26
+   2.4.6
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@ -11,7 +11,7 @@ let
    gemdir = ./.;
  };

-  version = "15.8.4";
+  version = "15.9.3";
  package_version = "v${lib.versions.major version}";
  gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";

@ -22,10 +22,10 @@ let
      owner = "gitlab-org";
      repo = "gitaly";
      rev = "v${version}";
-      sha256 = "sha256-att8MR94uINKOTYlj2sZLezMXZag11qP2p9T9a3Eklc=";
+      sha256 = "sha256-WBg1fo8tG0tfrsu8QtIo0SY1ZbktVHfcTf77Ny29DSM=";
    };

-    vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA=";
+    vendorSha256 = "sha256-IIvvI7CKLWB2W4fi/HLFtfZdovehxDmtQ8GUEw24fbY=";

    ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];

--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@ -1,22 +1,14 @@
 {
-  abstract_type = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14";
-      type = "gem";
-    };
-    version = "0.0.7";
-  };
  actionpack = {
    dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1m5x42s72mik9xkrgbway4ra139k71p2dfxcvg5gwdmac8maiq7k";
+      sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza";
      type = "gem";
    };
-    version = "6.1.6.1";
+    version = "6.1.7.2";
  };
  actionview = {
    dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -24,10 +16,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0syh8jwih5qvv87zfyzl37rz6sc1prhy6gia95bn76zyqk9cfzx8";
+      sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za";
      type = "gem";
    };
-    version = "6.1.6.1";
+    version = "6.1.7.2";
  };
  activesupport = {
    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@ -35,19 +27,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0vb0xi7yvgfqky9h4clyncb886mr1wvz9amk7d9ffmgpwrpzvjaz";
+      sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2";
      type = "gem";
    };
-    version = "6.1.6.1";
-  };
-  adamantium = {
-    dependencies = ["ice_nine" "memoizable"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak";
-      type = "gem";
-    };
-    version = "0.2.0";
+    version = "6.1.7.2";
  };
  addressable = {
    dependencies = ["public_suffix"];
@ -70,15 +53,16 @@
    };
    version = "2.4.2";
  };
-  binding_ninja = {
+  binding_of_caller = {
+    dependencies = ["debug_inspector"];
    groups = ["default" "development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "17fa3sv6p2fw9g8fxpwx1kjhhs28aw41akkba0hlgvk60055b1aa";
+      sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s";
      type = "gem";
    };
-    version = "0.2.3";
+    version = "1.0.0";
  };
  builder = {
    groups = ["default"];
@ -98,24 +82,15 @@
    };
    version = "1.1.2";
  };
-  concord = {
-    dependencies = ["adamantium" "equalizer"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg";
-      type = "gem";
-    };
-    version = "0.1.5";
-  };
  concurrent-ruby = {
    groups = ["default" "development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
+      sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5";
      type = "gem";
    };
-    version = "1.1.10";
+    version = "1.2.0";
  };
  crass = {
    groups = ["default"];
@ -127,6 +102,16 @@
    };
    version = "1.0.6";
  };
+  debug_inspector = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
  diff-lcs = {
    source = {
      remotes = ["https://rubygems.org"];
@ -145,23 +130,15 @@
    };
    version = "2.7.6";
  };
-  equalizer = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
-      type = "gem";
-    };
-    version = "0.0.11";
-  };
  erubi = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx";
+      sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7";
      type = "gem";
    };
-    version = "1.11.0";
+    version = "1.12.0";
  };
  factory_bot = {
    dependencies = ["activesupport"];
@ -169,10 +146,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "02ijqa3g6lb8l8mvi40z1zgh9bb3gr08p2r2ym159ghhfbcrmbwk";
+      sha256 = "1pfk942d6qwhw151hxaz7n4knk6whyxqvvywdx2cdw9yhykyaqzq";
      type = "gem";
    };
-    version = "5.0.2";
+    version = "6.2.1";
  };
  faraday = {
    dependencies = ["multipart-post"];
@ -212,10 +189,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "09xlv72nbys9a5iqvhxfzdr7vy3s3m2a6ixqb9vq71k925faq6gb";
+      sha256 = "07zd8r189qcqr3xp6dinlw94sylxbyn56nnas7k0aw6xvr74q12v";
      type = "gem";
    };
-    version = "0.29.0";
+    version = "0.31.0";
  };
  gitlab-license_finder = {
    dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"];
@ -233,10 +210,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0xnlra517pfj3hx07kasbqlcw51ix4xajr6bsd3mwg8bc92dlwy7";
+      sha256 = "0yvh8vv9kgd06hc8c1pl2hq56w56vr0n7dr5mz19fx4p2v89y7xb";
      type = "gem";
    };
-    version = "1.7.1";
+    version = "1.8.1";
  };
  google-protobuf = {
    groups = ["default"];
@ -281,14 +258,6 @@
    };
    version = "1.12.0";
  };
-  ice_nine = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
-      type = "gem";
-    };
-    version = "0.11.2";
-  };
  jaeger-client = {
    dependencies = ["opentracing" "thrift"];
    groups = ["default"];
@ -300,6 +269,16 @@
    };
    version = "1.1.0";
  };
+  json = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
+      type = "gem";
+    };
+    version = "2.6.3";
+  };
  licensee = {
    dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"];
    groups = ["default"];
@ -322,42 +301,35 @@
    };
    version = "2.19.1";
  };
-  memoizable = {
-    dependencies = ["thread_safe"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c";
-      type = "gem";
-    };
-    version = "0.4.2";
-  };
  method_source = {
+    groups = ["default" "development" "test"];
+    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
+      sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp";
      type = "gem";
    };
-    version = "0.9.2";
+    version = "1.0.0";
  };
  mini_portile2 = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
+      sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp";
      type = "gem";
    };
-    version = "2.8.0";
+    version = "2.8.1";
  };
  minitest = {
    groups = ["default" "development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30";
+      sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0";
      type = "gem";
    };
-    version = "5.16.3";
+    version = "5.17.0";
  };
  msgpack = {
    groups = ["default"];
@ -385,10 +357,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk";
+      sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj";
      type = "gem";
    };
-    version = "1.13.10";
+    version = "1.14.1";
  };
  octokit = {
    dependencies = ["faraday" "sawyer"];
@ -426,10 +398,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
+      sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
      type = "gem";
    };
-    version = "1.19.2";
+    version = "1.22.1";
  };
  parser = {
    dependencies = ["ast"];
@ -437,10 +409,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0sszdl9mpzqzn9kxrp28sqmg47mjxcwypr4d60vbajqba4v885di";
+      sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623";
      type = "gem";
    };
-    version = "3.0.3.2";
+    version = "3.2.0.0";
  };
  pg_query = {
    dependencies = ["google-protobuf"];
@ -448,10 +420,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0l79y41nwwacabj61jkbh4r7haajaf8y4bn5pihh0m1g8547b8w4";
+      sha256 = "1slcbzzqdv6104l5h8ql6kj43zmnm16g2dav8bc8dasfpwmrg1k0";
      type = "gem";
    };
-    version = "2.2.0";
+    version = "2.2.1";
  };
  proc_to_ast = {
    dependencies = ["coderay" "parser" "unparser"];
@ -462,22 +434,16 @@
    };
    version = "0.1.0";
  };
-  procto = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c";
-      type = "gem";
-    };
-    version = "0.0.3";
-  };
  pry = {
    dependencies = ["coderay" "method_source"];
+    groups = ["development" "test"];
+    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69";
+      sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk";
      type = "gem";
    };
-    version = "0.12.2";
+    version = "0.13.1";
  };
  public_suffix = {
    groups = ["default"];
@ -494,20 +460,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8";
+      sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq";
      type = "gem";
    };
-    version = "1.6.1";
+    version = "1.6.2";
  };
  rack = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa";
+      sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb";
      type = "gem";
    };
-    version = "2.2.4";
+    version = "2.2.6.2";
  };
  rack-test = {
    dependencies = ["rack"];
@ -537,18 +503,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9";
+      sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz";
      type = "gem";
    };
-    version = "1.4.4";
+    version = "1.5.0";
  };
  rainbow = {
+    groups = ["default" "development" "test"];
+    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
+      sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
      type = "gem";
    };
-    version = "3.0.0";
+    version = "3.1.1";
  };
  rbtrace = {
    dependencies = ["ffi" "msgpack" "optimist"];
@ -576,10 +544,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0n9d14ppshnx71i3mi1pnm3hwhcbb6m6vsc0b0dqgsab8r2rs96n";
+      sha256 = "0zjg29w5zvar7by1kqck3zilbdzm5iz3jp5d1zn3970krskfazh2";
      type = "gem";
    };
-    version = "1.8.1";
+    version = "2.6.2";
  };
  reverse_markdown = {
    dependencies = ["nokogiri"];
@ -608,10 +576,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3";
+      sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
      type = "gem";
    };
-    version = "3.8.0";
+    version = "3.12.0";
  };
  rspec-core = {
    dependencies = ["rspec-support"];
@ -619,10 +587,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1p1s5bnbqp3sxk67y0fh0x884jjym527r0vgmhbm81w7aq6b7l4p";
+      sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4";
      type = "gem";
    };
-    version = "3.8.0";
+    version = "3.12.0";
  };
  rspec-expectations = {
    dependencies = ["diff-lcs" "rspec-support"];
@ -630,10 +598,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1c4gs5ybf7km0qshdm92p38zvg32n1j2kr5fgs2icacz7xf2y6fy";
+      sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6";
      type = "gem";
    };
-    version = "3.8.3";
+    version = "3.12.2";
  };
  rspec-mocks = {
    dependencies = ["diff-lcs" "rspec-support"];
@ -641,42 +609,64 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "06y508cjqycb4yfhxmb3nxn0v9xqf17qbd46l1dh4xhncinr4fyp";
+      sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc";
      type = "gem";
    };
-    version = "3.8.0";
+    version = "3.12.3";
  };
  rspec-parameterized = {
-    dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"];
+    dependencies = ["rspec-parameterized-core" "rspec-parameterized-table_syntax"];
    groups = ["development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1c0892jbaznnldk1wi24qxm70g4zhw2idqx516rhgdzgd7yh5j31";
+      sha256 = "11mk52x34j957rqccxfqlsqjzg26dz04ipd1v4yx5yraqx1v01ww";
      type = "gem";
    };
-    version = "0.4.2";
+    version = "1.0.0";
+  };
+  rspec-parameterized-core = {
+    dependencies = ["parser" "proc_to_ast" "rspec" "unparser"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hfc2q7g8f5s6kdh1chwlalvz3fvj57vlfpn18b23677hm4ljyr8";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  rspec-parameterized-table_syntax = {
+    dependencies = ["binding_of_caller" "rspec-parameterized-core"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "134q0hki279np9dv7mgr85wspdrvhpj9lpvxr9kx6pcwzwg9bpyp";
+      type = "gem";
+    };
+    version = "1.0.0";
  };
  rspec-support = {
    groups = ["default" "development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0p3m7drixrlhvj2zpc38b11x145bvm311x6f33jjcxmvcm0wq609";
+      sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx";
      type = "gem";
    };
-    version = "3.8.0";
+    version = "3.12.0";
  };
  rubocop = {
-    dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
+    dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
    groups = ["development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1jl3ghxw1bpj272s5s3gl07l2rbd1vwr9z9jmlxxaa2faldn9gms";
+      sha256 = "0a2j57r6pvngqlzkmww031gs5isax3nsr9n7cbfpqnh34ljh2lk1";
      type = "gem";
    };
-    version = "0.86.0";
+    version = "1.44.0";
  };
  rubocop-ast = {
    dependencies = ["parser"];
@ -684,20 +674,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1w5rjkwxaxkr2jr1sl5wz0nffal27ik6b1qfzx5skl43vfk2jz97";
+      sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd";
      type = "gem";
    };
-    version = "0.2.0";
+    version = "1.24.1";
  };
  ruby-progressbar = {
    groups = ["default" "development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
+      sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
      type = "gem";
    };
-    version = "1.10.1";
+    version = "1.11.0";
  };
  rubyzip = {
    groups = ["default" "development" "omnibus" "test"];
@ -714,10 +704,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1v846qs2pa3wnzgz95jzbcdrgl9vyjl65qiscw4q4dvm5sb7j68i";
+      sha256 = "0wnfgxx59nq2wpvi8ll7bqw9x99x5hps6i38xdjrwbb5a3896d58";
      type = "gem";
    };
-    version = "1.2.0";
+    version = "1.5.1";
  };
  sawyer = {
    dependencies = ["addressable" "faraday"];
@ -736,10 +726,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "17j4br2lpnd8066d50mkg9kwk9v70hn3zfiqkvysd8p9nffmqnm0";
+      sha256 = "0jin9x4f43lplglhr9smv2wxsjgmph2ygqlci4s0v0aq5493ng8h";
      type = "gem";
    };
-    version = "3.0.4";
+    version = "3.1.2";
  };
  thor = {
    groups = ["default"];
@ -751,14 +741,6 @@
    };
    version = "1.1.0";
  };
-  thread_safe = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
-      type = "gem";
-    };
-    version = "0.3.6";
-  };
  thrift = {
    groups = ["default"];
    platforms = [];
@ -769,14 +751,6 @@
    };
    version = "0.17.0";
  };
-  timecop = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0d7mm786180v4kzvn1f77rhfppsg5n0sq2bdx63x9nv114zm8jrp";
-      type = "gem";
-    };
-    version = "0.9.1";
-  };
  tomlrb = {
    groups = ["default" "development" "omnibus" "test"];
    platforms = [];
@ -803,21 +777,21 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
+      sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a";
      type = "gem";
    };
-    version = "1.7.0";
+    version = "2.4.2";
  };
  unparser = {
-    dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"];
+    dependencies = ["diff-lcs" "parser"];
    groups = ["default" "development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0qg1apxlnf4kxfj9jpm6hhv73jsncbs4zpsgyan32p5r331q1gmx";
+      sha256 = "1j6ym6cn43ry4lvcal7cv0n9g9awny7kcrn1crp7cwx2vwzffhmf";
      type = "gem";
    };
-    version = "0.4.7";
+    version = "0.6.7";
  };
  with_env = {
    groups = ["default" "development" "omnibus" "test"];
@ -845,9 +819,9 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc";
+      sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv";
      type = "gem";
    };
-    version = "2.6.0";
+    version = "2.6.6";
  };
 }
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@ -1,20 +1,20 @@
-{ lib, fetchFromGitLab, buildGoModule, ruby }:
+{ lib, fetchFromGitLab, buildGoModule, ruby, libkrb5 }:

 buildGoModule rec {
  pname = "gitlab-shell";
-  version = "14.15.0";
+  version = "14.17.0";
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-shell";
    rev = "v${version}";
-    sha256 = "sha256-GDhYBL5LT3r6UIjDDY3LV5VgcBch190hYLPb6uMWETs=";
+    sha256 = "sha256-GTy+1O6Z7i+L8SSSQpYnN6SRfqDutkJYrj66tpX4f5M=";
  };

-  buildInputs = [ ruby ];
+  buildInputs = [ ruby libkrb5 ];

  patches = [ ./remove-hardcoded-locations.patch ];

-  vendorSha256 = "sha256-2DpQNJw67ipIW3ctHDJthuDrKNZCYvjXGlDxzBEMGWs=";
+  vendorSha256 = "sha256-mFGkT5lyQfcaGz503vgqx/kP5S0V2Ks5HDmjx+BxZzg=";

  postInstall = ''
    cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@ -5,7 +5,7 @@ in
 buildGoModule rec {
  pname = "gitlab-workhorse";

-  version = "15.8.4";
+  version = "15.9.3";

  src = fetchFromGitLab {
    owner = data.owner;
@ -16,7 +16,7 @@ buildGoModule rec {

  sourceRoot = "source/workhorse";

-  vendorSha256 = "sha256-0FWR6cIV/0R2OrOAKhvuVnIY3Hkw4CIjyBUeF/paumw=";
+  vendorSha256 = "sha256-wvoMBzRGp8RX2kHKKz3REDq8YLTsHbDayEMYi7hSzTE=";
  buildInputs = [ git ];
  ldflags = [ "-X main.Version=${version}" ];
  doCheck = false;
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@ -13,9 +13,9 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir
 # NOTE: When incrementing the major or minor version here, also increment activerecord_version
 # in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve
 # https://gitlab.com/gitlab-org/gitlab/-/issues/375713
-gem 'rails', '~> 6.1.6.1'
+gem 'rails', '~> 6.1.7.2'

-gem 'bootsnap', '~> 1.15.0', require: false
+gem 'bootsnap', '~> 1.16.0', require: false

 # Pin openssl to match the version bundled with our supported Rubies.
 # See https://stdgems.org/openssl/#gem-version.
@ -39,7 +39,7 @@ gem 'default_value_for', '~> 3.4.0'
 # Supported DBs
 gem 'pg', '~> 1.4.5'

-gem 'rugged', '~> 1.2'
+gem 'rugged', '~> 1.5'
 gem 'grape-path-helpers', '~> 1.7.1'

 gem 'faraday', '~> 1.0'
@ -62,25 +62,26 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0'
 gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md
 gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md
 gem 'omniauth-dingtalk-oauth2', '~> 1.0'
-gem 'omniauth-alicloud', '~> 2.0.0'
+gem 'omniauth-alicloud', '~> 2.0.1'
 gem 'omniauth-facebook', '~> 4.0.0'
 gem 'omniauth-github', '2.0.1'
 gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
 gem 'omniauth-google-oauth2', '~> 1.1'
 gem 'omniauth-oauth2-generic', '~> 0.2.2'
 gem 'omniauth-saml', '~> 2.0.0'
-gem 'omniauth-shibboleth', '~> 1.3.0'
 gem 'omniauth-twitter', '~> 1.4'
 gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
-gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', require: 'omniauth_openid_connect'
+gem 'omniauth_openid_connect', '~> 0.6.1'
+# Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem.
+# See https://docs.gitlab.com/ee/development/emails.html#rationale.
+gem 'openid_connect', '= 1.3.0'
 gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md
 gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
 gem 'rack-oauth2', '~> 1.21.3'
 gem 'jwt', '~> 2.1.0'

 # Kerberos authentication. EE-only
-gem 'gssapi', group: :kerberos
+gem 'gssapi', '~> 1.3.1', group: :kerberos
 gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos

 # Spam and anti-bot protection
@ -150,11 +151,26 @@ gem 'fog-google', '~> 1.19', require: 'fog/google'
 gem 'fog-local', '~> 0.8'
 gem 'fog-openstack', '~> 1.0'
 gem 'fog-rackspace', '~> 0.1.1'
-gem 'fog-aliyun', '~> 0.3'
-gem 'gitlab-fog-azure-rm', '~> 1.4.0', require: 'fog/azurerm'
+# NOTE:
+# the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches
+# the rest-client gem to drop the Content-Length header field for chunked transfers,
+# which may have knock-on effects on other features using `RestClient`.
+# We may want to update this dependency if this is ever addressed upstream, e.g. via
+# https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93
+gem 'fog-aliyun', '~> 0.4'
+gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/azurerm'

 # for Google storage
-gem 'google-api-client', '~> 0.33'
+gem 'google-cloud-storage', '~> 1.44.0'
+gem 'google-apis-core', '~> 0.10.0'
+gem 'google-apis-compute_v1', '~> 0.57.0'
+gem 'google-apis-container_v1', '~> 0.43.0'
+gem 'google-apis-container_v1beta1', '~> 0.43.0'
+gem 'google-apis-cloudbilling_v1', '~> 0.21.0'
+gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0'
+gem 'google-apis-iam_v1', '~> 0.36.0'
+gem 'google-apis-serviceusage_v1', '~> 0.28.0'
+gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0'

 # for aws storage
 gem 'unf', '~> 0.1.4'
@ -166,16 +182,16 @@ gem 'seed-fu', '~> 2.3.7'
 gem 'elasticsearch-model', '~> 7.2'
 gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
 gem 'elasticsearch-api',   '7.13.3'
-gem 'aws-sdk-core', '~> 3.168.4'
+gem 'aws-sdk-core', '~> 3.170.0'
 gem 'aws-sdk-cloudformation', '~> 1'
-gem 'aws-sdk-s3', '~> 1.117.2'
+gem 'aws-sdk-s3', '~> 1.119.1'
 gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
 gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections

 # Markdown and HTML processing
 gem 'html-pipeline', '~> 2.14.3'
 gem 'deckar01-task_list', '2.3.2'
-gem 'gitlab-markup', '~> 1.8.0', require: 'github/markup'
+gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup'
 gem 'commonmarker', '~> 0.23.6'
 gem 'kramdown', '~> 2.3.1'
 gem 'RedCloth', '~> 4.3.2'
@ -189,8 +205,7 @@ gem 'asciidoctor-plantuml', '~> 0.0.16'
 gem 'asciidoctor-kroki', '~> 0.7.0', require: false
 gem 'rouge', '~> 3.30.0'
 gem 'truncato', '~> 0.7.12'
-gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.13.10'
+gem 'nokogiri', '~> 1.14.1'

 # Calendar rendering
 gem 'icalendar'
@ -223,7 +238,7 @@ gem 'redis-namespace', '~> 1.9.0'
 gem 'gitlab-sidekiq-fetcher', '0.9.0', require: 'sidekiq-reliable-fetch'

 # Cron Parser
-gem 'fugit', '~> 1.2.1'
+gem 'fugit', '~> 1.8.1'

 # HTTP requests
 gem 'httparty', '~> 0.20.0'
@ -329,15 +344,15 @@ gem 'sentry-sidekiq', '~> 5.1.1'

 # PostgreSQL query parsing
 #
-gem 'pg_query', '~> 2.2'
+gem 'pg_query', '~> 2.2', '>= 2.2.1'

 gem 'premailer-rails', '~> 1.10.3'

-gem 'gitlab-labkit', '~> 0.29.0'
+gem 'gitlab-labkit', '~> 0.30.1'
 gem 'thrift', '>= 0.16.0'

 # I18n
-gem 'ruby_parser', '~> 3.15', require: false
+gem 'ruby_parser', '~> 3.19', require: false
 gem 'rails-i18n', '~> 7.0'
 gem 'gettext_i18n_rails', '~> 1.8.0'
 gem 'gettext_i18n_rails_js', '~> 1.3'
@ -358,12 +373,12 @@ gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client'
 gem 'warning', '~> 1.3.0'

 group :development do
-  gem 'lefthook', '~> 1.2.7', require: false
+  gem 'lefthook', '~> 1.2.9', require: false
  gem 'rubocop'
  gem 'solargraph', '~> 0.47.2', require: false

  gem 'letter_opener_web', '~> 2.0.0'
-  gem 'lookbook', '~> 1.4', '>= 1.4.5'
+  gem 'lookbook', '~> 1.5', '>= 1.5.3'

  # Better errors handler
  gem 'better_errors', '~> 2.9.1'
@ -378,13 +393,13 @@ group :development, :test do
  gem 'bullet', '~> 7.0.2'
  gem 'pry-byebug'
  gem 'pry-rails', '~> 0.3.9'
-  gem 'pry-shell', '~> 0.5.1'
+  gem 'pry-shell', '~> 0.6.1'

  gem 'awesome_print', require: false

  gem 'database_cleaner', '~> 1.7.0'
  gem 'factory_bot_rails', '~> 6.2.0'
-  gem 'rspec-rails', '~> 5.0.1'
+  gem 'rspec-rails', '~> 6.0.1'

  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
  gem 'minitest', '~> 5.11.0'
@ -395,7 +410,7 @@ group :development, :test do
  gem 'spring', '~> 4.1.0'
  gem 'spring-commands-rspec', '~> 1.0.4'

-  gem 'gitlab-styles', '~> 9.2.0', require: false
+  gem 'gitlab-styles', '~> 10.0.0', require: false

  gem 'haml_lint', '~> 0.40.0', require: false
  gem 'bundler-audit', '~> 0.7.0.1', require: false
@ -421,7 +436,7 @@ group :development, :test do
 end

 group :development, :test, :danger do
-  gem 'gitlab-dangerfiles', '~> 3.6.4', require: false
+  gem 'gitlab-dangerfiles', '~> 3.7.0', require: false
 end

 group :development, :test, :coverage do
@ -496,7 +511,7 @@ gem 'ssh_data', '~> 1.3'
 gem 'spamcheck', '~> 1.0.0'

 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 15.5.2'
+gem 'gitaly', '~> 15.9.0-rc3'

 # KAS GRPC protocol definitions
 gem 'kas-grpc', '~> 0.0.2'
@ -544,7 +559,7 @@ gem 'lockbox', '~> 1.1.1'
 gem 'valid_email', '~> 0.1'

 # JSON
-gem 'json', '~> 2.5.1'
+gem 'json', '~> 2.6.3'
 gem 'json_schemer', '~> 0.2.18'
 gem 'oj', '~> 3.13.21'
 gem 'oj-introspect', '~> 0.7'
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@ -100,63 +100,63 @@ GEM
    acme-client (2.0.11)
      faraday (>= 1.0, < 3.0.0)
      faraday-retry (~> 1.0)
-    actioncable (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actioncable (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activestorage (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionmailbox (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activestorage (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      mail (>= 2.7.1)
-    actionmailer (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      actionview (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionmailer (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      actionview (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (6.1.6.1)
-      actionview (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionpack (6.1.7.2)
+      actionview (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      rack (~> 2.0, >= 2.0.9)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activestorage (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actiontext (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activestorage (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      nokogiri (>= 1.8.5)
-    actionview (6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionview (6.1.7.2)
+      activesupport (= 6.1.7.2)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.6.1)
-      activesupport (= 6.1.6.1)
+    activejob (6.1.7.2)
+      activesupport (= 6.1.7.2)
      globalid (>= 0.3.6)
-    activemodel (6.1.6.1)
-      activesupport (= 6.1.6.1)
-    activerecord (6.1.6.1)
-      activemodel (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    activemodel (6.1.7.2)
+      activesupport (= 6.1.7.2)
+    activerecord (6.1.7.2)
+      activemodel (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
    activerecord-explain-analyze (0.1.0)
      activerecord (>= 4)
      pg
-    activestorage (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    activestorage (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      marcel (~> 1.0)
      mini_mime (>= 1.1.0)
-    activesupport (6.1.6.1)
+    activesupport (6.1.7.2)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
@ -168,6 +168,9 @@ GEM
      public_suffix (>= 2.0.2, < 6.0)
    aes_key_wrap (1.1.0)
    akismet (3.0.0)
+    aliyun-sdk (0.8.0)
+      nokogiri (~> 1.6)
+      rest-client (~> 2.0)
    android_key_attestation (0.3.0)
    apollo_upload_server (2.1.0)
      actionpack (>= 4.2)
@ -197,19 +200,19 @@ GEM
    awesome_print (1.9.2)
    awrence (1.1.1)
    aws-eventstream (1.2.0)
-    aws-partitions (1.674.0)
+    aws-partitions (1.703.0)
    aws-sdk-cloudformation (1.41.0)
      aws-sdk-core (~> 3, >= 3.99.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.168.4)
+    aws-sdk-core (3.170.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.651.0)
      aws-sigv4 (~> 1.5)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.61.0)
+    aws-sdk-kms (1.62.0)
      aws-sdk-core (~> 3, >= 3.165.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.117.2)
+    aws-sdk-s3 (1.119.1)
      aws-sdk-core (~> 3, >= 3.165.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
@ -241,11 +244,8 @@ GEM
      rack (>= 0.9.0)
    bindata (2.4.11)
    binding_ninja (0.2.3)
-    bootsnap (1.15.0)
+    bootsnap (1.16.0)
      msgpack (~> 1.2)
-    bootstrap_form (4.2.0)
-      actionpack (>= 5.0)
-      activemodel (>= 5.0)
    browser (5.3.1)
    builder (3.2.4)
    bullet (7.0.2)
@ -266,11 +266,11 @@ GEM
    capybara-screenshot (1.0.22)
      capybara (>= 1.0, < 4)
      launchy
-    carrierwave (1.3.2)
+    carrierwave (1.3.3)
      activemodel (>= 4.0.0)
      activesupport (>= 4.0.0)
      mime-types (>= 1.16)
-      ssrf_filter (~> 1.0)
+      ssrf_filter (~> 1.0, < 1.1.0)
    cbor (0.5.9.6)
    character_set (1.4.1)
      sorted_set (~> 1.0)
@ -294,7 +294,7 @@ GEM
    coderay (1.1.3)
    colored2 (3.1.2)
    commonmarker (0.23.6)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
    connection_pool (2.3.0)
    cork (0.3.0)
      colored2 (~> 3.1)
@ -334,7 +334,6 @@ GEM
    deckar01-task_list (2.3.2)
      html-pipeline
    declarative (0.0.20)
-    declarative-option (0.1.0)
    declarative_policy (1.1.0)
    default_value_for (3.4.0)
      activerecord (>= 3.2.0, < 7.0)
@ -368,6 +367,8 @@ GEM
    diff-lcs (1.5.0)
    diff_match_patch (0.1.0)
    diffy (3.4.2)
+    digest-crc (0.6.4)
+      rake (>= 12.0.0, < 14.0.0)
    discordrb-webhooks (3.4.2)
      rest-client (>= 2.0.0)
    docile (1.4.0)
@ -422,7 +423,7 @@ GEM
      launchy (~> 2.1)
      mail (~> 2.7)
    encryptor (3.0.0)
-    erubi (1.11.0)
+    erubi (1.12.0)
    escape_utils (1.2.1)
    et-orbi (1.2.7)
      tzinfo
@ -477,7 +478,7 @@ GEM
      faraday_middleware
      multi_json
    fast_blank (1.0.0)
-    fast_gettext (2.1.0)
+    fast_gettext (2.3.0)
    ffaker (2.10.0)
    ffi (1.15.5)
    ffi-compiler (1.0.1)
@ -494,7 +495,9 @@ GEM
    flipper-active_support_cache_store (0.25.0)
      activesupport (>= 4.2, < 8)
      flipper (~> 0.25.0)
-    fog-aliyun (0.3.3)
+    fog-aliyun (0.4.0)
+      addressable (~> 2.8.0)
+      aliyun-sdk (~> 0.8.0)
      fog-core
      fog-json
      ipaddress (~> 0.8)
@ -538,15 +541,14 @@ GEM
      fog-core
      nokogiri (>= 1.5.11, < 2.0.0)
    formatador (0.2.5)
-    fugit (1.2.3)
-      et-orbi (~> 1.1, >= 1.1.8)
-      raabro (~> 1.1)
+    fugit (1.8.1)
+      et-orbi (~> 1, >= 1.2.7)
+      raabro (~> 1.4)
    fuubar (2.2.0)
      rspec-core (~> 3.0)
      ruby-progressbar (~> 1.4)
    fuzzyurl (0.9.0)
    gemoji (3.0.1)
-    gems (1.2.0)
    get_process_mem (0.2.7)
      ffi (~> 1.0)
    gettext (3.3.6)
@ -561,28 +563,28 @@ GEM
      rails (>= 3.2.0)
    git (1.11.0)
      rchardet (~> 1.8)
-    gitaly (15.5.2)
+    gitaly (15.9.0.pre.rc3)
      grpc (~> 1.0)
    gitlab (4.19.0)
      httparty (~> 0.20)
      terminal-table (>= 1.5.1)
    gitlab-chronic (0.10.5)
      numerizer (~> 0.2)
-    gitlab-dangerfiles (3.6.4)
+    gitlab-dangerfiles (3.7.0)
      danger (>= 8.4.5)
      danger-gitlab (>= 8.0.0)
      rake
    gitlab-experiment (0.7.1)
      activesupport (>= 3.0)
      request_store (>= 1.0)
-    gitlab-fog-azure-rm (1.4.0)
+    gitlab-fog-azure-rm (1.7.0)
      azure-storage-blob (~> 2.0)
      azure-storage-common (~> 2.0)
      fog-core (= 2.1.0)
      fog-json (~> 1.2.0)
      mime-types
      ms_rest_azure (~> 0.12.0)
-    gitlab-labkit (0.29.0)
+    gitlab-labkit (0.30.1)
      actionpack (>= 5.0.0, < 8.0.0)
      activesupport (>= 5.0.0, < 8.0.0)
      grpc (>= 1.37)
@ -592,22 +594,17 @@ GEM
      redis (> 3.0.0, < 6.0.0)
    gitlab-license (2.2.1)
    gitlab-mail_room (0.0.9)
-    gitlab-markup (1.8.1)
+    gitlab-markup (1.9.0)
    gitlab-net-dns (0.9.1)
-    gitlab-omniauth-openid-connect (0.10.0)
-      addressable (~> 2.7)
-      omniauth (>= 1.9, < 3)
-      openid_connect (~> 1.2)
    gitlab-sidekiq-fetcher (0.9.0)
      json (>= 2.5)
      sidekiq (~> 6.1)
-    gitlab-styles (9.2.0)
-      rubocop (~> 1.38.0)
-      rubocop-gitlab-security (~> 0.1.1)
-      rubocop-graphql (~> 0.14)
-      rubocop-performance (~> 1.14)
-      rubocop-rails (~> 2.15)
-      rubocop-rspec (~> 2.15)
+    gitlab-styles (10.0.0)
+      rubocop (~> 1.43.0)
+      rubocop-graphql (~> 0.18)
+      rubocop-performance (~> 1.15)
+      rubocop-rails (~> 2.17)
+      rubocop-rspec (~> 2.18)
    gitlab_chronic_duration (0.10.6.2)
      numerizer (~> 0.2)
    gitlab_omniauth-ldap (2.2.0)
@ -622,12 +619,17 @@ GEM
      i18n (>= 0.7)
      multi_json
      request_store (>= 1.0)
-    google-api-client (0.53.0)
-      google-apis-core (~> 0.1)
-      google-apis-generator (~> 0.1)
-    google-apis-compute_v1 (0.53.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-apis-core (0.9.1)
+    google-apis-cloudbilling_v1 (0.21.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-cloudresourcemanager_v1 (0.31.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-compute_v1 (0.57.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-container_v1 (0.43.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-container_v1beta1 (0.43.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-core (0.10.0)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (>= 0.16.2, < 2.a)
      httpclient (>= 2.8.1, < 3.a)
@ -636,28 +638,36 @@ GEM
      retriable (>= 2.0, < 4.a)
      rexml
      webrick
-    google-apis-discovery_v1 (0.12.0)
-      google-apis-core (>= 0.9.0, < 2.a)
    google-apis-dns_v1 (0.28.0)
      google-apis-core (>= 0.9.0, < 2.a)
-    google-apis-generator (0.11.0)
-      activesupport (>= 5.0)
-      gems (~> 1.2)
+    google-apis-iam_v1 (0.36.0)
      google-apis-core (>= 0.9.1, < 2.a)
-      google-apis-discovery_v1 (~> 0.5)
-      thor (>= 0.20, < 2.a)
    google-apis-iamcredentials_v1 (0.15.0)
      google-apis-core (>= 0.9.0, < 2.a)
    google-apis-monitoring_v3 (0.37.0)
      google-apis-core (>= 0.9.1, < 2.a)
    google-apis-pubsub_v1 (0.30.0)
      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-sqladmin_v1beta4 (0.38.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-apis-storage_v1 (0.20.0)
+    google-apis-serviceusage_v1 (0.28.0)
      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-sqladmin_v1beta4 (0.41.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-cloud-core (1.6.0)
+      google-cloud-env (~> 1.0)
+      google-cloud-errors (~> 1.0)
    google-cloud-env (1.6.0)
      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.3.0)
+    google-cloud-storage (1.44.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.19.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
    google-protobuf (3.21.12)
    googleapis-common-protos-types (1.3.0)
      google-protobuf (~> 3.14)
@ -716,7 +726,7 @@ GEM
    grpc (1.42.0)
      google-protobuf (~> 3.18)
      googleapis-common-protos-types (~> 1.0)
-    gssapi (1.2.0)
+    gssapi (1.3.1)
      ffi (>= 1.0.1)
    guard (2.16.2)
      formatador (>= 0.2.4)
@ -799,7 +809,7 @@ GEM
      character_set (~> 1.4)
      regexp_parser (~> 2.5)
      regexp_property_values (~> 1.0)
-    json (2.5.1)
+    json (2.6.3)
    json-jwt (1.15.3)
      activesupport (>= 4.2)
      aes_key_wrap
@ -835,7 +845,7 @@ GEM
      kramdown (~> 2.0)
    launchy (2.5.0)
      addressable (~> 2.7)
-    lefthook (1.2.7)
+    lefthook (1.2.9)
    letter_opener (1.7.0)
      launchy (~> 2.2)
    letter_opener_web (2.0.0)
@ -873,7 +883,7 @@ GEM
    loofah (2.19.1)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
-    lookbook (1.4.5)
+    lookbook (1.5.3)
      actioncable
      activemodel
      css_parser
@ -883,7 +893,7 @@ GEM
      railties (>= 5.0)
      redcarpet (~> 3.5)
      rouge (>= 3.26, < 5.0)
-      view_component (~> 2.0)
+      view_component (> 2.0, < 4)
      yard (~> 0.9.25)
      zeitwerk (~> 2.5)
    lru_redux (1.1.0)
@ -903,7 +913,7 @@ GEM
    mini_histogram (0.3.1)
    mini_magick (4.10.1)
    mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.1)
    minitest (5.11.3)
    mixlib-cli (2.1.8)
    mixlib-config (3.0.9)
@ -924,7 +934,7 @@ GEM
    multi_json (1.14.1)
    multi_xml (0.6.0)
    multipart-post (2.2.3)
-    murmurhash3 (0.1.6)
+    murmurhash3 (0.1.7)
    mustermann (1.1.1)
      ruby2_keywords (~> 0.0.1)
    mustermann-grape (1.0.1)
@ -941,7 +951,7 @@ GEM
    netrc (0.11.0)
    nio4r (2.5.8)
    no_proxy_fix (0.1.2)
-    nokogiri (1.13.10)
+    nokogiri (1.14.1)
      mini_portile2 (~> 2.8.0)
      racc (~> 1.4)
    notiffany (0.1.3)
@ -973,22 +983,19 @@ GEM
      train-core
      wmi-lite (~> 1.0)
    oj (3.13.23)
-    oj-introspect (0.7.1)
+    oj-introspect (0.7.2)
      oj (>= 3.13.23)
    omniauth (2.1.0)
      hashie (>= 3.4.6)
      rack (>= 2.2.3)
      rack-protection
-    omniauth-alicloud (2.0.0)
+    omniauth-alicloud (2.0.1)
      omniauth-oauth2 (~> 1.8)
    omniauth-atlassian-oauth2 (0.2.0)
      omniauth (>= 1.1.1)
      omniauth-oauth2 (>= 1.5)
    omniauth-auth0 (2.0.0)
      omniauth-oauth2 (~> 1.4)
-    omniauth-authentiq (0.3.3)
-      jwt (>= 1.5)
-      omniauth-oauth2 (>= 1.5)
    omniauth-azure-activedirectory-v2 (2.0.0)
      omniauth-oauth2 (~> 1.8)
    omniauth-dingtalk-oauth2 (1.0.1)
@ -1015,11 +1022,12 @@ GEM
    omniauth-saml (2.0.0)
      omniauth (~> 2.0)
      ruby-saml (~> 1.9)
-    omniauth-shibboleth (1.3.0)
-      omniauth (>= 1.0.0)
    omniauth-twitter (1.4.0)
      omniauth-oauth (~> 1.1)
      rack
+    omniauth_openid_connect (0.6.1)
+      omniauth (>= 1.9, < 3)
+      openid_connect (~> 1.1)
    open4 (1.3.4)
    openid_connect (1.3.0)
      activemodel
@ -1039,7 +1047,7 @@ GEM
    org-ruby (0.9.12)
      rubypants (~> 0.2)
    orm_adapter (0.5.0)
-    os (1.1.1)
+    os (1.1.4)
    pact (1.63.0)
      pact-mock_service (~> 3.0, >= 3.3.1)
      pact-support (~> 1.16, >= 1.16.9)
@ -1064,7 +1072,7 @@ GEM
      expgen (~> 0.1)
      rainbow (~> 3.1.1)
    parallel (1.22.1)
-    parser (3.1.3.0)
+    parser (3.2.0.0)
      ast (~> 2.4.1)
    parslet (1.8.2)
    pastel (0.8.0)
@ -1072,7 +1080,7 @@ GEM
    peek (1.1.0)
      railties (>= 4.0.0)
    pg (1.4.5)
-    pg_query (2.2.0)
+    pg_query (2.2.1)
      google-protobuf (>= 3.19.2)
    plist (3.6.0)
    png_quantizator (0.2.1)
@ -1090,16 +1098,16 @@ GEM
      parser
      unparser
    prometheus-client-mmap (0.17.0)
-    pry (0.13.1)
+    pry (0.14.2)
      coderay (~> 1.1)
      method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
      byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (>= 0.13, < 0.15)
    pry-rails (0.3.9)
      pry (>= 0.10.4)
-    pry-shell (0.5.1)
-      pry (~> 0.13.0)
+    pry-shell (0.6.1)
+      pry (>= 0.13.0)
      tty-markdown
      tty-prompt
    public_suffix (5.0.0)
@ -1110,7 +1118,7 @@ GEM
      puma (>= 2.7)
    pyu-ruby-sasl (0.0.3.3)
    raabro (1.4.0)
-    racc (1.6.1)
+    racc (1.6.2)
    rack (2.2.6.2)
    rack-accept (0.4.5)
      rack (>= 0.4)
@ -1131,20 +1139,20 @@ GEM
    rack-test (2.0.2)
      rack (>= 1.3)
    rack-timeout (0.6.3)
-    rails (6.1.6.1)
-      actioncable (= 6.1.6.1)
-      actionmailbox (= 6.1.6.1)
-      actionmailer (= 6.1.6.1)
-      actionpack (= 6.1.6.1)
-      actiontext (= 6.1.6.1)
-      actionview (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activemodel (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activestorage (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    rails (6.1.7.2)
+      actioncable (= 6.1.7.2)
+      actionmailbox (= 6.1.7.2)
+      actionmailer (= 6.1.7.2)
+      actionpack (= 6.1.7.2)
+      actiontext (= 6.1.7.2)
+      actionview (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activemodel (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activestorage (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      bundler (>= 1.15.0)
-      railties (= 6.1.6.1)
+      railties (= 6.1.7.2)
      sprockets-rails (>= 2.0.0)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
@ -1153,14 +1161,14 @@ GEM
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
      loofah (~> 2.19, >= 2.19.1)
    rails-i18n (7.0.3)
      i18n (>= 0.7, < 2)
      railties (>= 6.0.0, < 8)
-    railties (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    railties (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      method_source
      rake (>= 12.2)
      thor (~> 1.0)
@ -1173,14 +1181,14 @@ GEM
      ffi (>= 1.0.6)
      msgpack (>= 0.4.3)
      optimist (>= 3.0.0)
-    rbtree (0.4.4)
+    rbtree (0.4.6)
    rchardet (1.8.0)
    rdoc (6.3.2)
    re2 (1.6.0)
    recaptcha (5.12.3)
      json
    recursive-open-struct (1.1.3)
-    redcarpet (3.5.1)
+    redcarpet (3.6.0)
    redis (4.8.0)
    redis-actionpack (5.3.0)
      actionpack (>= 5, < 8)
@ -1195,9 +1203,9 @@ GEM
      redis (>= 4, < 5)
    regexp_parser (2.6.0)
    regexp_property_values (1.0.0)
-    representable (3.0.4)
+    representable (3.2.0)
      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
    request_store (1.5.1)
      rack (>= 1.4)
@ -1220,40 +1228,40 @@ GEM
      chunky_png
    rqrcode-rails3 (0.1.7)
      rqrcode (>= 0.4.2)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
    rspec-benchmark (0.6.0)
      benchmark-malloc (~> 0.2)
      benchmark-perf (~> 0.6)
      benchmark-trend (~> 0.4)
      rspec (>= 3.0)
-    rspec-core (3.10.2)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.3)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.12.0)
    rspec-parameterized (0.5.0)
      binding_ninja (>= 0.2.3)
      parser
      proc_to_ast
      rspec (>= 2.13, < 4)
      unparser
-    rspec-rails (5.0.1)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      railties (>= 5.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
+    rspec-rails (6.0.1)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.11)
+      rspec-expectations (~> 3.11)
+      rspec-mocks (~> 3.11)
+      rspec-support (~> 3.11)
    rspec-retry (0.6.1)
      rspec-core (> 3.3)
-    rspec-support (3.10.3)
+    rspec-support (3.12.0)
    rspec_junit_formatter (0.6.0)
      rspec-core (>= 2, < 4, != 2.12.0)
    rspec_profiling (0.0.6)
@ -1261,31 +1269,32 @@ GEM
      pg
      rails
      sqlite3
-    rubocop (1.38.0)
+    rubocop (1.43.0)
      json (~> 2.3)
      parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
      rainbow (>= 2.2.2, < 4.0)
      regexp_parser (>= 1.8, < 3.0)
      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.24.1)
      parser (>= 3.1.1.0)
-    rubocop-gitlab-security (0.1.1)
-      rubocop (>= 0.51)
-    rubocop-graphql (0.18.0)
+    rubocop-capybara (2.17.0)
+      rubocop (~> 1.41)
+    rubocop-graphql (0.19.0)
      rubocop (>= 0.87, < 2)
-    rubocop-performance (1.15.1)
+    rubocop-performance (1.16.0)
      rubocop (>= 1.7.0, < 2.0)
      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.17.3)
+    rubocop-rails (2.17.4)
      activesupport (>= 4.2.0)
      rack (>= 1.1)
      rubocop (>= 1.33.0, < 2.0)
-    rubocop-rspec (2.16.0)
+    rubocop-rspec (2.18.1)
      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
    ruby-fogbugz (0.3.0)
      crack (~> 0.4)
      multipart-post (~> 2.0)
@ -1297,12 +1306,12 @@ GEM
      rexml
    ruby-statistics (3.0.0)
    ruby2_keywords (0.0.5)
-    ruby_parser (3.15.0)
-      sexp_processor (~> 4.9)
+    ruby_parser (3.19.2)
+      sexp_processor (~> 4.16)
    rubyntlm (0.6.3)
    rubypants (0.2.0)
    rubyzip (2.3.2)
-    rugged (1.2.0)
+    rugged (1.5.1)
    safe_yaml (1.0.4)
    safety_net_attestation (0.4.0)
      jwt (~> 2.0)
@ -1348,7 +1357,7 @@ GEM
      sidekiq (>= 3.0)
    set (1.0.1)
    settingslogic (2.0.9)
-    sexp_processor (4.15.1)
+    sexp_processor (4.16.1)
    shellany (0.0.1)
    shoulda-matchers (5.1.0)
      activesupport (>= 5.2.0)
@ -1412,9 +1421,10 @@ GEM
      actionpack (>= 5.2)
      activesupport (>= 5.2)
      sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
+    sqlite3 (1.6.0)
+      mini_portile2 (~> 2.8.0)
    ssh_data (1.3.0)
-    ssrf_filter (1.0.7)
+    ssrf_filter (1.0.8)
    stackprof (0.2.21)
    state_machines (0.5.0)
    state_machines-activemodel (0.8.0)
@ -1465,6 +1475,7 @@ GEM
    tpm-key_attestation (0.9.0)
      bindata (~> 2.4)
      openssl-signature_algorithm (~> 0.4.0)
+    trailblazer-option (0.1.2)
    train-core (3.4.9)
      addressable (~> 2.5)
      ffi (!= 1.13.0)
@ -1477,7 +1488,7 @@ GEM
      nokogiri (>= 1.7.0, <= 2.0)
    tty-color (0.6.0)
    tty-cursor (0.7.1)
-    tty-markdown (0.7.0)
+    tty-markdown (0.7.1)
      kramdown (>= 1.16.2, < 3.0)
      pastel (~> 0.8)
      rouge (~> 3.14)
@ -1494,18 +1505,18 @@ GEM
    tty-screen (0.8.1)
    typhoeus (1.4.0)
      ethon (>= 0.9.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
    u2f (0.2.1)
    uber (0.1.0)
-    undercover (0.4.4)
+    undercover (0.4.5)
      imagen (>= 0.1.8)
      rainbow (>= 2.1, < 4.0)
-      rugged (>= 0.27, < 1.3)
+      rugged (>= 0.27, < 1.6)
    unf (0.1.4)
      unf_ext
    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.4.2)
    unicode_utils (1.4.0)
    uniform_notifier (1.16.0)
    unleash (3.2.2)
@ -1596,8 +1607,8 @@ DEPENDENCIES
  autoprefixer-rails (= 10.2.5.1)
  awesome_print
  aws-sdk-cloudformation (~> 1)
-  aws-sdk-core (~> 3.168.4)
-  aws-sdk-s3 (~> 1.117.2)
+  aws-sdk-core (~> 3.170.0)
+  aws-sdk-s3 (~> 1.119.1)
  babosa (~> 1.0.4)
  base32 (~> 0.3.0)
  batch-loader (~> 2.0.1)
@ -1605,8 +1616,7 @@ DEPENDENCIES
  benchmark-ips (~> 2.3.0)
  benchmark-memory (~> 0.1)
  better_errors (~> 2.9.1)
-  bootsnap (~> 1.15.0)
-  bootstrap_form (~> 4.2.0)
+  bootsnap (~> 1.16.0)
  browser (~> 5.3.1)
  bullet (~> 7.0.2)
  bundler-audit (~> 0.7.0.1)
@ -1652,35 +1662,43 @@ DEPENDENCIES
  flipper (~> 0.25.0)
  flipper-active_record (~> 0.25.0)
  flipper-active_support_cache_store (~> 0.25.0)
-  fog-aliyun (~> 0.3)
+  fog-aliyun (~> 0.4)
  fog-aws (~> 3.15)
  fog-core (= 2.1.0)
  fog-google (~> 1.19)
  fog-local (~> 0.8)
  fog-openstack (~> 1.0)
  fog-rackspace (~> 0.1.1)
-  fugit (~> 1.2.1)
+  fugit (~> 1.8.1)
  fuubar (~> 2.2.0)
  gettext (~> 3.3)
  gettext_i18n_rails (~> 1.8.0)
  gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 15.5.2)
+  gitaly (~> 15.9.0.pre.rc3)
  gitlab-chronic (~> 0.10.5)
-  gitlab-dangerfiles (~> 3.6.4)
+  gitlab-dangerfiles (~> 3.7.0)
  gitlab-experiment (~> 0.7.1)
-  gitlab-fog-azure-rm (~> 1.4.0)
-  gitlab-labkit (~> 0.29.0)
+  gitlab-fog-azure-rm (~> 1.7.0)
+  gitlab-labkit (~> 0.30.1)
  gitlab-license (~> 2.2.1)
  gitlab-mail_room (~> 0.0.9)
-  gitlab-markup (~> 1.8.0)
+  gitlab-markup (~> 1.9.0)
  gitlab-net-dns (~> 0.9.1)
-  gitlab-omniauth-openid-connect (~> 0.10.0)
  gitlab-sidekiq-fetcher (= 0.9.0)
-  gitlab-styles (~> 9.2.0)
+  gitlab-styles (~> 10.0.0)
  gitlab_chronic_duration (~> 0.10.6.2)
  gitlab_omniauth-ldap (~> 2.2.0)
  gon (~> 6.4.0)
-  google-api-client (~> 0.33)
+  google-apis-cloudbilling_v1 (~> 0.21.0)
+  google-apis-cloudresourcemanager_v1 (~> 0.31.0)
+  google-apis-compute_v1 (~> 0.57.0)
+  google-apis-container_v1 (~> 0.43.0)
+  google-apis-container_v1beta1 (~> 0.43.0)
+  google-apis-core (~> 0.10.0)
+  google-apis-iam_v1 (~> 0.36.0)
+  google-apis-serviceusage_v1 (~> 0.28.0)
+  google-apis-sqladmin_v1beta4 (~> 0.41.0)
+  google-cloud-storage (~> 1.44.0)
  google-protobuf (~> 3.21, >= 3.21.12)
  gpgme (~> 2.0.22)
  grape (~> 1.5.2)
@ -1695,7 +1713,7 @@ DEPENDENCIES
  graphql (~> 1.13.12)
  graphql-docs (~> 2.1.0)
  grpc (~> 1.42.0)
-  gssapi
+  gssapi (~> 1.3.1)
  guard-rspec
  haml_lint (~> 0.40.0)
  hamlit (~> 2.15.0)
@ -1712,7 +1730,7 @@ DEPENDENCIES
  ipynbdiff!
  jira-ruby (~> 2.1.4)
  js_regex (~> 3.8)
-  json (~> 2.5.1)
+  json (~> 2.6.3)
  json_schemer (~> 0.2.18)
  jwt (~> 2.1.0)
  kaminari (~> 1.2.2)
@ -1720,7 +1738,7 @@ DEPENDENCIES
  knapsack (~> 1.21.1)
  kramdown (~> 2.3.1)
  kubeclient (~> 4.9.3)!
-  lefthook (~> 1.2.7)
+  lefthook (~> 1.2.9)
  letter_opener_web (~> 2.0.0)
  license_finder (~> 7.0)
  licensee (~> 9.15)
@ -1728,7 +1746,7 @@ DEPENDENCIES
  lockbox (~> 1.1.1)
  lograge (~> 0.5)
  loofah (~> 2.19.1)
-  lookbook (~> 1.4, >= 1.4.5)
+  lookbook (~> 1.5, >= 1.5.3)
  lru_redux
  mail (= 2.7.1)
  mail-smtp_pool (~> 0.1.0)!
@ -1740,17 +1758,16 @@ DEPENDENCIES
  multi_json (~> 1.14.1)
  net-ldap (~> 0.17.1)
  net-ntp
-  nokogiri (~> 1.13.10)
+  nokogiri (~> 1.14.1)
  oauth2 (~> 2.0)
  octokit (~> 4.15)
  ohai (~> 16.10)
  oj (~> 3.13.21)
  oj-introspect (~> 0.7)
  omniauth (~> 2.1.0)
-  omniauth-alicloud (~> 2.0.0)
+  omniauth-alicloud (~> 2.0.1)
  omniauth-atlassian-oauth2 (~> 0.2.0)
  omniauth-auth0 (~> 2.0.0)
-  omniauth-authentiq (~> 0.3.3)
  omniauth-azure-activedirectory-v2 (~> 2.0)
  omniauth-azure-oauth2 (~> 0.0.9)!
  omniauth-cas3 (~> 1.1.4)!
@ -1762,9 +1779,10 @@ DEPENDENCIES
  omniauth-oauth2-generic (~> 0.2.2)
  omniauth-salesforce (~> 1.0.5)!
  omniauth-saml (~> 2.0.0)
-  omniauth-shibboleth (~> 1.3.0)
  omniauth-twitter (~> 1.4)
  omniauth_crowd (~> 2.4.0)!
+  omniauth_openid_connect (~> 0.6.1)
+  openid_connect (= 1.3.0)
  openssl (= 2.2.2)
  org-ruby (~> 0.9.12)
  pact (~> 1.63)
@ -1772,13 +1790,13 @@ DEPENDENCIES
  parslet (~> 1.8)
  peek (~> 1.1)
  pg (~> 1.4.5)
-  pg_query (~> 2.2)
+  pg_query (~> 2.2, >= 2.2.1)
  png_quantizator (~> 0.2.1)
  premailer-rails (~> 1.10.3)
  prometheus-client-mmap (~> 0.17)
  pry-byebug
  pry-rails (~> 0.3.9)
-  pry-shell (~> 0.5.1)
+  pry-shell (~> 0.6.1)
  puma (~> 5.6.5)
  puma_worker_killer (~> 0.3.1)
  rack (~> 2.2.6, >= 2.2.6.2)
@ -1787,7 +1805,7 @@ DEPENDENCIES
  rack-oauth2 (~> 1.21.3)
  rack-proxy (~> 0.7.6)
  rack-timeout (~> 0.6.3)
-  rails (~> 6.1.6.1)
+  rails (~> 6.1.7.2)
  rails-controller-testing
  rails-i18n (~> 7.0)
  rainbow (~> 3.0)
@ -1806,7 +1824,7 @@ DEPENDENCIES
  rqrcode-rails3 (~> 0.1.7)
  rspec-benchmark (~> 0.6.0)
  rspec-parameterized
-  rspec-rails (~> 5.0.1)
+  rspec-rails (~> 6.0.1)
  rspec-retry (~> 0.6.1)
  rspec_junit_formatter
  rspec_profiling (~> 0.0.6)
@ -1815,9 +1833,9 @@ DEPENDENCIES
  ruby-magic (~> 0.5)
  ruby-progressbar (~> 1.10)
  ruby-saml (~> 1.13.0)
-  ruby_parser (~> 3.15)
+  ruby_parser (~> 3.19)
  rubyzip (~> 2.3.2)
-  rugged (~> 1.2)
+  rugged (~> 1.5)
  sanitize (~> 6.0)
  sassc-rails (~> 2.1.0)
  sd_notify (~> 0.1.0)
@ -1875,4 +1893,4 @@ DEPENDENCIES
  yajl-ruby (~> 1.4.3)

 BUNDLED WITH
-   2.3.26
+   2.4.6
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
--- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix
+++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix
@ -18,11 +18,11 @@

 buildPythonApplication rec {
  pname = "jellyfin-mpv-shim";
-  version = "2.5.0";
+  version = "2.6.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-B9orjQojiLwC90LZ4ynY7niw6fhJIaUn/DUXAYVMjfg=";
+    sha256 = "sha256-90Z2vgYT/9hBQZgfXeY7l6sGwT5KEY8X4rZMgrbTwrM=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
@ -0,0 +1,54 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, asio
+, cmake
+, curl
+, obs-studio
+, opencv
+, procps
+, qtbase
+, websocketpp
+, xorg
+}:
+
+stdenv.mkDerivation rec {
+  pname = "advanced-scene-switcher";
+  version = "1.20.5";
+
+  src = fetchFromGitHub {
+    owner = "WarmUpTill";
+    repo = "SceneSwitcher";
+    rev = version;
+    sha256 = "04k7f7v756vdsan95g73cc29lrs61jis738v37a3ihi3ivps3ma3";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    asio
+    curl
+    obs-studio
+    opencv
+    procps
+    qtbase
+    websocketpp
+    xorg.libXScrnSaver
+  ];
+
+  dontWrapQtApps = true;
+
+  postInstall = ''
+    mkdir $out/lib $out/share
+    mv $out/obs-plugins/64bit $out/lib/obs-plugins
+    mv $out/data $out/share/obs
+  '';
+
+  meta = {
+    description = "An automated scene switcher for OBS Studio";
+    homepage = "https://github.com/WarmUpTill/SceneSwitcher";
+    maintainers = with lib.maintainers; [ paveloom ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+  };
+}
--- a/pkgs/applications/video/obs-studio/plugins/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/default.nix
@ -6,6 +6,8 @@
 # - Add plugin to it's own directory (because of future patches).

 {
+  advanced-scene-switcher = qt6Packages.callPackage ./advanced-scene-switcher { };
+
  droidcam-obs = callPackage ./droidcam-obs { };

  input-overlay = qt6Packages.callPackage ./input-overlay.nix { };
--- a/pkgs/applications/video/vokoscreen-ng/default.nix
+++ b/pkgs/applications/video/vokoscreen-ng/default.nix
@ -15,28 +15,24 @@
 , gst-plugins-good
 , gst-plugins-bad
 , gst-plugins-ugly
+, wayland
+, wrapQtAppsHook
 }:
-mkDerivation rec {

+mkDerivation rec {
  pname = "vokoscreen-ng";
-  version = "3.0.8";
+  version = "3.5.0";

  src = fetchFromGitHub {
    owner = "vkohaupt";
    repo = "vokoscreenNG";
    rev = version;
-    sha256 = "1302663hyp2xxhaavhfky24a2p9gz23i3rykmrc6c1n23h24snri";
+    sha256 = "sha256-4VEIQj9/rSzXM5EQFt2I+cKKOM1URKlblf+6vlWEuO0=";
  };

-  patches = [
-    # Adaptation of previously used https://github.com/City-busz/vokoscreenNG/commit/0a3784095ecca582f7eb09551ceb34c309d83637 patch
-    # used for 3.0.5 but incompatible at least since 3.0.8. The issue is addressed here https://github.com/vkohaupt/vokoscreenNG/issues/139
-    ./linux-support-installation-target.patch
-  ];
-
  qmakeFlags = [ "src/vokoscreenNG.pro" ];

-  nativeBuildInputs = [ qttools pkg-config qmake ];
+  nativeBuildInputs = [ qttools pkg-config qmake wrapQtAppsHook ];
  buildInputs = [
    gstreamer
    libX11
@ -44,7 +40,7 @@ mkDerivation rec {
    qtbase
    qtmultimedia
    qtx11extras
-
+    wayland
    gst-plugins-base
    gst-plugins-good
    gst-plugins-bad
@ -57,7 +53,12 @@ mkDerivation rec {
  '';

  postInstall = ''
+    mkdir -p $out/bin $out/share/applications $out/share/icons
+    cp ./vokoscreenNG $out/bin/
+    cp ./src/applications/vokoscreenNG.desktop $out/share/applications/
+    cp ./src/applications/vokoscreenNG.png $out/share/icons/
    qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+    wrapQtApp $out/bin/vokoscreenNG
  '';

  meta = with lib; {
--- a/pkgs/applications/video/vokoscreen-ng/linux-support-installation-target.patch
+++ b/pkgs/applications/video/vokoscreen-ng/linux-support-installation-target.patch
@ -1,40 +0,0 @@
-Seulement dans b: patch.patch
-Seulement dans b: ..rej
-diff --color -ur a/src/vokoscreenNG.pro b/src/vokoscreenNG.pro
--- a/src/vokoscreenNG.pro	2021-02-03 15:00:57.377401016 +0100
-+++ b/src/vokoscreenNG.pro	2021-02-03 15:09:18.141905863 +0100
-@@ -160,7 +160,32 @@
- # systrayAlternative
- include(systrayAlternative/systrayAlternative.pri)
- 
-+unix:!macx {
-+  isEmpty(PREFIX) {
-+    PREFIX = /usr/local
-+  }
-+  isEmpty(BINDIR) {
-+    BINDIR = $$PREFIX/bin
-+  }
-+  isEmpty(DATADIR) {
-+    DATADIR = $$PREFIX/share
-+  }
-+
-+  target.path = $$BINDIR
-+
-+  icon.files = applications/vokoscreenNG.png
-+  icon.path = $$DATADIR/icons/hicolor/256x256/apps/
-+
-+  desktop.files = applications/vokoscreenNG.desktop
-+  desktop.path = $$DATADIR/applications/
-+
-+  appdata.files = applications/vokoscreenNG.appdata.xml
-+  appdata.path = $$DATADIR/metainfo/
-+
-+  INSTALLS += target icon desktop appdata
-+}
- # ciscoOpenh264
- win32:include(ciscoOpenh264/ciscoOpenh264.pri)
- 
-unix:include(wayland/wayland.pri)
-\ Pas de fin de ligne à la fin du fichier
-+unix:include(wayland/wayland.pri)
-+
--- a/pkgs/applications/virtualization/lima/bin.nix
+++ b/pkgs/applications/virtualization/lima/bin.nix
@ -9,31 +9,31 @@
 }:

 let
-  version = "0.14.2";
+  version = "0.15.0";

  dist = {
    aarch64-darwin = rec {
      archSuffix = "Darwin-arm64";
      url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
-      sha256 = "8334d83ca9555271b9843040066057dd8462a774f60dfaedbe97fae3834c3894";
+      sha256 = "0da51d3c179e89bde404ea40be88b5c11aea8c7cf50cd030fd5b779e91462856";
    };

    x86_64-darwin = rec {
      archSuffix = "Darwin-x86_64";
      url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
-      sha256 = "3866113c92619f0041ff6fc68fef2bf16e751058b9237289b2bea8fb960bdab0";
+      sha256 = "c535bc21923bc290ac56fe3a9ea87e8740c7c51e030f05cc32d51e726a59673e";
    };

    aarch64-linux = rec {
      archSuffix = "Linux-aarch64";
      url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
-      sha256 = "373be7ebcf5932570c384c6bfb159cd418011b98a18c26ba0467827dad302230";
+      sha256 = "964c897f6dc2a6e203b0c109a7cd59102fe192837c792549b597d7ac301ecf54";
    };

    x86_64-linux = rec {
      archSuffix = "Linux-x86_64";
      url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
-      sha256 = "44cae71eae65673afcc22c557f6385aa98792aecbb43195de48217581ae39143";
+      sha256 = "5ec308716abe8833ce36d6e77cac44d98d7cfc8add8dbcbe053a91af01cecfa1";
    };
  };
 in
--- a/pkgs/applications/window-managers/gamescope/default.nix
+++ b/pkgs/applications/window-managers/gamescope/default.nix
@ -1,11 +1,13 @@
 { stdenv
 , fetchFromGitHub
+, fetchpatch
 , meson
 , pkg-config
 , ninja
 , xorg
 , libdrm
 , vulkan-loader
+, vulkan-headers
 , wayland
 , wayland-protocols
 , libxkbcommon
@ -18,15 +20,25 @@
 , seatd
 , xwayland
 , glslang
+, hwdata
+, openvr
 , stb
 , wlroots
 , libliftoff
+, libdisplay-info
 , lib
 , makeBinaryWrapper
 }:
 let
  pname = "gamescope";
-  version = "3.11.49";
+  version = "3.11.52-beta6";
+
+  vkroots = fetchFromGitHub {
+    owner = "Joshua-Ashton";
+    repo = "vkroots";
+    rev = "26757103dde8133bab432d172b8841df6bb48155";
+    sha256 = "sha256-eet+FMRO2aBQJcCPOKNKGuQv5oDIrgdVPRO00c5gkL0=";
+  };
 in
 stdenv.mkDerivation {
  inherit pname version;
@ -35,10 +47,37 @@ stdenv.mkDerivation {
    owner = "Plagman";
    repo = "gamescope";
    rev = "refs/tags/${version}";
-    hash = "sha256-GRq/b013wFRHzFz2YCulJRtcwzX/dhJKd8dkATSLug0=";
+    hash = "sha256-2gn6VQfmwwl86mmnRh+J1uxSIpA5x/Papq578seJ3n8=";
  };

-  patches = [ ./use-pkgconfig.patch ];
+  patches = [
+    ./use-pkgconfig.patch
+
+    # https://github.com/Plagman/gamescope/pull/811
+    (fetchpatch {
+      name = "fix-openvr-dependency-name.patch";
+      url = "https://github.com/Plagman/gamescope/commit/557e56badec7d4c56263d3463ca9cdb195e368d7.patch";
+      sha256 = "sha256-9Y1tJ24EsdtZEOCEA30+FJBrdzXX+Nj3nTb5kgcPfBE=";
+    })
+    # https://github.com/Plagman/gamescope/pull/813
+    (fetchpatch {
+      name = "fix-openvr-include.patch";
+      url = "https://github.com/Plagman/gamescope/commit/1331b9f81ea4b3ae692a832ed85a464c3fd4c5e9.patch";
+      sha256 = "sha256-wDtFpM/nMcqSbIpR7K5Tyf0845r3l4kQHfwll1VL4Mc=";
+    })
+    # https://github.com/Plagman/gamescope/pull/812
+    (fetchpatch {
+      name = "bump-libdisplay-info-maximum-version.patch";
+      url = "https://github.com/Plagman/gamescope/commit/b430c5b9a05951755051fd4e41ce20496705fbbc.patch";
+      sha256 = "sha256-YHtwudMUHiE8i3ZbiC9gkSjrlS0/7ydjmJsY1a8ZI2E=";
+    })
+    # https://github.com/Plagman/gamescope/pull/824
+    (fetchpatch {
+      name = "update-libdisplay-info-pkgconfig-filename.patch";
+      url = "https://github.com/Plagman/gamescope/commit/5a672f09aa07c7c5d674789f3c685c8173e7a2cf.patch";
+      sha256 = "sha256-7NX54WIsJDvZT3C58N2FQasV9PJyKkJrLGYS1r4f+kc=";
+    })
+  ];

  nativeBuildInputs = [
    meson
@ -56,9 +95,11 @@ stdenv.mkDerivation {
    xorg.libXtst
    xorg.libXres
    xorg.libXi
+    xorg.libXmu
    libdrm
    libliftoff
    vulkan-loader
+    vulkan-headers
    glslang
    SDL2
    wayland
@ -73,8 +114,17 @@ stdenv.mkDerivation {
    pipewire
    libcap
    stb
+    hwdata
+    openvr
+    vkroots
+    libdisplay-info
  ];

+  postUnpack = ''
+    rm -rf source/subprojects/vkroots
+    ln -s ${vkroots} source/subprojects/vkroots
+  '';
+
  # --debug-layers flag expects these in the path
  postInstall = ''
    wrapProgram "$out/bin/gamescope" \
@ -85,7 +135,7 @@ stdenv.mkDerivation {
    description = "SteamOS session compositing window manager";
    homepage = "https://github.com/Plagman/gamescope";
    license = licenses.bsd2;
-    maintainers = with maintainers; [ nrdxp zhaofengli ];
+    maintainers = with maintainers; [ nrdxp pedrohlc Scrumplex zhaofengli ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@ -15,16 +15,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "i3status-rust";
-  version = "0.22.0";
+  version = "0.30.4";

  src = fetchFromGitHub {
    owner = "greshake";
    repo = pname;
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-9Fp5k14QkV1CwLSL1nUUu6NYIpjfvI9vNJRYNqvyr3M=";
+    hash = "sha256-yJFM7+fpG/vnYvHRT+34rqToCfj8pjKpPRKQ49p2mh0=";
  };

-  cargoSha256 = "sha256-MzosatZ4yPHAdANqOBPVW2wpjnojLo9B9N9o4DtU0Iw=";
+  cargoHash = "sha256-G2Yveyplq/SdHgc+sipQqQ67YAU/dPteESVJ8My5Hqs=";

  nativeBuildInputs = [ pkg-config makeWrapper ];

--- a/pkgs/applications/window-managers/nimdow/default.nix
+++ b/pkgs/applications/window-managers/nimdow/default.nix
@ -0,0 +1,36 @@
+{ lib, fetchFromGitHub, nimPackages, libX11, libXft, libXinerama }:
+nimPackages.buildNimPackage rec {
+  pname = "nimdow";
+  version = "0.7.36";
+
+
+  src = fetchFromGitHub {
+    owner = "avahe-kellenberger";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-+36wxKgboOd3HvGnD555WySzJWGL39DaFXmIaFYtSN8=";
+  };
+
+
+  buildInputs = with nimPackages; [ parsetoml x11 safeset libX11 libXft libXinerama ];
+
+  postInstall = ''
+    install -D config.default.toml $out/share/nimdow/config.default.toml
+    install -D nimdow.desktop $out/share/applications/nimdow.desktop
+  '';
+
+  postPatch = ''
+    substituteInPlace src/nimdowpkg/config/configloader.nim --replace "/usr/share/nimdow" "$out/share/nimdow"
+  '';
+
+
+
+  doCheck = true;
+
+  meta = with lib;
+    src.meta // {
+      description = "Nim based tiling window manager";
+      license = [ licenses.gpl2 ];
+      maintainers = [ maintainers.marcusramberg ];
+    };
+}
--- a/pkgs/build-support/ocaml/dune.nix
+++ b/pkgs/build-support/ocaml/dune.nix
@ -30,7 +30,10 @@ stdenv.mkDerivation ({
  '';
  installPhase = ''
    runHook preInstall
-    dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname}
+    dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} \
+     ${if lib.versionAtLeast Dune.version "2.9"
+       then "--docdir $out/share/doc"
+       else ""}
    runHook postInstall
  '';

--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck }:
+{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck, haskell }:

 let
  inherit (lib)
@ -341,7 +341,9 @@ rec {
        if checkPhase == null then ''
          runHook preCheck
          ${stdenv.shellDryRun} "$target"
-          ${lib.getExe shellcheck} "$target"
+          # use shellcheck which does not include docs
+          # pandoc takes long to build and documentation isn't needed for in nixpkgs usage
+          ${lib.getExe (haskell.lib.compose.justStaticExecutables shellcheck.unwrapped)} "$target"
          runHook postCheck
        ''
        else checkPhase;
--- a/pkgs/data/fonts/mononoki/default.nix
+++ b/pkgs/data/fonts/mononoki/default.nix
@ -2,19 +2,19 @@

 stdenvNoCC.mkDerivation rec {
  pname = "mononoki";
-  version = "1.3";
+  version = "1.5";

  src = fetchzip {
    url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip";
    stripRoot = false;
-    hash = "sha256-bZYBRdmbQVs4i6UzMIHwJnoLWggX4CW8ZogNFYiX/9w=";
+    hash = "sha256-H5Iu7nSrB5UGlCSjTM3SLu+IjaAffk9TCm5OoOleKvw=";
  };

  installPhase = ''
    runHook preInstall

    mkdir -p $out/share/fonts/mononoki
-    cp webfont/* $out/share/fonts/mononoki
+    cp * $out/share/fonts/mononoki

    runHook postInstall
  '';
--- a/pkgs/development/beam-modules/erlang-ls/default.nix
+++ b/pkgs/development/beam-modules/erlang-ls/default.nix
@ -30,10 +30,9 @@ rebar3Relx {
  releaseType = "escript";
  beamDeps = builtins.attrValues deps;

-  # Skip "els_hover_SUITE" test for Erlang/OTP 25+ while upstream hasn't fixed it
-  # https://github.com/erlang-ls/erlang_ls/pull/1402
-  postPatch = lib.optionalString (lib.versionOlder "25" erlang.version) ''
-    rm apps/els_lsp/test/els_hover_SUITE.erl
+  # https://github.com/erlang-ls/erlang_ls/issues/1429
+  postPatch =  ''
+    rm apps/els_lsp/test/els_diagnostics_SUITE.erl
  '';

  buildPlugins = [ rebar3-proper ];
--- a/pkgs/development/compilers/cudatoolkit/common.nix
+++ b/pkgs/development/compilers/cudatoolkit/common.nix
@ -151,6 +151,10 @@ backendStdenv.mkDerivation rec {
  # Refer to comments in the overrides for cuda_nvcc for explanation
  # CUDA_TOOLKIT_ROOT_DIR is legacy,
  # Cf. https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables
+  # NOTE: We unconditionally set -Xfatbin=-compress-all, which reduces the size of the compiled
+  #   binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as
+  #   the default set of CUDA capabilities we build can regularly cause this to occur (for
+  #   example, with Magma).
  ''
    mkdir -p $out/nix-support
    cat <<EOF >> $out/nix-support/setup-hook
@ -160,7 +164,7 @@ backendStdenv.mkDerivation rec {
    if [ -z "\''${CUDAHOSTCXX-}" ]; then
      export CUDAHOSTCXX=${backendStdenv.cc}/bin;
    fi
-    export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${backendStdenv.cc}/bin'
+    export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${backendStdenv.cc}/bin -Xfatbin=-compress-all'
    EOF

    # Move some libraries to the lib output so that programs that
--- a/pkgs/development/compilers/cudatoolkit/flags.nix
+++ b/pkgs/development/compilers/cudatoolkit/flags.nix
@ -4,12 +4,8 @@
 }:

 # Type aliases
-# Gpu = {
-#   archName: String, # e.g., "Hopper"
-#   computeCapability: String, # e.g., "9.0"
-#   minCudaVersion: String, # e.g., "11.8"
-#   maxCudaVersion: String, # e.g., "12.0"
-# }
+# Gpu :: AttrSet
+#   - See the documentation in ./gpus.nix.

 let
  inherit (lib) attrsets lists strings trivial versions;
@ -34,22 +30,40 @@ let
  # gpus :: List Gpu
  gpus = builtins.import ./gpus.nix;

-  # isVersionIn :: Gpu -> Bool
+  # isSupported :: Gpu -> Bool
  isSupported = gpu:
    let
      inherit (gpu) minCudaVersion maxCudaVersion;
      lowerBoundSatisfied = strings.versionAtLeast cudaVersion minCudaVersion;
-      upperBoundSatisfied = !(strings.versionOlder maxCudaVersion cudaVersion);
+      upperBoundSatisfied = (maxCudaVersion == null)
+        || !(strings.versionOlder maxCudaVersion cudaVersion);
    in
    lowerBoundSatisfied && upperBoundSatisfied;

+  # isDefault :: Gpu -> Bool
+  isDefault = gpu:
+    let
+      inherit (gpu) dontDefaultAfter;
+      newGpu = dontDefaultAfter == null;
+      recentGpu = newGpu || strings.versionAtLeast dontDefaultAfter cudaVersion;
+    in
+    recentGpu;
+
  # supportedGpus :: List Gpu
  # GPUs which are supported by the provided CUDA version.
  supportedGpus = builtins.filter isSupported gpus;

+  # defaultGpus :: List Gpu
+  # GPUs which are supported by the provided CUDA version and we want to build for by default.
+  defaultGpus = builtins.filter isDefault supportedGpus;
+
  # supportedCapabilities :: List Capability
  supportedCapabilities = lists.map (gpu: gpu.computeCapability) supportedGpus;

+  # defaultCapabilities :: List Capability
+  # The default capabilities to target, if not overridden by the user.
+  defaultCapabilities = lists.map (gpu: gpu.computeCapability) defaultGpus;
+
  # cudaArchNameToVersions :: AttrSet String (List String)
  # Maps the name of a GPU architecture to different versions of that architecture.
  # For example, "Ampere" maps to [ "8.0" "8.6" "8.7" ].
@ -151,6 +165,6 @@ assert (formatCapabilities { cudaCapabilities = [ "7.5" "8.6" ]; }) == {
  # dropDot :: String -> String
  inherit dropDot;
 } // formatCapabilities {
-  cudaCapabilities = config.cudaCapabilities or supportedCapabilities;
+  cudaCapabilities = config.cudaCapabilities or defaultCapabilities;
  enableForwardCompat = config.cudaForwardCompat or true;
 }
--- a/pkgs/development/compilers/cudatoolkit/gpus.nix
+++ b/pkgs/development/compilers/cudatoolkit/gpus.nix
@ -1,110 +1,148 @@
 [
+  # Type alias
+  # Gpu = {
+  #   archName: String
+  #     - The name of the microarchitecture.
+  #   computeCapability: String
+  #     - The compute capability of the GPU.
+  #   minCudaVersion: String
+  #     - The minimum (inclusive) CUDA version that supports this GPU.
+  #   dontDefaultAfter: null | String
+  #     - The CUDA version after which to exclude this GPU from the list of default capabilities
+  #       we build. null means we always include this GPU in the default capabilities if it is
+  #       supported.
+  #   maxCudaVersion: null | String
+  #     - The maximum (exclusive) CUDA version that supports this GPU. null means there is no
+  #       maximum.
+  # }
  {
    archName = "Kepler";
    computeCapability = "3.0";
    minCudaVersion = "10.0";
+    dontDefaultAfter = "10.2";
    maxCudaVersion = "10.2";
  }
  {
    archName = "Kepler";
    computeCapability = "3.2";
    minCudaVersion = "10.0";
+    dontDefaultAfter = "10.2";
    maxCudaVersion = "10.2";
  }
  {
    archName = "Kepler";
    computeCapability = "3.5";
    minCudaVersion = "10.0";
+    dontDefaultAfter = "11.0";
    maxCudaVersion = "11.8";
  }
  {
    archName = "Kepler";
    computeCapability = "3.7";
    minCudaVersion = "10.0";
+    dontDefaultAfter = "11.0";
    maxCudaVersion = "11.8";
  }
  {
    archName = "Maxwell";
    computeCapability = "5.0";
    minCudaVersion = "10.0";
-    maxCudaVersion = "12.0";
+    dontDefaultAfter = "11.0";
+    maxCudaVersion = null;
  }
  {
    archName = "Maxwell";
    computeCapability = "5.2";
    minCudaVersion = "10.0";
-    maxCudaVersion = "12.0";
+    dontDefaultAfter = "11.0";
+    maxCudaVersion = null;
  }
  {
    archName = "Maxwell";
    computeCapability = "5.3";
    minCudaVersion = "10.0";
-    maxCudaVersion = "12.0";
+    dontDefaultAfter = "11.0";
+    maxCudaVersion = null;
  }
  {
    archName = "Pascal";
    computeCapability = "6.0";
    minCudaVersion = "10.0";
-    maxCudaVersion = "12.0";
+    dontDefaultAfter = null;
+    maxCudaVersion = null;
  }
  {
    archName = "Pascal";
    computeCapability = "6.1";
    minCudaVersion = "10.0";
-    maxCudaVersion = "12.0";
+    dontDefaultAfter = null;
+    maxCudaVersion = null;
  }
  {
    archName = "Pascal";
    computeCapability = "6.2";
    minCudaVersion = "10.0";
-    maxCudaVersion = "12.0";
+    dontDefaultAfter = null;
+    maxCudaVersion = null;
  }
  {
    archName = "Volta";
    computeCapability = "7.0";
    minCudaVersion = "10.0";
-    maxCudaVersion = "12.0";
+    dontDefaultAfter = null;
+    maxCudaVersion = null;
  }
  {
    archName = "Volta";
    computeCapability = "7.2";
    minCudaVersion = "10.0";
-    maxCudaVersion = "12.0";
+    dontDefaultAfter = null;
+    maxCudaVersion = null;
  }
  {
    archName = "Turing";
    computeCapability = "7.5";
    minCudaVersion = "10.0";
-    maxCudaVersion = "12.0";
+    dontDefaultAfter = null;
+    maxCudaVersion = null;
  }
  {
    archName = "Ampere";
    computeCapability = "8.0";
    minCudaVersion = "11.2";
-    maxCudaVersion = "12.0";
+    dontDefaultAfter = null;
+    maxCudaVersion = null;
  }
  {
    archName = "Ampere";
    computeCapability = "8.6";
    minCudaVersion = "11.2";
-    maxCudaVersion = "12.0";
+    dontDefaultAfter = null;
+    maxCudaVersion = null;
  }
  {
    archName = "Ampere";
    computeCapability = "8.7";
    minCudaVersion = "11.5";
-    maxCudaVersion = "12.0";
+    # NOTE: This is purposefully before 11.5 to ensure it is never a capability we target by
+    #   default. 8.7 is the Jetson Orin series of devices which are a very specific platform.
+    #   We keep this entry here in case we ever want to target it explicitly, but we don't
+    #   want to target it by default.
+    dontDefaultAfter = "11.4";
+    maxCudaVersion = null;
  }
  {
    archName = "Ada";
    computeCapability = "8.9";
    minCudaVersion = "11.8";
-    maxCudaVersion = "12.0";
+    dontDefaultAfter = null;
+    maxCudaVersion = null;
  }
  {
    archName = "Hopper";
    computeCapability = "9.0";
    minCudaVersion = "11.8";
-    maxCudaVersion = "12.0";
+    dontDefaultAfter = null;
+    maxCudaVersion = null;
  }
 ]
--- a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix
+++ b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix
@ -41,6 +41,10 @@ in
      # uses the last --compiler-bindir it gets on the command line.
      # FIXME: this results in "incompatible redefinition" warnings.
      # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin
+      # NOTE: We unconditionally set -Xfatbin=-compress-all, which reduces the size of the
+      #   compiled binaries. If binaries grow over 2GB, they will fail to link. This is a problem
+      #   for us, as the default set of CUDA capabilities we build can regularly cause this to
+      #   occur (for example, with Magma).
      postInstall = (oldAttrs.postInstall or "") + ''
        mkdir -p $out/nix-support
        cat <<EOF >> $out/nix-support/setup-hook
@ -49,7 +53,7 @@ in
        if [ -z "\''${CUDAHOSTCXX-}" ]; then
          export CUDAHOSTCXX=${cc}/bin;
        fi
-        export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${cc}/bin'
+        export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${cc}/bin -Xfatbin=-compress-all'
        EOF
      '';
    });
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@ -29,8 +29,8 @@

 openjdk17.overrideAttrs (oldAttrs: rec {
  pname = "jetbrains-jdk-jcef";
-  javaVersion = "17.0.5";
-  build = "653.25";
+  javaVersion = "17.0.6";
+  build = "829.5";
  # To get the new tag:
  # git clone https://github.com/jetbrains/jetbrainsruntime
  # cd jetbrainsruntime
@ -43,7 +43,7 @@ openjdk17.overrideAttrs (oldAttrs: rec {
    owner = "JetBrains";
    repo = "JetBrainsRuntime";
    rev = "jb${version}";
-    hash = "sha256-/3NzluFpzKC8mFQxrKY9WlgBh9asbEE7lrGJy/ZJXRU=";
+    hash = "sha256-LTwmuoKKwkuel0a1qcYNnb0d3HBFoABvmqCcrsPyh2I=";
  };

  BOOT_JDK = openjdk17-bootstrap.home;
--- a/pkgs/development/compilers/marst/default.nix
+++ b/pkgs/development/compilers/marst/default.nix
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  version = "2.7";

  src = fetchurl {
-    url = "mirror://gnu/gnu/${pname}/${pname}-${version}.tar.gz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
    hash = "sha256-Pue50cvjzZ+19iJxfae7VQbxpto7MPgS4jhLh7zk2lA=";
  };

--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@ -12,6 +12,7 @@ in
 , flambdaSupport ? false
 , spaceTimeSupport ? false
 , unsafeStringSupport ? false
+, framePointerSupport ? false
 }:

 assert useX11 -> safeX11 stdenv;
@ -19,6 +20,7 @@ assert aflSupport -> lib.versionAtLeast version "4.05";
 assert flambdaSupport -> lib.versionAtLeast version "4.03";
 assert spaceTimeSupport -> lib.versionAtLeast version "4.04" && lib.versionOlder version "4.12";
 assert unsafeStringSupport -> lib.versionAtLeast version "4.06" && lib.versionOlder version "5.0";
+assert framePointerSupport -> lib.versionAtLeast version "4.01";

 let
  src = args.src or (fetchurl {
@ -28,9 +30,14 @@ let
 in

 let
-   useNativeCompilers = !stdenv.isMips;
-   inherit (lib) optional optionals optionalString;
-   pname = "ocaml${optionalString aflSupport "+afl"}${optionalString spaceTimeSupport "+spacetime"}${optionalString flambdaSupport "+flambda"}";
+  useNativeCompilers = !stdenv.isMips;
+  inherit (lib) optional optionals optionalString strings concatStrings;
+  pname = concatStrings [ "ocaml"
+    (optionalString aflSupport "+afl")
+    (optionalString spaceTimeSupport "+spacetime")
+    (optionalString flambdaSupport "+flambda")
+    (optionalString framePointerSupport "+fp")
+  ];
 in

 let
@ -61,6 +68,7 @@ stdenv.mkDerivation (args // {
  ++ optional aflSupport (flags "--with-afl" "-afl-instrument")
  ++ optional flambdaSupport (flags "--enable-flambda" "-flambda")
  ++ optional spaceTimeSupport (flags "--enable-spacetime" "-spacetime")
+  ++ optional framePointerSupport (flags "--enable-frame-pointers" "-with-frame-pointers")
  ++ optionals unsafeStringSupport [
    "--disable-force-safe-string"
    "DEFAULT_STRING=unsafe"
--- a/pkgs/development/libraries/amf-headers/default.nix
+++ b/pkgs/development/libraries/amf-headers/default.nix
@ -0,0 +1,26 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "amf-headers";
+  version = "1.4.29";
+
+  src = fetchFromGitHub {
+    owner = "GPUOpen-LibrariesAndSDKs";
+    repo = "AMF";
+    rev = "v${version}";
+    sha256 = "sha256-gu8plGUUVE/De2bRjTUN8JKsmj/0r/IsqhMpln1DZGU=";
+  };
+
+  installPhase = ''
+    mkdir -p $out/include/AMF
+    cp -r amf/public/include/* $out/include/AMF
+  '';
+
+  meta = with lib; {
+    description = "Headers for The Advanced Media Framework (AMF)";
+    homepage = "https://github.com/GPUOpen-LibrariesAndSDKs/AMF";
+    license = licenses.mit;
+    maintainers = with maintainers; [ devusb ];
+    platforms = platforms.unix;
+  };
+}
--- a/pkgs/development/libraries/aws-c-cal/default.nix
+++ b/pkgs/development/libraries/aws-c-cal/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "aws-c-cal";
-  version = "0.5.20";
+  version = "0.5.21";

  src = fetchFromGitHub {
    owner = "awslabs";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-YBZrOyianmD0E5WcklLkud1WGF/t08XIbfu5qbEo+g4=";
+    sha256 = "sha256-WMCLVwRrgwFsaqoKtbQNt0bHVYi1LUZt5r0i3oAfWFE=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@ -2,11 +2,11 @@

 tcl.mkTclDerivation rec {
  pname = "incrtcl";
-  version = "4.2.2";
+  version = "4.2.3";

  src = fetchurl {
    url    = "mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl${version}.tar.gz";
-    sha256 = "sha256-rExnDq8bWyVb/KzKgyCzPVa72S/VRGPGPW9pmocOFWw=";
+    sha256 = "sha256-idOs2GXP3ZY7ECtF+K9hg5REyK6sQ0qk+666gUQPjCY=";
  };

  enableParallelBuilding = true;
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  version = "2.3.2";

  src = fetchurl {
-    url = "mirror://gnu/gnu/libidn/${pname}-${version}.tar.gz";
+    url = "mirror://gnu/libidn/${pname}-${version}.tar.gz";
    sha256 = "sha256-dpQM1Od46Ak1eanRlbJf/16Tbp3GJCBoUotDenZ2T5E=";
  };

--- a/pkgs/development/libraries/libliftoff/default.nix
+++ b/pkgs/development/libraries/libliftoff/default.nix
@ -5,14 +5,14 @@

 stdenv.mkDerivation rec {
  pname = "libliftoff";
-  version = "0.3.0";
+  version = "0.4.1";

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "emersion";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-MbXDUkAA9gY6Qb6Ok33MNuqIfb4bPIEHd1IVH/UmH10=";
+    sha256 = "sha256-NPwhsd6IOQ0XxNQQNdaaM4kmwoLftokV86WYhoa5csY=";
  };

  nativeBuildInputs = [ meson pkg-config ninja ];
@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
    changelog = "https://github.com/emersion/libliftoff/releases/tag/v${version}";
    license     = licenses.mit;
    platforms   = platforms.linux;
-    maintainers = with maintainers; [ primeos ];
+    maintainers = with maintainers; [ pedrohlc primeos Scrumplex ];
  };
 }
--- a/pkgs/development/libraries/openvr/default.nix
+++ b/pkgs/development/libraries/openvr/default.nix
@ -0,0 +1,55 @@
+{ lib
+, stdenv
+, cmake
+, libGL
+, jsoncpp
+, fetchFromGitHub
+, fetchpatch2
+}:
+
+stdenv.mkDerivation rec {
+  pname = "openvr";
+  version = "1.23.8";
+
+  src = fetchFromGitHub {
+    owner = "ValveSoftware";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-ZdL1HDRSpPykbV3M0CjCZkOt7XlF7Z7OAhOey2ALeHg=";
+  };
+
+  patches = [
+    # https://github.com/ValveSoftware/openvr/pull/594
+    (fetchpatch2 {
+      name = "use-correct-CPP11-definition-for-vsprintf_s.patch";
+      url = "https://github.com/ValveSoftware/openvr/commit/0fa21ba17748efcca1816536e27bdca70141b074.patch";
+      sha256 = "sha256-0sPNDx5qKqCzN35FfArbgJ0cTztQp+SMLsXICxneLx4=";
+    })
+    # https://github.com/ValveSoftware/openvr/pull/1716
+    (fetchpatch2 {
+      name = "add-ability-to-build-with-system-installed-jsoncpp.patch";
+      url = "https://github.com/ValveSoftware/openvr/commit/54a58e479f4d63e62e9118637cd92a2013a4fb95.patch";
+      sha256 = "sha256-aMojjbNjLvsGev0JaBx5sWuMv01sy2tG/S++I1NUi7U=";
+    })
+  ];
+
+  postUnpack = ''
+    # Move in-tree jsoncpp out to complement the patch above
+    # fetchpatch2 is not able to handle these renames
+    mkdir source/thirdparty
+    mv source/src/json source/thirdparty/jsoncpp
+  '';
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ jsoncpp libGL ];
+
+  cmakeFlags = [ "-DUSE_SYSTEM_JSONCPP=ON" "-DBUILD_SHARED=1" ];
+
+  meta = with lib;{
+    homepage = "https://github.com/ValveSoftware/openvr";
+    description = "An API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ pedrohlc Scrumplex ];
+    platforms = platforms.unix;
+  };
+}
--- a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix
+++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix
@ -21,9 +21,11 @@ stdenv.mkDerivation rec {
  '';

  meta = with lib; {
-    homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing";
+    homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing";
    description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project";
    license = licenses.bsd3;
-    platforms = platforms.unix;
+    # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/v0.3.1/webrtc/rtc_base/system/arch.h
+    # + our patches
+    platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86);
  };
 }
--- a/pkgs/development/libraries/webrtc-audio-processing/default.nix
+++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix
@ -33,11 +33,13 @@ stdenv.mkDerivation rec {
  '';

  meta = with lib; {
-    homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing";
+    homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing";
    description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project";
    license = licenses.bsd3;
+    # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h
+    platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.mips ++ platforms.riscv ++ platforms.x86);
    # attempts to inline 256bit AVX instructions on x86
    # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5
-    platforms = lib.lists.subtractLists platforms.i686 platforms.unix;
+    broken = stdenv.isx86_32;
  };
 }
--- a/pkgs/development/nim-packages/safeset/default.nix
+++ b/pkgs/development/nim-packages/safeset/default.nix
@ -0,0 +1,22 @@
+{ lib, buildNimPackage, fetchFromGitHub }:
+buildNimPackage rec {
+  pname = "safeset";
+
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "avahe-kellenberger";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-ZLdStoNVoQhRkD2iEzKxhs1UPfgnbJM9QCDHdjH7vTU=";
+  };
+
+  doCheck = true;
+
+  meta = with lib;
+    src.meta // {
+      description = "safeset library for nim";
+      license = [ licenses.gpl2 ];
+      maintainers = [ maintainers.marcusramberg ];
+    };
+}
--- a/pkgs/development/nim-packages/x11/default.nix
+++ b/pkgs/development/nim-packages/x11/default.nix
@ -0,0 +1,22 @@
+{ lib, buildNimPackage, fetchFromGitHub }:
+
+buildNimPackage rec {
+  pname = "x11";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = "nim-lang";
+    repo = pname;
+    rev = "2093a4c01360cbb5dd33ab79fd4056e148b53ca1";
+    hash = "sha256-2XRyXiBxAc9Zx/w0zRBHRZ240qww0FJvIvOKZ8YH50A=";
+  };
+
+  doCheck = true;
+
+  meta = with lib;
+    src.meta // {
+      description = "X11 library for nim";
+      license = [ licenses.mit ];
+      maintainers = [ maintainers.marcusramberg ];
+    };
+}
--- a/pkgs/development/php-packages/msgpack/default.nix
+++ b/pkgs/development/php-packages/msgpack/default.nix
@ -0,0 +1,16 @@
+{ buildPecl, lib }:
+
+buildPecl rec {
+  version = "2.2.0RC2";
+  pname = "msgpack";
+
+  sha256 = "sha256-bVV043knbk7rionXqB70RKa1zlJ5K/Nw0oTXZllmJOg=";
+
+  meta = with lib; {
+    changelog = "https://pecl.php.net/package-info.php?package=msgpack&version=${version}";
+    description = "PHP extension for interfacing with MessagePack";
+    license = licenses.bsd3;
+    homepage = "https://github.com/msgpack/msgpack-php";
+    maintainers = teams.php.members ++ [ maintainers.ostrolucky ];
+  };
+}
--- a/pkgs/development/php-packages/ssh2/default.nix
+++ b/pkgs/development/php-packages/ssh2/default.nix
@ -0,0 +1,19 @@
+{ buildPecl, lib, libssh2 }:
+
+buildPecl rec {
+  version = "1.3.1";
+  pname = "ssh2";
+
+  sha256 = "sha256-kJOh+NJNxlg2AnsOI5xQ3o1err+DlrwzMf3TjF1pr9k=";
+
+  buildInputs = [ libssh2 ];
+  configureFlags = [ "--with-ssh2=${libssh2.dev}" ];
+
+  meta = with lib; {
+    changelog = "https://pecl.php.net/package-info.php?package=ssh2&version=${version}";
+    description = "PHP bindings for the libssh2 library";
+    license = licenses.php301;
+    homepage = "https://github.com/php/pecl-networking-ssh2";
+    maintainers = teams.php.members ++ [ maintainers.ostrolucky ];
+  };
+}
--- a/pkgs/development/python-modules/bthome-ble/default.nix
+++ b/pkgs/development/python-modules/bthome-ble/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "bthome-ble";
-  version = "2.8.0";
+  version = "2.9.0";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "Bluetooth-Devices";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-SdYS/S3wBmIl/f+0H67PcMRX7GiJqAkysvlENshB1yY=";
+    hash = "sha256-qVPlrj6EVTPJ/HiwynIg6iuJzUGb6Lan/QKC29C2YNk=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/crownstone-cloud/default.nix
+++ b/pkgs/development/python-modules/crownstone-cloud/default.nix
@ -3,6 +3,7 @@
 , asynctest
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , certifi
 , pythonOlder
 , pytestCheckHook
@ -18,10 +19,19 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "crownstone";
    repo = "crownstone-lib-python-cloud";
-    rev = version;
-    sha256 = "sha256-CS1zeQiWPnsGCWixCsN9sz08mPORW5sVqIpSFPh0Qt0=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-CS1zeQiWPnsGCWixCsN9sz08mPORW5sVqIpSFPh0Qt0=";
  };

+  patches = [
+    # Remove asynctest, https://github.com/crownstone/crownstone-lib-python-cloud/pull/4
+    (fetchpatch {
+      name = "remove-asynctest.patch";
+      url = "https://github.com/crownstone/crownstone-lib-python-cloud/commit/7f22c9b284bf8d7f6f43e205816787dd3bb37e78.patch";
+      hash = "sha256-LS1O9LVB14WyBXfuHf/bs1juJ59zWhJ8pL4aGtVrTG8=";
+    })
+  ];
+
  propagatedBuildInputs = [
    aiohttp
    asynctest
--- a/pkgs/development/python-modules/dbus-python-client-gen/default.nix
+++ b/pkgs/development/python-modules/dbus-python-client-gen/default.nix
@ -4,17 +4,21 @@
 , into-dbus-python
 , dbus-python
 , pytestCheckHook
+, pythonOlder
 }:

 buildPythonPackage rec {
  pname = "dbus-python-client-gen";
-  version = "0.8";
+  version = "0.8.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "stratis-storage";
    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-nSzxT65WHBVct5pGHmIAHJXftd0tKZeK/argN+V9xcs=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-RYgS4RNLLCtp+5gS/LlzdH7rlub48TSSSKhykkkBcuo=";
  };

  propagatedBuildInputs = [
@ -31,6 +35,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "A Python library for generating dbus-python client code";
    homepage = "https://github.com/stratis-storage/dbus-python-client-gen";
+    changelog = "https://github.com/stratis-storage/dbus-python-client-gen/blob/v${version}/CHANGES.txt";
    license = licenses.mpl20;
    maintainers = with maintainers; [ nickcao ];
  };
--- a/pkgs/development/python-modules/exrex/default.nix
+++ b/pkgs/development/python-modules/exrex/default.nix
@ -1,31 +1,35 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
+, pythonOlder
 }:

 buildPythonPackage rec {
  pname = "exrex";
-  version = "unstable-2021-04-22";
+  version = "0.11.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "asciimoo";
    repo = "exrex";
-    rev = "9a66706e7582a9cf31c4121629c9035e329bbe21";
-    sha256 = "sha256-g31tHY+LzGxwBmUpSa0DV7ruLfYwmuDg+XyBxMZRa9U=";
+    # https://github.com/asciimoo/exrex/issues/68
+    rev = "239e4da37ff3a66d8b4b398d189299ae295594c3";
+    hash = "sha256-Tn/XIIy2wnob+1FmP9bdD9+gHLQZDofF2c1FqOijKWA=";
  };

-  patches = [
-    (fetchpatch {
-      # https://github.com/asciimoo/exrex/pull/65
-      url = "https://github.com/asciimoo/exrex/commit/44712bfb1350a509581a5834d9fa8aebcd9434db.patch";
-      hash = "sha256-thKotSvdVdVjXaG/AhsXmW51FHLOYUeYTYw8SA/k2t4=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "version=about['__version__']," "version='${version}',"
+  '';

  # Projec thas no released tests
  doCheck = false;
-  pythonImportsCheck = [ "exrex" ];
+
+  pythonImportsCheck = [
+    "exrex"
+  ];

  meta = with lib; {
    description = "Irregular methods on regular expressions";
--- a/pkgs/development/python-modules/extractcode/7z.nix
+++ b/pkgs/development/python-modules/extractcode/7z.nix
@ -27,7 +27,7 @@ buildPythonPackage rec {

    rm 7z 7z.so
    ln -s ${p7zip}/bin/7z 7z
-    ln -s ${p7zip}/lib/p7zip/7z.so 7z.so
+    ln -s ${lib.getLib p7zip}/lib/p7zip/7z.so 7z.so

    popd
  '';
--- a/pkgs/development/python-modules/google-nest-sdm/default.nix
+++ b/pkgs/development/python-modules/google-nest-sdm/default.nix
@ -1,6 +1,5 @@
 { lib
 , aiohttp
-, asynctest
 , buildPythonPackage
 , coreutils
 , fetchFromGitHub
@ -37,7 +36,6 @@ buildPythonPackage rec {
  ];

  nativeCheckInputs = [
-    asynctest
    coreutils
    pytest-aiohttp
    pytest-asyncio
--- a/pkgs/development/python-modules/ismartgate/default.nix
+++ b/pkgs/development/python-modules/ismartgate/default.nix
@ -1,5 +1,4 @@
 { lib
-, asynctest
 , buildPythonPackage
 , click
 , defusedxml
@ -29,6 +28,11 @@ buildPythonPackage rec {
    hash = "sha256-o2yzMxrF0WB6MbeL1Tuf0Sq4wS4FDIWZZx1x2rvwLmY=";
  };

+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace '"pytest-runner>=5.2",' ""
+  '';
+
  propagatedBuildInputs = [
    click
    defusedxml
@ -39,18 +43,12 @@ buildPythonPackage rec {
  ];

  nativeCheckInputs = [
-    asynctest
    pytest-asyncio
    pytest-raises
    pytestCheckHook
    respx
  ];

-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace '"pytest-runner>=5.2",' ""
-  '';
-
  pythonImportsCheck = [
    "ismartgate"
  ];
@ -58,6 +56,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Python module to work with the ismartgate and gogogate2 API";
    homepage = "https://github.com/bdraco/ismartgate";
+    changelog = "https://github.com/bdraco/ismartgate/releases/tag/v${version}";
    license = with licenses; [ mit ];
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/json-stream-rs-tokenizer/Cargo.lock
+++ b/pkgs/development/python-modules/json-stream-rs-tokenizer/Cargo.lock
@ -0,0 +1,596 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "arrayvec"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bytecount"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
+
+[[package]]
+name = "camino"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "error-chain"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "fastrand"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
+dependencies = [
+ "instant",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "indoc"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da2d6f23ffea9d7e76c53eee25dfb67bcd8fde7f1198b0855350698c9f07c780"
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+
+[[package]]
+name = "json-stream-rs-tokenizer"
+version = "0.1.0"
+dependencies = [
+ "num-bigint",
+ "pyo3",
+ "pyo3-build-config 0.17.3",
+ "pyo3-file",
+ "thiserror",
+ "utf8-chars",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.139"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+
+[[package]]
+name = "lock_api"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "memchr"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+
+[[package]]
+name = "num-bigint"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-sys",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "pulldown-cmark"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63"
+dependencies = [
+ "bitflags",
+ "memchr",
+ "unicase",
+]
+
+[[package]]
+name = "pyo3"
+version = "0.16.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0220c44442c9b239dd4357aa856ac468a4f5e1f0df19ddb89b2522952eb4c6ca"
+dependencies = [
+ "cfg-if",
+ "indoc",
+ "libc",
+ "num-bigint",
+ "parking_lot",
+ "pyo3-build-config 0.16.6",
+ "pyo3-ffi",
+ "pyo3-macros",
+ "unindent",
+]
+
+[[package]]
+name = "pyo3-build-config"
+version = "0.16.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c819d397859445928609d0ec5afc2da5204e0d0f73d6bf9e153b04e83c9cdc2"
+dependencies = [
+ "once_cell",
+ "target-lexicon",
+]
+
+[[package]]
+name = "pyo3-build-config"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8"
+dependencies = [
+ "once_cell",
+ "target-lexicon",
+]
+
+[[package]]
+name = "pyo3-ffi"
+version = "0.16.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca882703ab55f54702d7bfe1189b41b0af10272389f04cae38fe4cd56c65f75f"
+dependencies = [
+ "libc",
+ "pyo3-build-config 0.16.6",
+]
+
+[[package]]
+name = "pyo3-file"
+version = "0.5.0"
+source = "git+https://github.com/smheidrich/pyo3-file.git?branch=divide-buf-length-by-4-to-fix-textio-bug-forjsonstream#c29bf591842e3487e8b00890b91e0d4841103138"
+dependencies = [
+ "pyo3",
+ "skeptic",
+]
+
+[[package]]
+name = "pyo3-macros"
+version = "0.16.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "568749402955ad7be7bad9a09b8593851cd36e549ac90bfd44079cea500f3f21"
+dependencies = [
+ "proc-macro2",
+ "pyo3-macros-backend",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pyo3-macros-backend"
+version = "0.16.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "611f64e82d98f447787e82b8e7b0ebc681e1eb78fc1252668b2c605ffb4e1eb8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "remove_dir_all"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+[[package]]
+name = "semver"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.152"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.152"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "skeptic"
+version = "0.13.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8"
+dependencies = [
+ "bytecount",
+ "cargo_metadata",
+ "error-chain",
+ "glob",
+ "pulldown-cmark",
+ "tempfile",
+ "walkdir",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+
+[[package]]
+name = "syn"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d"
+
+[[package]]
+name = "tempfile"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "libc",
+ "redox_syscall",
+ "remove_dir_all",
+ "winapi",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "unicase"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+
+[[package]]
+name = "unindent"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
+
+[[package]]
+name = "utf8-chars"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "437bc4a6a3acdb2a99491b19ec1c2131a536d9f1d7da112341ec5c9e5f4dfc3a"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "walkdir"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+dependencies = [
+ "same-file",
+ "winapi",
+ "winapi-util",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
--- a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
+++ b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
@ -0,0 +1,63 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, rustPlatform
+, setuptools-rust
+, json-stream-rs-tokenizer
+, json-stream
+}:
+
+buildPythonPackage rec {
+  pname = "json-stream-rs-tokenizer";
+  version = "0.4.13";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "smheidrich";
+    repo = "py-json-stream-rs-tokenizer";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-9pJi80V7WKvsgtp0ffItWnjoOvFvfE/Sz6y2VlsU+wQ=";
+  };
+
+  postPatch = ''
+    cp ${./Cargo.lock} ./Cargo.lock
+  '';
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src postPatch;
+    name = "${pname}-${version}";
+    hash = "sha256-TjRdHSXHmF6fzCshX1I4Sq+A/fEmBHDPGZvJUxL13aM=";
+  };
+
+  nativeBuildInputs = [
+    setuptools-rust
+  ]
+  ++ (with rustPlatform; [
+    cargoSetupHook
+    rust.cargo
+    rust.rustc
+  ]);
+
+  # Tests depend on json-stream, which depends on this package.
+  # To avoid infinite recursion, we only enable tests when building passthru.tests.
+  doCheck = false;
+
+  checkInputs = [
+    json-stream
+  ];
+
+  pythonImportsCheck = [
+    "json_stream_rs_tokenizer"
+  ];
+
+  passthru.tests = {
+    runTests = json-stream-rs-tokenizer.overrideAttrs (_: { doCheck = true; });
+  };
+
+  meta = with lib; {
+    description = "A faster tokenizer for the json-stream Python library";
+    homepage = "https://github.com/smheidrich/py-json-stream-rs-tokenizer";
+    license = licenses.mit;
+    maintainers = with maintainers; [ winter ];
+  };
+}
--- a/pkgs/development/python-modules/json-stream/default.nix
+++ b/pkgs/development/python-modules/json-stream/default.nix
@ -1,30 +1,38 @@
 { lib
+, stdenv
 , buildPythonPackage
 , fetchPypi
+, iconv
 , pytestCheckHook
 , pythonOlder
 , requests
+, json-stream-rs-tokenizer
 , setuptools
 }:

 buildPythonPackage rec {
  pname = "json-stream";
-  version = "1.5.1";
+  version = "2.2.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-htajifmbXtivUwsORzBzJA68nJCACcL75kiBysVYCxY=";
+    hash = "sha256-Vg6zF4iR4YqVAsx93Gy5mO2JNldm2f7BhNBtjzVY82w=";
  };

  nativeBuildInputs = [
    setuptools
  ];

+  buildInputs = lib.optionals stdenv.isDarwin [
+    iconv
+  ];
+
  propagatedBuildInputs = [
    requests
+    json-stream-rs-tokenizer
  ];

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/myjwt/default.nix
+++ b/pkgs/development/python-modules/myjwt/default.nix
@ -6,6 +6,7 @@
 , cryptography
 , exrex
 , fetchFromGitHub
+, poetry-core
 , pyopenssl
 , pyperclip
 , pytest-mock
@ -18,18 +19,28 @@

 buildPythonPackage rec {
  pname = "myjwt";
-  version = "1.6.0";
-  format = "setuptools";
+  version = "1.6.1";
+  format = "pyproject";

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

  src = fetchFromGitHub {
    owner = "mBouamama";
    repo = "MyJWT";
    rev = "refs/tags/${version}";
-    sha256 = "sha256-A9tsQ6L+y3doL5pJbau3yKnmQtX2IPXWyW/YCLhS7nc=";
+    hash = "sha256-qdDA8DpJ9kAPTvCkQcPBHNlUqxwsS0vAESglvUygXhg=";
  };

+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "1.6.0" "${version}" \
+      --replace 'cryptography = "^39.0.2"' 'cryptography = "^39.0.0"'
+  '';
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
  propagatedBuildInputs = [
    click
    colorama
@ -47,11 +58,6 @@ buildPythonPackage rec {
    requests-mock
  ];

-  postPatch = ''
-    # Remove all version pinning (E.g., tornado==5.1.1 -> tornado)
-    sed -i -e "s/==[0-9.]*//" requirements.txt
-  '';
-
  pythonImportsCheck = [
    "myjwt"
  ];
@ -59,6 +65,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "CLI tool for testing vulnerabilities of JSON Web Tokens (JWT)";
    homepage = "https://github.com/mBouamama/MyJWT";
+    changelog = "https://github.com/tyki6/MyJWT/releases/tag/${version}";
    license = with licenses; [ mit ];
    maintainers = with maintainers; [ fab ];
    # Build failures
--- a/pkgs/development/python-modules/openaiauth/default.nix
+++ b/pkgs/development/python-modules/openaiauth/default.nix
@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "openaiauth";
+  version = "0.3.2";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "OpenAIAuth";
+    hash = "sha256-CPcBgGvxRO677EdPI3lNtJXkCW7el6N6N2GeaDo5ApU=";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "OpenAIAuth"
+  ];
+
+  meta = with lib; {
+    description = "A Python library for authenticating with the OpenAI API";
+    license = licenses.mit;
+    maintainers = with maintainers; [ realsnick ];
+    homepage = "https://github.com/acheong08/OpenAIAuth";
+    changelog = "https://github.com/acheong08/OpenAIAuth/releases/tag/${version}";
+  };
+}
--- a/pkgs/development/python-modules/parsimonious/default.nix
+++ b/pkgs/development/python-modules/parsimonious/default.nix
@ -26,6 +26,14 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

+  disabledTests = [
+    # test_benchmarks.py tests are actually benchmarks and may fail due to
+    # something being unexpectedly slow on a heavily loaded build machine
+    "test_lists_vs_dicts"
+    "test_call_vs_inline"
+    "test_startswith_vs_regex"
+  ];
+
  postPatch = ''
    substituteInPlace setup.py \
      --replace "regex>=2022.3.15" "regex"
--- a/pkgs/development/python-modules/python-otbr-api/default.nix
+++ b/pkgs/development/python-modules/python-otbr-api/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "python-otbr-api";
-  version = "1.0.7";
+  version = "1.0.9";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "home-assistant-libs";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-R6H+h6IbyI/Qhwb6ACT2sx/YWmLDMyg4gLMJdmNj2wk=";
+    hash = "sha256-Rg5+EOsxRse618WvP4+9ybiu0mJpizrzCmeIbRnFgaA=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/ray/binary-hashes.nix
+++ b/pkgs/development/python-modules/ray/binary-hashes.nix
@ -1,11 +1,11 @@
 {
-  cp38 = {
-    sha256 = "da8adfa33ff54bc61cfe80334a0ee889e0060918db6ff9215aebe32e98b1f939";
-  };
  cp39 = {
-    sha256 = "cab13346650f88171b3f348ed352f04695b96d1ab1090ed3b80bdc93e897dbd4";
+    sha256 = "596811ae6b41e50f038e0a7cdf0a5320151508d74bac84795bbccad4f6adc6a9";
  };
  cp310 = {
-    sha256 = "bcf3bff9517d77ea6c98592fa16e1cfb8bc0cfa345d3be69729bfa9c5bd78a7c";
+    sha256 = "b19d381d425259c80b7a9b14aac9d898637ce262d91baeb9569999de3b043967";
+  };
+  cp311 = {
+    sha256 = "d86126b6ab5113a3be35281d5699bad731c8f90e02cf6561057017df9312f0a5";
  };
 }
--- a/pkgs/development/python-modules/ray/default.nix
+++ b/pkgs/development/python-modules/ray/default.nix
@ -57,13 +57,13 @@

 let
  pname = "ray";
-  version = "2.0.0";
+  version = "2.3.0";
 in
 buildPythonPackage rec {
  inherit pname version;
  format = "wheel";

-  disabled = pythonOlder "3.8" || pythonAtLeast "3.11";
+  disabled = pythonOlder "3.9" || pythonAtLeast "3.12";

  src =
    let
@ -116,7 +116,11 @@ buildPythonPackage rec {
    pythonRelaxDepsHook
  ];

-  pythonRelaxDeps = [ "grpcio" "click" "protobuf" ];
+  pythonRelaxDeps = [
+    "click"
+    "grpcio"
+    "protobuf"
+  ];

  propagatedBuildInputs = [
    attrs
@ -151,14 +155,16 @@ buildPythonPackage rec {

  postInstall = ''
    chmod +x $out/${python.sitePackages}/ray/core/src/ray/{gcs/gcs_server,raylet/raylet}
-    ln -sf ${redis}/bin/redis-server $out/${python.sitePackages}/ray/core/src/ray/thirdparty/redis/src/redis-server
  '';

-  pythonImportsCheck = [ "ray" ];
+  pythonImportsCheck = [
+    "ray"
+  ];

  meta = with lib; {
    description = "A unified framework for scaling AI and Python applications";
    homepage = "https://github.com/ray-project/ray";
+    changelog = "https://github.com/ray-project/ray/releases/tag/ray-${version}";
    license = licenses.asl20;
    maintainers = with maintainers; [ billhuang ];
    platforms = [ "x86_64-linux" ];
--- a/Show More
+++ b/Show More