Merge master into haskell-updates

2023-08-01 00:14:53 +00:00 · 2023-08-01 00:14:53 +00:00 · 988741ea02
commit 988741ea02
parent 649fc12ad6 6d634ba315
163 changed files with 2543 additions and 22877 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -6685,6 +6685,12 @@
    githubId = 41522204;
    name = "hexchen";
  };
+  hexclover = {
+    email = "hexclover@outlook.com";
+    github = "hexclover";
+    githubId = 47456195;
+    name = "hexclover";
+  };
  heyimnova = {
    email = "git@heyimnova.dev";
    github = "heyimnova";
@ -7178,12 +7184,6 @@
      fingerprint = "F5B2 BE1B 9AAD 98FE 2916  5597 3665 FFF7 9D38 7BAA";
    }];
  };
-  imsofi = {
-    email = "sofi+git@mailbox.org";
-    github = "imsofi";
-    githubId = 20756843;
-    name = "Sofi";
-  };
  imuli = {
    email = "i@imu.li";
    github = "imuli";
@ -8355,6 +8355,12 @@
    name = "John Soo";
    githubId = 10039785;
  };
+  jtbx = {
+    email = "jtbx@duck.com";
+    name = "Jeremy Baxter";
+    github = "jtbx";
+    githubId = 92071952;
+  };
  jtcoolen = {
    email = "jtcoolen@pm.me";
    name = "Julien Coolen";
@ -8980,6 +8986,12 @@
    githubId = 3287933;
    name = "Josef Kemetmüller";
  };
+  knightpp = {
+    email = "knightpp@proton.me";
+    github = "knightpp";
+    githubId = 28928944;
+    name = "Danylo Kondratiev";
+  };
  knl = {
    email = "nikola@knezevic.co";
    github = "knl";
@ -9035,6 +9047,12 @@
    githubId = 524268;
    name = "Koral";
  };
+  koralowiec = {
+    email = "qnlgzyrw@anonaddy.me";
+    github = "koralowiec";
+    githubId = 36413794;
+    name = "Arek Kalandyk";
+  };
  koslambrou = {
    email = "koslambrou@gmail.com";
    github = "koslambrou";
@ -10530,6 +10548,12 @@
      fingerprint = "CAEC A12D CE23 37A6 6DFD  17B0 7AC7 631D 70D6 C898";
    }];
  };
+  max-amb = {
+    email = "maxpeterambaum@gmail.com";
+    github = "max-amb";
+    githubId = 137820334;
+    name = "Max Ambaum";
+  };
  maxbrunet = {
    email = "max@brnt.mx";
    github = "maxbrunet";
@ -14495,6 +14519,15 @@
    }];
    name = "Rahul Butani";
  };
+  rs0vere = {
+    email = "rs0vere@outlook.com";
+    github = "rs0vere";
+    githubId = 140035635;
+    keys = [{
+      fingerprint = "C6D8 B5C2 FA79 901B DCCF  95E1 FEC4 5C5A ED00 C58D";
+    }];
+    name = "Red Star Over Earth";
+  };
  rski = {
    name = "rski";
    email = "rom.skiad+nix@gmail.com";
@ -15670,6 +15703,12 @@
    githubId = 6277322;
    name = "Wei Tang";
  };
+  soupglasses = {
+    email = "sofi+git@mailbox.org";
+    github = "soupglasses";
+    githubId = 20756843;
+    name = "Sofi";
+  };
  soywod = {
    name = "Clément DOUIN";
    email = "clement.douin@posteo.net";
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@ -22,6 +22,8 @@

 - [Typesense](https://github.com/typesense/typesense), a fast, typo-tolerant search engine for building delightful search experiences. Available as [services.typesense](#opt-services.typesense.enable).

+* [NS-USBLoader](https://github.com/developersu/ns-usbloader/), an all-in-one tool for managing Nintendo Switch homebrew. Available as [programs.ns-usbloader](#opt-programs.ns-usbloader.enable).
+
 - [Anuko Time Tracker](https://github.com/anuko/timetracker), a simple, easy to use, open source time tracking system. Available as [services.anuko-time-tracker](#opt-services.anuko-time-tracker.enable).

 - [sitespeed-io](https://sitespeed.io), a tool that can generate metrics (timings, diagnostics) for websites. Available as [services.sitespeed-io](#opt-services.sitespeed-io.enable).
@ -148,6 +150,8 @@ The module update takes care of the new config syntax and the data itself (user

 - `wrapHelm` now exposes `passthru.pluginsDir` which can be passed to `helmfile`. For convenience, a top-level package `helmfile-wrapped` has been added, which inherits `passthru.pluginsDir` from `kubernetes-helm-wrapped`. See [#217768](https://github.com/NixOS/nixpkgs/issues/217768) for details.

+- `boot.initrd.network.udhcp.enable` allows control over dhcp during stage 1 regardless of what `networking.useDHCP` is set to.
+
 ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}

 - The `qemu-vm.nix` module by default now identifies block devices via
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -221,6 +221,7 @@
  ./programs/nncp.nix
  ./programs/noisetorch.nix
  ./programs/npm.nix
+  ./programs/ns-usbloader.nix
  ./programs/oblogout.nix
  ./programs/oddjobd.nix
  ./programs/openvpn3.nix
--- a/nixos/modules/programs/ns-usbloader.nix
+++ b/nixos/modules/programs/ns-usbloader.nix
@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.programs.ns-usbloader;
+in
+{
+  options = {
+    programs.ns-usbloader = {
+      enable = lib.mkEnableOption (lib.mdDoc "ns-usbloader application with udev rules applied");
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.ns-usbloader ];
+    services.udev.packages = [ pkgs.ns-usbloader ];
+  };
+
+  meta.maintainers = pkgs.ns-usbloader.meta.maintainers;
+}
--- a/nixos/modules/services/hardware/udisks2.nix
+++ b/nixos/modules/services/hardware/udisks2.nix
@ -71,12 +71,16 @@ in

    environment.systemPackages = [ pkgs.udisks2 ];

-    environment.etc = (mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // {
-      # We need to make sure /etc/libblockdev/conf.d is populated to avoid
+    environment.etc = (mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // (
+    let
+      libblockdev = pkgs.udisks2.libblockdev;
+      majorVer = versions.major libblockdev.version;
+    in {
+      # We need to make sure /etc/libblockdev/@major_ver@/conf.d is populated to avoid
      # warnings
-      "libblockdev/conf.d/00-default.cfg".source = "${pkgs.libblockdev}/etc/libblockdev/conf.d/00-default.cfg";
-      "libblockdev/conf.d/10-lvm-dbus.cfg".source = "${pkgs.libblockdev}/etc/libblockdev/conf.d/10-lvm-dbus.cfg";
-    };
+      "libblockdev/${majorVer}/conf.d/00-default.cfg".source = "${libblockdev}/etc/libblockdev/${majorVer}/conf.d/00-default.cfg";
+      "libblockdev/${majorVer}/conf.d/10-lvm-dbus.cfg".source = "${libblockdev}/etc/libblockdev/${majorVer}/conf.d/10-lvm-dbus.cfg";
+    });

    security.polkit.enable = true;

--- a/nixos/modules/services/matrix/appservice-irc.nix
+++ b/nixos/modules/services/matrix/appservice-irc.nix
@ -12,16 +12,14 @@ let

  configFile = pkgs.runCommand "matrix-appservice-irc.yml" {
    # Because this program will be run at build time, we need `nativeBuildInputs`
-    nativeBuildInputs = [ (pkgs.python3.withPackages (ps: [ ps.pyyaml ps.jsonschema ])) ];
+    nativeBuildInputs = [ (pkgs.python3.withPackages (ps: [ ps.jsonschema ])) pkgs.remarshal ];
    preferLocalBuild = true;

    config = builtins.toJSON cfg.settings;
    passAsFile = [ "config" ];
  } ''
    # The schema is given as yaml, we need to convert it to json
-    python -c 'import json; import yaml; import sys; json.dump(yaml.safe_load(sys.stdin), sys.stdout)' \
-      < ${pkg}/lib/node_modules/matrix-appservice-irc/config.schema.yml \
-      > config.schema.json
+    remarshal --if yaml --of json -i ${pkg}/config.schema.yml -o config.schema.json
    python -m jsonschema config.schema.json -i $configPath
    cp "$configPath" "$out"
  '';
--- a/nixos/modules/services/misc/gogs.nix
+++ b/nixos/modules/services/misc/gogs.nix
@ -25,7 +25,7 @@ let
    DOMAIN = ${cfg.domain}
    HTTP_ADDR = ${cfg.httpAddress}
    HTTP_PORT = ${toString cfg.httpPort}
-    ROOT_URL = ${cfg.rootUrl}
+    EXTERNAL_URL = ${cfg.rootUrl}

    [session]
    COOKIE_NAME = session
--- a/nixos/modules/services/monitoring/prometheus/exporters/ipmi.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/ipmi.nix
@ -37,5 +37,6 @@ in {
    ] ++ extraFlags);

    ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+    RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
  };
 }
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@ -7,8 +7,8 @@ let
  cfg = config.boot.initrd.network;

  dhcpInterfaces = lib.attrNames (lib.filterAttrs (iface: v: v.useDHCP == true) (config.networking.interfaces or {}));
-  doDhcp = config.networking.useDHCP || dhcpInterfaces != [];
-  dhcpIfShellExpr = if config.networking.useDHCP
+  doDhcp = cfg.udhcpc.enable || dhcpInterfaces != [];
+  dhcpIfShellExpr = if config.networking.useDHCP || cfg.udhcpc.enable
                      then "$(ls /sys/class/net/ | grep -v ^lo$)"
                      else lib.concatMapStringsSep " " lib.escapeShellArg dhcpInterfaces;

@ -79,13 +79,24 @@ in
      '';
    };

+    boot.initrd.network.udhcpc.enable = mkOption {
+      default = config.networking.useDHCP;
+      defaultText = "networking.useDHCP";
+      type = types.bool;
+      description = lib.mdDoc ''
+        Enables the udhcpc service during stage 1 of the boot process. This
+        defaults to {option}`networking.useDHCP`. Therefore, this useful if
+        useDHCP is off but the initramfs should do dhcp.
+      '';
+    };
+
    boot.initrd.network.udhcpc.extraArgs = mkOption {
      default = [];
      type = types.listOf types.str;
      description = lib.mdDoc ''
-        Additional command-line arguments passed verbatim to udhcpc if
-        {option}`boot.initrd.network.enable` and {option}`networking.useDHCP`
-        are enabled.
+        Additional command-line arguments passed verbatim to
+        udhcpc if {option}`boot.initrd.network.enable` and
+        {option}`boot.initrd.network.udhcpc.enable` are enabled.
      '';
    };

--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@ -48,13 +48,13 @@ let
  } else portaudio;
 in stdenv'.mkDerivation rec {
  pname = "musescore";
-  version = "4.1.0";
+  version = "4.1.1";

  src = fetchFromGitHub {
    owner = "musescore";
    repo = "MuseScore";
    rev = "v${version}";
-    sha256 = "sha256-CqW1f0VsF2lW79L3FY2ev+6FoHLbYOJ9LWHeBlWegeU=";
+    sha256 = "sha256-jXievVIA0tqLdKLy6oPaOHPIbDoFstveEQBri9M0Aoo=";
  };
  patches = [
    # Upstream from some reason wants to install qml files from qtbase in
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@ -2,11 +2,11 @@

 let
  pname = "ledger-live-desktop";
-  version = "2.64.1";
+  version = "2.64.2";

  src = fetchurl {
    url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-EdrJcu3xv+Q31ps3pcjfQh+Kf6C/sidGpk2XM8qBEr0=";
+    hash = "sha256-8cb5FA/Ogd6GI0AclxHicZGV3K5bVsZuIl/3A03r5qQ=";
  };


--- a/pkgs/applications/editors/rehex/default.nix
+++ b/pkgs/applications/editors/rehex/default.nix
@ -19,13 +19,13 @@

 stdenv.mkDerivation rec {
  pname = "rehex";
-  version = "0.5.4";
+  version = "0.60.1";

  src = fetchFromGitHub {
    owner = "solemnwarning";
    repo = pname;
    rev = version;
-    hash = "sha256-UgwCfy2ssaPuSWeN2SXHBDXv/uLdrDoGr/Q9wXiuCnc=";
+    hash = "sha256-oF8XtxKqyo6c2lNH6WDq6aEPeZw8RqBinDVhPpaDAWg=";
  };

  nativeBuildInputs = [ pkg-config which zip ]
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@ -1,19 +1,33 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtscript, qtsvg,
-  wrapQtAppsHook, poppler, zlib, pkg-config }:
+{ stdenv, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qt5compat, quazip
+, hunspell
+, wrapQtAppsHook, poppler, zlib, pkg-config }:

-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "texstudio";
-  version = "4.5.2";
+  version = "4.6.2";

  src = fetchFromGitHub {
-    owner = "${pname}-org";
-    repo = pname;
-    rev = version;
-    hash = "sha256-L+q4+k4XWywnxIvhfXPCBeCqnGj4E9BhAmgcAZhm7S8=";
+    owner = "texstudio-org";
+    repo = "texstudio";
+    rev = finalAttrs.version;
+    hash = "sha256-2bvKB/8HcZoTk2J6FQXXJREqGp6EZ95C2Aqcx9o/eho=";
  };

-  nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ];
-  buildInputs = [ qtbase qtscript qtsvg poppler zlib ];
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsHook
+    pkg-config
+  ];
+  buildInputs = [
+    hunspell
+    poppler
+    qt5compat
+    qtbase
+    qtsvg
+    qttools
+    quazip
+    zlib
+  ];

  meta = with lib; {
    description = "TeX and LaTeX editor";
@ -28,4 +42,4 @@ mkDerivation rec {
    platforms = platforms.linux;
    maintainers = with maintainers; [ ajs124 cfouche ];
  };
-}
+})
--- a/pkgs/applications/editors/tijolo/default.nix
+++ b/pkgs/applications/editors/tijolo/default.nix
@ -11,13 +11,13 @@
 }:
 crystal.buildCrystalPackage rec {
  pname = "tijolo";
-  version = "0.7.3";
+  version = "0.7.4";

  src = fetchFromGitHub {
    owner = "hugopl";
    repo = "tijolo";
    rev = "v${version}";
-    hash = "sha256-15not/B+O+wIZ/fvLFy26/dyvq0E+bZUeoSZ6HxMMKg=";
+    hash = "sha256-3TfXvRVP3lu43qF3RWCHnZ3czTaSl5EzrhuTlpnMfKo=";
  };

  nativeBuildInputs = [ wrapGAppsHook ]
@ -27,7 +27,7 @@ crystal.buildCrystalPackage rec {
  buildTargets = [ "all" ];
  doCheck = false;

-  shardsFile = ./tijolo-shards.nix;
+  shardsFile = ./shards.nix;

  installTargets = [ "install" "install-fonts"];
  doInstallCheck = false;
--- a/pkgs/applications/editors/tijolo/tijolo-shards.nix
+++ b/pkgs/applications/editors/tijolo/tijolo-shards.nix
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -173,12 +173,12 @@ final: prev:

  LazyVim = buildVimPluginFrom2Nix {
    pname = "LazyVim";
-    version = "2023-07-25";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "LazyVim";
      repo = "LazyVim";
-      rev = "aa1cccf230a01bd85d5173f7d87f782fd83caa88";
-      sha256 = "1kx8n6rn9vgsp7j9kmdz2f6yg812i64nclii0y2cjpnb8h1aa0cf";
+      rev = "9264c54ae96d1d56f029ad9b561326c7b991c53b";
+      sha256 = "1lcq6gwh31w1fg2cw5bzihjalfvagr6gf86kprd83vpjzwvp3237";
    };
    meta.homepage = "https://github.com/LazyVim/LazyVim/";
  };
@ -305,12 +305,12 @@ final: prev:

  SchemaStore-nvim = buildVimPluginFrom2Nix {
    pname = "SchemaStore.nvim";
-    version = "2023-07-23";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "b0o";
      repo = "SchemaStore.nvim";
-      rev = "f33af3051c79f084824753f9852ed4db95b43c8d";
-      sha256 = "00jqh51jmc3xbfpsanhkln1bmrbr65ipbcnaicsac97751xclymr";
+      rev = "fba131b5ef7a54a8f8d71ef2a2e8d2263b87daac";
+      sha256 = "138k6slpv8xxjl8sggqcgmly2byifwa9842y2w73hwc956fx9clr";
    };
    meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
  };
@ -967,12 +967,12 @@ final: prev:

  base46 = buildVimPluginFrom2Nix {
    pname = "base46";
-    version = "2023-07-25";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "nvchad";
      repo = "base46";
-      rev = "cb012feef7ce8c0bb8cdcb2b858393aa92834f46";
-      sha256 = "1zg0pw2jhx8w21yfky3icai0wq87884ybls34hhn9rwkzn78m4n9";
+      rev = "a88ada931feecc22dfdcaae00ff98f412b863f9a";
+      sha256 = "1zqaqd2byzfqgy36jwjimcrvgs2wds9dx18kza41c3in9b9243rd";
    };
    meta.homepage = "https://github.com/nvchad/base46/";
  };
@ -1231,12 +1231,12 @@ final: prev:

  chadtree = buildVimPluginFrom2Nix {
    pname = "chadtree";
-    version = "2023-07-23";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "chadtree";
-      rev = "3664cb28461a30f8b1627180a19b8b22a10331ab";
-      sha256 = "13941i4860gkj0vri7zxs7wj2lf9q04scn3v0c57lcbn9ca1kk70";
+      rev = "a12f2d375a06b0b10137462820efd5962425333e";
+      sha256 = "02p1wfkc6d5ysgv05ifazk3yswikan3j16fdcc07mfjp2y2cs5vk";
    };
    meta.homepage = "https://github.com/ms-jpq/chadtree/";
  };
@ -1987,12 +1987,12 @@ final: prev:

  coc-nvim = buildVimPluginFrom2Nix {
    pname = "coc.nvim";
-    version = "2023-01-29";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "neoclide";
      repo = "coc.nvim";
-      rev = "bbaa1d5d1ff3cbd9d26bb37cfda1a990494c4043";
-      sha256 = "116h45vnz98ni60i12f2z6rwz9gkpp1k4ysp1ry0qpjgmb5fcbsy";
+      rev = "9332d2ab1154dedc9dbcd3e1c873886abaf061a6";
+      sha256 = "1aq1bz2pl6wfhxawkdwkrcvc18dgs0x3p5fwivfmnhaqislkx4lf";
    };
    meta.homepage = "https://github.com/neoclide/coc.nvim/";
  };
@ -2011,12 +2011,12 @@ final: prev:

  codeium-vim = buildVimPluginFrom2Nix {
    pname = "codeium.vim";
-    version = "2023-07-24";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "Exafunction";
      repo = "codeium.vim";
-      rev = "9bf87e33fdb85d9f423f49450079561557ea6f3d";
-      sha256 = "0kighzhclzx7gd2kqzsy28483spr36pnl3m4p7b4cdrkgn9g99rh";
+      rev = "ddf848e8647e85774766ea8bdcd5a2258ea44006";
+      sha256 = "0l0bp9d4z0i8yfbnrpydvagzk3q0wc82r5wp3kbqk195qzykflx3";
    };
    meta.homepage = "https://github.com/Exafunction/codeium.vim/";
  };
@ -2311,12 +2311,12 @@ final: prev:

  coq-artifacts = buildVimPluginFrom2Nix {
    pname = "coq.artifacts";
-    version = "2023-07-23";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq.artifacts";
-      rev = "39bdecdcb3df41ba7f93c2b5acd4c6e25d80ba07";
-      sha256 = "0axs9fk6i81zp748zb9ldvg914w94j38kk04adma6b75py5r9max";
+      rev = "2b27da78d6eb74fa9fd565e845e2381c51e59675";
+      sha256 = "0mawmz0i4nny1vdvahfb0b6hymil5vc4sa5yhj38yqcnwzbndzzv";
    };
    meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
  };
@ -2347,12 +2347,12 @@ final: prev:

  coq_nvim = buildVimPluginFrom2Nix {
    pname = "coq_nvim";
-    version = "2023-07-23";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq_nvim";
-      rev = "a8ff103b50a9a4ba3dec9a485699b3382b59ab92";
-      sha256 = "1ia2ibqvmv89ijn8xkdrh7n1j4mg6majami4cj1smvrn1jscbjg5";
+      rev = "8ad8815816657e6be07f6c47ae50f6e8a70e9a59";
+      sha256 = "1i1264czx49qs30i788nr8ryawrlk8gnvyw3p7psb58p6mc6gsih";
    };
    meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
  };
@ -2503,12 +2503,12 @@ final: prev:

  dashboard-nvim = buildVimPluginFrom2Nix {
    pname = "dashboard-nvim";
-    version = "2023-06-14";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "nvimdev";
      repo = "dashboard-nvim";
-      rev = "ab84915f7cfd7bc7a5bfe7409c3eccf8d09c162a";
-      sha256 = "1bmi9hxchjs1s0d5gc02akyxzixq1f0k2hhr2jisj9xx8d0x8fjh";
+      rev = "c17d3210b3dec8798b4fc82a11c542989251f85d";
+      sha256 = "1ay3jap0darihkwd71iszw939k8vpjb0chs58p75kxh07212wlv9";
    };
    meta.homepage = "https://github.com/nvimdev/dashboard-nvim/";
  };
@ -2997,12 +2997,12 @@ final: prev:

  edge = buildVimPluginFrom2Nix {
    pname = "edge";
-    version = "2023-04-24";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "sainnhe";
      repo = "edge";
-      rev = "358cb6688ac577470a4eafcb53bdd63899dfc937";
-      sha256 = "1jz3c5z4cdgi5a50c6wlhz23rapfqchm79n9f3mgc9ss1aisqv0y";
+      rev = "4fead634946186a21ca7f406b213896e596fbd93";
+      sha256 = "02xbjblsy384ld1002hc6mc9b9i9rxlsi692s8qp1sks0v0bjmag";
    };
    meta.homepage = "https://github.com/sainnhe/edge/";
  };
@ -3058,12 +3058,12 @@ final: prev:

  elixir-tools-nvim = buildVimPluginFrom2Nix {
    pname = "elixir-tools.nvim";
-    version = "2023-07-20";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "elixir-tools";
      repo = "elixir-tools.nvim";
-      rev = "1c7452bd93cf77946cb838a39f0cbd02c782f1e6";
-      sha256 = "0k8j0wcm1xxwlsb5q6iww84yx2fkh76dk6dhj63vxyfpg473snzi";
+      rev = "0930654e8c83c6adbb479f75882ae5fd0caf9723";
+      sha256 = "1w0367p2hrhknka2kald0c35bzmvdn1h3b8gvqrl6k3mpr4v8qal";
    };
    meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/";
  };
@ -3131,12 +3131,12 @@ final: prev:

  everforest = buildVimPluginFrom2Nix {
    pname = "everforest";
-    version = "2023-05-19";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "sainnhe";
      repo = "everforest";
-      rev = "1db527e770deb8cbb3b5b60d8921f80bd2a4c12c";
-      sha256 = "0jg53zzgv417v8c079cay11nwy8mi6v5svdslcl4iq84cr7l5qfq";
+      rev = "b8ef2d0bde98645250a8997393aefba38e8c6ff3";
+      sha256 = "0q8jji19abfqmbd30iha2h0bf15k12az6wh2b9nlcdhjzki81cdl";
    };
    meta.homepage = "https://github.com/sainnhe/everforest/";
  };
@ -3708,12 +3708,12 @@ final: prev:

  gitsigns-nvim = buildNeovimPlugin {
    pname = "gitsigns.nvim";
-    version = "2023-07-25";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "lewis6991";
      repo = "gitsigns.nvim";
-      rev = "11b80e7eea249affc8776483272bcfc627b5552a";
-      sha256 = "0mwmyci65w4rzrvlcws7s6yw4m801vdcqr585harccifyrvpslls";
+      rev = "5d73da785a3c05fd63ac31769079db05169a6ec7";
+      sha256 = "16xdc4nf9i39bi9diin5v3782gnlp0ln95aphydv2s7rcg88mdlj";
    };
    meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
  };
@ -3756,24 +3756,24 @@ final: prev:

  glow-nvim = buildVimPluginFrom2Nix {
    pname = "glow.nvim";
-    version = "2023-05-05";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "ellisonleao";
      repo = "glow.nvim";
-      rev = "bbd0473d72a45094495ee5600b5577823543eefe";
-      sha256 = "13l7xd71nnvm643pc15zvi5yc2hig2x6s8dfv7bz9ygf3q7wyzy4";
+      rev = "0bd87753b052205d271a790b48a09882a9e79f35";
+      sha256 = "1sgarwqc8l8gygz90f408cljpcqrw1gsyzvfg6afih90214nfk95";
    };
    meta.homepage = "https://github.com/ellisonleao/glow.nvim/";
  };

  go-nvim = buildVimPluginFrom2Nix {
    pname = "go.nvim";
-    version = "2023-07-25";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "ray-x";
      repo = "go.nvim";
-      rev = "816fbe43b5dc15edcafa0b32785a4972fb34e67f";
-      sha256 = "0fs3rf3l0dp0141rc0g75alq89z9khjcvhfz7brn291bik7xm56b";
+      rev = "7e5602dd51a230581f43c42559d7acc2fbca23cf";
+      sha256 = "1090n4rdgjfgzfabdmmi0rxd4xk1h2y5jmhy9z7ncs0qpplhnbq2";
    };
    meta.homepage = "https://github.com/ray-x/go.nvim/";
  };
@ -3888,12 +3888,12 @@ final: prev:

  gruvbox-material = buildVimPluginFrom2Nix {
    pname = "gruvbox-material";
-    version = "2023-04-24";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "sainnhe";
      repo = "gruvbox-material";
-      rev = "3fff63b0d6a425ad1076a260cd4f6da61d1632b1";
-      sha256 = "0207p4qg6s31957jbfb0k5yabgadzn6wf3z43m5skvp5w1al5a2b";
+      rev = "b17daceec6ed9a5fb46e0f293f2ac666c90e5459";
+      sha256 = "16kg8plbav8vd97a3kix5043f538kkqiv29kmwq6aa971vjxyp9g";
    };
    meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
  };
@ -4017,6 +4017,18 @@ final: prev:
    meta.homepage = "https://github.com/travitch/hasksyn/";
  };

+  headlines-nvim = buildVimPluginFrom2Nix {
+    pname = "headlines.nvim";
+    version = "2023-07-27";
+    src = fetchFromGitHub {
+      owner = "lukas-reineke";
+      repo = "headlines.nvim";
+      rev = "74a083a3c32a08be24f7dfcc6f448ecf47857f46";
+      sha256 = "1ak7j159c0lv6pxiq4nld6svzx3465r6f1xwpawwrxlzhi5a14yz";
+    };
+    meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/";
+  };
+
  heirline-nvim = buildVimPluginFrom2Nix {
    pname = "heirline.nvim";
    version = "2023-07-24";
@ -4643,12 +4655,12 @@ final: prev:

  lean-nvim = buildVimPluginFrom2Nix {
    pname = "lean.nvim";
-    version = "2023-07-19";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "Julian";
      repo = "lean.nvim";
-      rev = "bb2ac98df0ca24b334d0d634a12c7ce90c8f4b4d";
-      sha256 = "0w7h0ilypwf3skqd750bpg66kxrzkv1i3av0k4zjwc1r6q9g24ap";
+      rev = "b82d1e8d5f6f33bd89af95e795f6877a7a6cbf7c";
+      sha256 = "0npa97h0d31p0sagkssc2gag239gssawjd0n0q3mxbhfs6jyayck";
    };
    meta.homepage = "https://github.com/Julian/lean.nvim/";
  };
@ -5027,12 +5039,12 @@ final: prev:

  lsp-zero-nvim = buildVimPluginFrom2Nix {
    pname = "lsp-zero.nvim";
-    version = "2023-07-16";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "VonHeikemen";
      repo = "lsp-zero.nvim";
-      rev = "7e1675e9e90ee08b859d75aa65609e480e55f752";
-      sha256 = "0qfznb6zc5gd65zz04h6qzd214xwaqgb7828fpnml7r5a2jnqv18";
+      rev = "7bcbd67298237d4c7a958715bc99f25f20702c6e";
+      sha256 = "0q61hfk3dsa6pgx25iqxz4r1r25mcizi0lbyvv88nn5fdvg8lv74";
    };
    meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
  };
@ -5146,12 +5158,12 @@ final: prev:

  luasnip = buildVimPluginFrom2Nix {
    pname = "luasnip";
-    version = "2023-07-18";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "l3mon4d3";
      repo = "luasnip";
-      rev = "0b4950a237ce441a6a3a947d501622453f6860ea";
-      sha256 = "062cfa2ckfca2i87l8p6k1lagrygb0lnbihp4y3dpxp4sbdppyl0";
+      rev = "e81cbe6004051c390721d8570a4a0541ceb0df10";
+      sha256 = "1smr62hm7id8j2j7cra8rcjn9xwdpayak9cfgyx4hs58w5g8hvbj";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@ -5699,12 +5711,12 @@ final: prev:

  neo-tree-nvim = buildVimPluginFrom2Nix {
    pname = "neo-tree.nvim";
-    version = "2023-07-19";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "nvim-neo-tree";
      repo = "neo-tree.nvim";
-      rev = "3c68ae5968b75aea8d445b3bb024e007b0bd0b65";
-      sha256 = "04c3lirpywwc7qlwgh8r5d1x01ggnb5f1ma3m62q9xpqd04hxmaz";
+      rev = "93fcf0a3056c60829c0a210fe35523cda7ef0369";
+      sha256 = "1gyb0y0dalam3s7gj8179kkgpjkn05wv15gkjhy0r16b7xyfk6vh";
    };
    meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
  };
@ -5747,12 +5759,12 @@ final: prev:

  neodev-nvim = buildVimPluginFrom2Nix {
    pname = "neodev.nvim";
-    version = "2023-07-22";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "neodev.nvim";
-      rev = "866b6b6e687a93ba98851a03a74bf6d9211b7299";
-      sha256 = "1a99622n34h855fw3ayib40zv7v3w05qldwa44gy69zfbvgw8z4s";
+      rev = "f57e5210d450b47aa02ea6d9e50a37414f570b4c";
+      sha256 = "1mx41pwdrnxbzgwx478fcdp8v7qljh9z06jn5qs0706lsw05pkci";
    };
    meta.homepage = "https://github.com/folke/neodev.nvim/";
  };
@ -5783,12 +5795,12 @@ final: prev:

  neogit = buildVimPluginFrom2Nix {
    pname = "neogit";
-    version = "2023-07-25";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "NeogitOrg";
      repo = "neogit";
-      rev = "e94b15969e65eafbf31749700828cac117cc1336";
-      sha256 = "1anzm10mc94lwnhlcxp4qkxnvf1kwr1bxb4kjq1a2c6v05sx5jfb";
+      rev = "2118729749a5b500e6d52bfeac22559c5a0866cc";
+      sha256 = "1qfh68md3wv5bchpip450fnmgwzxlylgb8kf5p7i8gkkzz7qdg3q";
    };
    meta.homepage = "https://github.com/NeogitOrg/neogit/";
  };
@ -5999,12 +6011,12 @@ final: prev:

  neotest-jest = buildVimPluginFrom2Nix {
    pname = "neotest-jest";
-    version = "2023-04-16";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "nvim-neotest";
      repo = "neotest-jest";
-      rev = "22b1050dda3ebd401780ec4b8e193cf52523a4da";
-      sha256 = "0vg433x68c9h0nzws6lwb4xcgqzm8ss5dkmi8df4fa55m2ll8iaw";
+      rev = "e60280f53ef9f84fd827aecae1e2f732ba4326b1";
+      sha256 = "1j4q8z3vpbcmgsmv2nvlr7dziqr4kl65prapqlr6zj0w30lr3gzn";
    };
    meta.homepage = "https://github.com/nvim-neotest/neotest-jest/";
  };
@ -6431,12 +6443,12 @@ final: prev:

  nvchad = buildVimPluginFrom2Nix {
    pname = "nvchad";
-    version = "2023-07-24";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "nvchad";
      repo = "nvchad";
-      rev = "f18488d41cb74321377631f691a3247bc59cb064";
-      sha256 = "1sz57jxzv64g1669pj5xa1kp64bbkr8gksq0wkrrmp5cjdky31bm";
+      rev = "0e27cb4b44fbba69f8646d1f88555737d2b6aedf";
+      sha256 = "00a4wazmxmrnb2da0x4im4iwr0df0kh5jn73hclp517r73m3fi4w";
    };
    meta.homepage = "https://github.com/nvchad/nvchad/";
  };
@ -6515,12 +6527,12 @@ final: prev:

  nvim-bqf = buildVimPluginFrom2Nix {
    pname = "nvim-bqf";
-    version = "2023-06-24";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "kevinhwang91";
      repo = "nvim-bqf";
-      rev = "3460a1ccf4dc92a52ed7fe2012f02a9194cd84d2";
-      sha256 = "02z00d4ah393agcpp0ihzz19z2kgnqnz3l6vwrg9qgln5k21q5fq";
+      rev = "65397976cec59a1e9892b93e3ab1ea987064b0dc";
+      sha256 = "0yih7p37gm3ipx6vixb89iq7wwf85id8ff49hrs4v6y020s4sny5";
    };
    meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
  };
@ -6575,12 +6587,12 @@ final: prev:

  nvim-cokeline = buildVimPluginFrom2Nix {
    pname = "nvim-cokeline";
-    version = "2023-07-24";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "willothy";
      repo = "nvim-cokeline";
-      rev = "056da2596e20959d0fd6d9f713c10c6884e5ece0";
-      sha256 = "0fvyss1xn1w9vrrsx6vxpcawh3zpw03qd4iibgswqpgbkdxzxa9w";
+      rev = "c2842a51df781d357cd3408c411a7bec147b57ae";
+      sha256 = "14nv3rvcy7fznxqdk2xbxfsjp8dg9kzv27zakpq352l4w9i4qfv0";
    };
    meta.homepage = "https://github.com/willothy/nvim-cokeline/";
  };
@ -6671,12 +6683,12 @@ final: prev:

  nvim-dap = buildVimPluginFrom2Nix {
    pname = "nvim-dap";
-    version = "2023-07-17";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "mfussenegger";
      repo = "nvim-dap";
-      rev = "d17d1bba23ec72a157bd183c57840c39e323f515";
-      sha256 = "172wwzl1rmxn0as549kf7gm9hzpxarz6nxsb4wsaaxab0980idik";
+      rev = "2f28ea843bcdb378b171a66ddcd568516e431d55";
+      sha256 = "12b72xhz3ha18xpcnc54s4ic19jg4i6v8dka8lxky6hymzw408ir";
    };
    meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
  };
@ -6767,12 +6779,12 @@ final: prev:

  nvim-gdb = buildVimPluginFrom2Nix {
    pname = "nvim-gdb";
-    version = "2023-07-22";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "sakhnik";
      repo = "nvim-gdb";
-      rev = "7c92e203224ef3e24a2d07546bd56b4520cd9633";
-      sha256 = "034c35a4dg3pr5ffhpw87gq6b7bdvhqqlcn9rwgjhslnsqx0h8cq";
+      rev = "571f25463a2a4c512b7c2617c976beb8190d2621";
+      sha256 = "1wxy0nwzg72i586a1zq8q17rbl116njbrwnbyd2xn1g21887myhm";
    };
    meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
  };
@ -6791,24 +6803,24 @@ final: prev:

  nvim-highlight-colors = buildVimPluginFrom2Nix {
    pname = "nvim-highlight-colors";
-    version = "2023-07-13";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "brenoprata10";
      repo = "nvim-highlight-colors";
-      rev = "e1c976a31d19c10e77b89e054310b1061acb5158";
-      sha256 = "0vw7314dz3ig5yd3msb0vp77x544sw27f2z54va7qwbwhx4125a3";
+      rev = "231547093a788b925b8fc36351ad422701c3a8c8";
+      sha256 = "186bpqmb1w18zq5sgzy0xj1cs24sb5sqpm3rqsqyhjbybgcf56yn";
    };
    meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/";
  };

  nvim-highlite = buildVimPluginFrom2Nix {
    pname = "nvim-highlite";
-    version = "2023-07-24";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "Iron-E";
      repo = "nvim-highlite";
-      rev = "1973cb1cdf39a3e2005326713dbb1192fd977c22";
-      sha256 = "1xxn6ys2c7vmhaig9280p7zd8mqfml6d5df9dzyw814f8bp5brqm";
+      rev = "7e67fa948e32ad54f790023ae7ab0bac1a1d10fa";
+      sha256 = "17r8adn2rw6b7914sk2i3407qj4ji8ph4b2dsjmfwrar6mixg411";
    };
    meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
  };
@ -6863,12 +6875,12 @@ final: prev:

  nvim-lastplace = buildVimPluginFrom2Nix {
    pname = "nvim-lastplace";
-    version = "2023-06-05";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "ethanholz";
      repo = "nvim-lastplace";
-      rev = "aeb0e0bd399288092729da89a9e51dda4ccbc9ec";
-      sha256 = "16b14l4k9lwlhbjzqqj0dn4726jdfwa5iz0sd2a1akvwq5r83rm5";
+      rev = "0bb6103c506315044872e0f84b1f736c4172bb20";
+      sha256 = "0a5bplxsds8y054jbgcwd0j0hzj0knazdmir54byd2bm57l78qcf";
    };
    meta.homepage = "https://github.com/ethanholz/nvim-lastplace/";
  };
@ -6899,12 +6911,12 @@ final: prev:

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

  nvim-lspconfig = buildVimPluginFrom2Nix {
    pname = "nvim-lspconfig";
-    version = "2023-07-25";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvim-lspconfig";
-      rev = "6f426c34c8e21af2f934e56be9d1198a507ecc9f";
-      sha256 = "167d9df5a3sh69frklk70ff3aw9ks33cc1v6y32iky8i16479zfi";
+      rev = "b6091272422bb0fbd729f7f5d17a56d37499c54f";
+      sha256 = "1miar4bdf60s4gp55rc9918v0k33w2mnqym9b44mqkxzn2fbsrh2";
    };
    meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
  };
@ -7151,12 +7163,12 @@ final: prev:

  nvim-scrollview = buildVimPluginFrom2Nix {
    pname = "nvim-scrollview";
-    version = "2023-07-24";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "dstein64";
      repo = "nvim-scrollview";
-      rev = "5a8a24a80774236bde6557ce3a98346b3e4133f9";
-      sha256 = "0k9m2vmb2xhhv7a5dr1yxv7hwhwnl1x4m6f2y3caylrhdydq0l57";
+      rev = "d83bf0bf21349d396f365f86a8126747cb72d89c";
+      sha256 = "0miw0mw3s73iv7inwhqcndcw4v759d5kvl74yd49n6qn28y0cj86";
    };
    meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
  };
@ -7271,12 +7283,12 @@ final: prev:

  nvim-treesitter = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter";
-    version = "2023-07-25";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "74a7da4e4be5ee71e9efb6d7bdffa16ad620cc57";
-      sha256 = "017fp6rmqqf60br9fzc0xkndxcbq68s092k80ac4p47cqwr3blqn";
+      rev = "f09bcffe0c29a464db24ad8124dd1f0be3fe9ce5";
+      sha256 = "07lkgkwnzibsx0syd1js4j5rgpxqb2vpkn0x37zb8x2dxzdfv0i8";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };
@ -7355,12 +7367,12 @@ final: prev:

  nvim-ts-context-commentstring = buildVimPluginFrom2Nix {
    pname = "nvim-ts-context-commentstring";
-    version = "2023-06-22";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "joosepalviste";
      repo = "nvim-ts-context-commentstring";
-      rev = "7f625207f225eea97ef7a6abe7611e556c396d2f";
-      sha256 = "0rr0kqr4v2pf9r31sw5mk8xhrlp1nq8bhbmghi18gxxg2qc58p65";
+      rev = "e9062e2dfb9854e6a927370f2d720de354c88524";
+      sha256 = "198mh7n08824mxnqhxa74fvv0nlsy179qigjzla4fny5y3yxrjq0";
    };
    meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/";
  };
@ -7571,12 +7583,12 @@ final: prev:

  onedarkpro-nvim = buildVimPluginFrom2Nix {
    pname = "onedarkpro.nvim";
-    version = "2023-07-23";
+    version = "2023-07-25";
    src = fetchFromGitHub {
      owner = "olimorris";
      repo = "onedarkpro.nvim";
-      rev = "fdd6d80011ad7b1496ce758af0fc1bcd147dc2b1";
-      sha256 = "10mw26pa9v3gk77jxcwir4ci2n8y496rldjj7ghlpxcc572aybaw";
+      rev = "5b447b2d5937a66033084b05ced0f79bcf6e6f64";
+      sha256 = "1czja1d558f303s9dbsr724a3vxgw0lhglzq4n614ljzwy2bwqx5";
    };
    meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
  };
@ -8173,12 +8185,12 @@ final: prev:

  refactoring-nvim = buildVimPluginFrom2Nix {
    pname = "refactoring.nvim";
-    version = "2023-07-23";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "theprimeagen";
      repo = "refactoring.nvim";
-      rev = "7d57e01a9ae012c7aedd73f518d45608a772eb1f";
-      sha256 = "12r8qd6c0c3ij4md3vvbl4kyfw91j3lb3kl10hknaar5kjibs2kg";
+      rev = "5359e74291164fcaeaaecdea9ba753ad54eb53d0";
+      sha256 = "1jskfd63n3r1slwhbv1qv239nd0mp3q7h4r9fardkc4xf7nsy1jb";
    };
    meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
  };
@ -8353,12 +8365,12 @@ final: prev:

  satellite-nvim = buildVimPluginFrom2Nix {
    pname = "satellite.nvim";
-    version = "2023-07-16";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "lewis6991";
      repo = "satellite.nvim";
-      rev = "723b893a5a2c1e2b77a82df229c19b57f33638e8";
-      sha256 = "0skzfg4y3ws4904b0kxlzzlqs0k6s072drhhiwrddlr6fjglpk5f";
+      rev = "8a84a2ab739d0cb5eff461f2635a32bf9a0c508d";
+      sha256 = "0x5kc8r6z8m7arhxv2nq723fzdn7c5xvmsxpp5jndvbk6nmh6n78";
    };
    meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
  };
@ -8485,12 +8497,12 @@ final: prev:

  sg-nvim = buildVimPluginFrom2Nix {
    pname = "sg.nvim";
-    version = "2023-07-25";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "sourcegraph";
      repo = "sg.nvim";
-      rev = "3fdedc7f14ee3967e2b0a49d51fdef1f92b802af";
-      sha256 = "14lf8izgkr5m0w41k63vp2r2b2ll0zvjkm5c6lqrm3i7cmmln229";
+      rev = "7de5e1577800560b2a94c0618fdccc67b74fa620";
+      sha256 = "1prq9q4mcy9035n8vganwgcmdxr7xpg8dscrracd4mrny5bhx20j";
    };
    meta.homepage = "https://github.com/sourcegraph/sg.nvim/";
  };
@ -8630,12 +8642,12 @@ final: prev:

  sonokai = buildVimPluginFrom2Nix {
    pname = "sonokai";
-    version = "2023-04-24";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "sainnhe";
      repo = "sonokai";
-      rev = "a9b2a3e83ed4fa7a5541e41be9becaa7b436edcf";
-      sha256 = "0zfgi04c42n1bf5l9zj4g5k60fnsp2njf12vkpfnq2vqdcj1563i";
+      rev = "adb066ac5250556ccfca22f901c9710a735f23c2";
+      sha256 = "081ccy3s94js343ywr24jwky3qrmk508vddm5vrhpdgrpni2z2zm";
    };
    meta.homepage = "https://github.com/sainnhe/sonokai/";
  };
@ -8787,12 +8799,12 @@ final: prev:

  srcery-vim = buildVimPluginFrom2Nix {
    pname = "srcery-vim";
-    version = "2023-04-25";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "srcery-colors";
      repo = "srcery-vim";
-      rev = "6545397ee8119c43f5717600a42ad4b44be0f572";
-      sha256 = "1i71l565kmfqrl691ccs1p12v3rig00j4bvl9qg9fhwwxk61bcpx";
+      rev = "cf2c61ff3448be41b264ee850eeac16cacd7e5a9";
+      sha256 = "0gpdsnzwk9hvr2302rc62nxsvv895525q6iy7pzracjqlh29ljbq";
    };
    meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
  };
@ -9233,12 +9245,12 @@ final: prev:

  telescope-file-browser-nvim = buildVimPluginFrom2Nix {
    pname = "telescope-file-browser.nvim";
-    version = "2023-07-01";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "nvim-telescope";
      repo = "telescope-file-browser.nvim";
-      rev = "e03ff55962417b69c85ef41424079bb0580546ba";
-      sha256 = "1agwrhwb6w0qpcgcmffibnip61g6dqjzmchngb1a9fwxqvzrgfll";
+      rev = "6c234e863444c246611ad7458185c771ad8cd6e6";
+      sha256 = "05bd8yw22hp6lj732dhffq8wpy13qslwv2wf8rlmza2m7am4jfiy";
    };
    meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/";
  };
@ -9463,12 +9475,12 @@ final: prev:

  telescope-nvim = buildNeovimPlugin {
    pname = "telescope.nvim";
-    version = "2023-07-22";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "nvim-telescope";
      repo = "telescope.nvim";
-      rev = "1228f3b15ca3d9b95dcb92efda6a3448871030bd";
-      sha256 = "0qqvh3dq86djb8jf4p6icmbkswj5024a6ll1nkyjmmqm04k74q0m";
+      rev = "22735947d84d78f29436c203f0a4b8dc15dda204";
+      sha256 = "09vy6kmqrnk503vxa7v9z526lv7p3h76fcpcacq1n2196hrjdrxx";
    };
    meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
  };
@ -9511,12 +9523,12 @@ final: prev:

  term-edit-nvim = buildVimPluginFrom2Nix {
    pname = "term-edit.nvim";
-    version = "2023-05-28";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "chomosuke";
      repo = "term-edit.nvim";
-      rev = "3c2385d5d058720928a96e77c405466478fb711a";
-      sha256 = "06qkld6i542p0hh2jxk80n5xfrf0jklg4b7vmkm6imvkcj705hdc";
+      rev = "07bfebde433d3de5d3f53494417413d5a3f7292b";
+      sha256 = "15mm09wqn83pnqp0k6js0j8g0v71bmf7wda64vbyicxc9xsrxn7q";
    };
    meta.homepage = "https://github.com/chomosuke/term-edit.nvim/";
  };
@ -9932,12 +9944,12 @@ final: prev:

  unison = buildVimPluginFrom2Nix {
    pname = "unison";
-    version = "2023-07-24";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "unisonweb";
      repo = "unison";
-      rev = "6d050d5bc74645cb572c01a0a5c8d2eb28479c71";
-      sha256 = "07w8lskf4scx7knkaknc9ba1g7hk3b1jmx7mn6qfxmxf4kx5i2vd";
+      rev = "3a2d7d78b310f6ddde939042fa04b553012d2c7b";
+      sha256 = "10741mmqls1ys0cd7kab1cn7sjby8f9fhap57jh01nhjkkqbfz86";
    };
    meta.homepage = "https://github.com/unisonweb/unison/";
  };
@ -11036,12 +11048,12 @@ final: prev:

  vim-css-color = buildVimPluginFrom2Nix {
    pname = "vim-css-color";
-    version = "2023-03-08";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "ap";
      repo = "vim-css-color";
-      rev = "5687a7978bc80263cd03d0a667c2f56890cfb940";
-      sha256 = "1bm5ay1c9jw34ax9bxivq9b3crfgizphfq40rd406jdyg72ahgbk";
+      rev = "6cc65734bc7105d9677ca54e2255fcbc953ba6bf";
+      sha256 = "1mjry4xiaxhjgzajsbmh4iph9hhxbwgdj3raaxlqzmmnyjsz03iy";
    };
    meta.homepage = "https://github.com/ap/vim-css-color/";
  };
@ -12358,12 +12370,12 @@ final: prev:

  vim-just = buildVimPluginFrom2Nix {
    pname = "vim-just";
-    version = "2023-07-24";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "NoahTheDuke";
      repo = "vim-just";
-      rev = "8e5c882f8d6fb213b160ac2cbb5b28fea620ed0b";
-      sha256 = "17k073vbx4b2cll0n4pj33c3znmd7df4ln6fr3l6yswlcd6byabh";
+      rev = "2a94aecd8eb53e1147392da33df8ee4ea6e482d6";
+      sha256 = "0n8vq3a4z9yl3xidg2gbclwwwjdd82kixqjjdm8z03d8vy59qg9r";
    };
    meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
  };
@ -12731,12 +12743,12 @@ final: prev:

  vim-matchup = buildVimPluginFrom2Nix {
    pname = "vim-matchup";
-    version = "2023-07-20";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "andymass";
      repo = "vim-matchup";
-      rev = "ca8971739e3908973c5912cb3a0ffb6cf7bd83e7";
-      sha256 = "1b9jqympkq0aw9mjpl5gny2xal0cmg3kxwxafpd3i4l8hw5qrwzh";
+      rev = "0646093e07b1f89b16536cfb3dc4993e3f0ac653";
+      sha256 = "117zdg6ibnnnpl03r6dhb71hm3dw6h0y2lxbkj8kl5b0gk8lapph";
    };
    meta.homepage = "https://github.com/andymass/vim-matchup/";
  };
@ -13919,12 +13931,12 @@ final: prev:

  vim-slime = buildVimPluginFrom2Nix {
    pname = "vim-slime";
-    version = "2023-06-23";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "jpalardy";
      repo = "vim-slime";
-      rev = "a096a2969fcb807fd5c6a75d943c6227dd9e6a38";
-      sha256 = "1jhkrir48kbdhd95659b7rmbavb75c05zqjvzz4f633i33j32bf3";
+      rev = "99cc4af89014971ca65748b32128d15b008c979c";
+      sha256 = "1sh5k3w3d81gnyvsfy70vygvvi3rsk8wbyh1n30k0fl6b30j4pb6";
    };
    meta.homepage = "https://github.com/jpalardy/vim-slime/";
  };
@ -15049,12 +15061,12 @@ final: prev:

  vimtex = buildVimPluginFrom2Nix {
    pname = "vimtex";
-    version = "2023-07-24";
+    version = "2023-07-25";
    src = fetchFromGitHub {
      owner = "lervag";
      repo = "vimtex";
-      rev = "9da5481ca32d4c903228e4e30b5d8ccdd46e6a94";
-      sha256 = "1hayvndfzvr839zv76mhkqr7vyi2q3y140hxrc5vz0bkk0hc6w8w";
+      rev = "877de3ba5de5f766e5bfa1c3fb0d2ecfcd18f868";
+      sha256 = "1yyz90a84n6npa35ngb9hb8fv7ir89f1nv89c5ps59fxmdivh9sq";
    };
    meta.homepage = "https://github.com/lervag/vimtex/";
  };
@ -15506,12 +15518,12 @@ final: prev:

  catppuccin-nvim = buildVimPluginFrom2Nix {
    pname = "catppuccin-nvim";
-    version = "2023-07-21";
+    version = "2023-07-26";
    src = fetchFromGitHub {
      owner = "catppuccin";
      repo = "nvim";
-      rev = "6425df128d46f2db2cccf9aa7a66ca2823c1d153";
-      sha256 = "0abchc41rpfrhda9i3yjn08ngm785vxznmn3zkl2886gak0a9l34";
+      rev = "737f60a3a25c79d9bb9574092f6c6c958a3d747a";
+      sha256 = "0n2jwxzprgn4lryaivrfds78dri9h24q7ablf5lyfj6wcrmcqgk7";
    };
    meta.homepage = "https://github.com/catppuccin/nvim/";
  };
@ -15566,12 +15578,12 @@ final: prev:

  lspsaga-nvim-original = buildVimPluginFrom2Nix {
    pname = "lspsaga-nvim-original";
-    version = "2023-07-25";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "nvimdev";
      repo = "lspsaga.nvim";
-      rev = "31b4b4336d05e7c8ff0f833a493de2a2875f1b38";
-      sha256 = "0m426zxd6liah3xfdnxjs289c27z31fw8r0fdw8dvnvgsbhz1a2v";
+      rev = "557e6fd7fbca325a4bea582576fe36bec903367c";
+      sha256 = "0cxg1ahl9la3m8cd3sb7s456kmvrxjjsf411imyfgl0rp7632bf5";
    };
    meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
  };
@ -15614,24 +15626,24 @@ final: prev:

  nvchad-extensions = buildVimPluginFrom2Nix {
    pname = "nvchad-extensions";
-    version = "2023-07-25";
+    version = "2023-07-27";
    src = fetchFromGitHub {
      owner = "nvchad";
      repo = "extensions";
-      rev = "0abb3ead8ce6ffa0e03b596a000d231b5e5d406b";
-      sha256 = "13bngm38j90n21szilc27bpdzgjk4g41a6a8yz1bc60rddxxjxr3";
+      rev = "0bfeb74229ad973ce600088997ac8421980f79bb";
+      sha256 = "1jh5728mwfpg9pzgd9pvb177ssdzfvs8bsms1mrjcjx7xj2iv33m";
    };
    meta.homepage = "https://github.com/nvchad/extensions/";
  };

  nvchad-ui = buildVimPluginFrom2Nix {
    pname = "nvchad-ui";
-    version = "2023-07-23";
+    version = "2023-07-28";
    src = fetchFromGitHub {
      owner = "nvchad";
      repo = "ui";
-      rev = "c4c1f41deb8102bb68f168795d1dcc036e098f98";
-      sha256 = "0ddkq6dnk45n2rnzjvfkr2r1iq67fbdg8s61r1cpk7a7dgq9j2v3";
+      rev = "47ef4046504e5562a3daf30db50b7d4a1552fcb5";
+      sha256 = "1hx7i8z31avpfngqi21izl740p0ryhkf3ys1g76drnzqi6gan8d7";
    };
    meta.homepage = "https://github.com/nvchad/ui/";
  };
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -27,12 +27,12 @@
  };
  arduino = buildGrammar {
    language = "arduino";
-    version = "0.0.0+rev=4de2f3e";
+    version = "0.0.0+rev=3446bac";
    src = fetchFromGitHub {
      owner = "ObserverOfTime";
      repo = "tree-sitter-arduino";
-      rev = "4de2f3e6235ee8659ecb7467c16ed13bde7fb272";
-      hash = "sha256-DeUp7M96PHQ652tvWSnsu1rSaQJyCCojAYfplccbJTc=";
+      rev = "3446bac828d5db2a6cf60ab31813c02ab53547a7";
+      hash = "sha256-E4mRE+CtuI/s3LlVcT/VFhFdFakRXvSr7/v4gaB4H+U=";
    };
    meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
  };
@ -126,12 +126,12 @@
  };
  c = buildGrammar {
    language = "c";
-    version = "0.0.0+rev=6adee19";
+    version = "0.0.0+rev=ad09589";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-c";
-      rev = "6adee194587678b250608cdb808544f06bcd26e7";
-      hash = "sha256-A3bLZxkCru7uAOtz9J3I/nsIoRRWmoUUiPGaLtljrqw=";
+      rev = "ad095896dd223f1c22b85ac5ec84ab11fb732b07";
+      hash = "sha256-0SqgOjsSFQkDeJMmF9mAgvbgnm9CCuFTYCUJo4zjCEU=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
  };
@ -258,12 +258,12 @@
  };
  cpp = buildGrammar {
    language = "cpp";
-    version = "0.0.0+rev=0e7b7a0";
+    version = "0.0.0+rev=f88bf81";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-cpp";
-      rev = "0e7b7a02b6074859b51c1973eb6a8275b3315b1d";
-      hash = "sha256-s5QRDs4W8TpB+kWtwXIvanP+Ii7hQgUI/yu0rvDUIg4=";
+      rev = "f88bf81238ec2842682e4d1dac0acf3b43b686e9";
+      hash = "sha256-9GOzjjIA/RXNLGlFSyvir4cHAl075TSW10AsOlJec0k=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
  };
@ -280,12 +280,12 @@
  };
  cuda = buildGrammar {
    language = "cuda";
-    version = "0.0.0+rev=c5befe0";
+    version = "0.0.0+rev=2af3d43";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-cuda";
-      rev = "c5befe09c99f5e88190574676ffa8eb29775d410";
-      hash = "sha256-wdv5TuNQl81n9CSyNkvAwCSPhfOs+DPwOT675WAphZE=";
+      rev = "2af3d43cd96dd3f3c3868095222c7f5e2462b3ab";
+      hash = "sha256-ZwinNfhFM1u4qplHOFR8xKphtSjENS+o4u9RUgEnOHg=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
  };
@ -645,12 +645,12 @@
  };
  glsl = buildGrammar {
    language = "glsl";
-    version = "0.0.0+rev=7d76863";
+    version = "0.0.0+rev=34e0657";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-glsl";
-      rev = "7d76863f2126ed3b246fead68f9591760d546c94";
-      hash = "sha256-X0Lqq7xrKEFVRAOh1AfvzeJQ5zv6RNwv583p69VkEpY=";
+      rev = "34e0657e37323874c6b67c718a0f83410c4602cf";
+      hash = "sha256-tOIwOy0XmDpDPxLWXZQNqxgoycA03oaqbdp+PxJfn+0=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
  };
@ -777,12 +777,12 @@
  };
  hcl = buildGrammar {
    language = "hcl";
-    version = "0.0.0+rev=becebeb";
+    version = "0.0.0+rev=b553906";
    src = fetchFromGitHub {
      owner = "MichaHoffmann";
      repo = "tree-sitter-hcl";
-      rev = "becebebd3509c02e871c99be55556269be1def1b";
-      hash = "sha256-GR2a+VuhZVMGmLW9Mg7bSALNsy0SyfG+YVaRz1qY6a0=";
+      rev = "b5539065432c08e4118eb3ee7c94902fdda85708";
+      hash = "sha256-okLwoDGgK6aM5+8oelfRnuKqIimTs8Hc0N8Ikrm2eY0=";
    };
    meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl";
  };
@ -810,12 +810,12 @@
  };
  hlsl = buildGrammar {
    language = "hlsl";
-    version = "0.0.0+rev=b8fab02";
+    version = "0.0.0+rev=20c40a3";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-hlsl";
-      rev = "b8fab02e808bab41c49829fb5e4fb0ce7eab8d1a";
-      hash = "sha256-b/8KKGFqYj0gwDo3EgrRAufvXeuAEz6xvIBHBeVW0KE=";
+      rev = "20c40a3f1bb68c596f56bb0c0290008b9d4f58dd";
+      hash = "sha256-mLcl73XNDjkKUvFixPjW4EAO9y++gpitu7e+oym/Mpc=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
  };
@ -832,12 +832,12 @@
  };
  hoon = buildGrammar {
    language = "hoon";
-    version = "0.0.0+rev=89271df";
+    version = "0.0.0+rev=dfa565f";
    src = fetchFromGitHub {
      owner = "urbit-pilled";
      repo = "tree-sitter-hoon";
-      rev = "89271dfe18f20aa71cbe5ef813252a8f98901240";
-      hash = "sha256-UdYucPGeAFexjSxx1RHMWPPJ7KFQs41c+Vi8BSM+Yj0=";
+      rev = "dfa565f87c8997d43cec725d41f023cc3577ca46";
+      hash = "sha256-ogNgjvRRR0KevOlB1PH+cI+HHftq/JrS6pQuIwR5m2A=";
    };
    meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon";
  };
@ -898,12 +898,12 @@
  };
  ispc = buildGrammar {
    language = "ispc";
-    version = "0.0.0+rev=848e588";
+    version = "0.0.0+rev=0bdbb03";
    src = fetchFromGitHub {
      owner = "fab4100";
      repo = "tree-sitter-ispc";
-      rev = "848e58874ffa2f7e540a6ec01ab9652b26995f37";
-      hash = "sha256-xHX7N3pJbU8c4apoDXEm2VXOn9NH9atG8YfwSMyhHZ4=";
+      rev = "0bdbb03d9abde78d8be2f2199e57119b2c7f8fd7";
+      hash = "sha256-udsVK0FCbq6hFl0iLgWdTNbZdKps2avHk0SfJ/DIUxY=";
    };
    meta.homepage = "https://github.com/fab4100/tree-sitter-ispc";
  };
@ -1275,12 +1275,12 @@
  };
  objc = buildGrammar {
    language = "objc";
-    version = "0.0.0+rev=6d876af";
+    version = "0.0.0+rev=77e28ae";
    src = fetchFromGitHub {
      owner = "amaanq";
      repo = "tree-sitter-objc";
-      rev = "6d876afade2d5e70d394aaf994321c78297e3607";
-      hash = "sha256-1LJ5pFslYqgPYoBptSw6SY7pt6syXJoxQUJ5KsybjSk=";
+      rev = "77e28aeaede824a5f4aa501fb5f3138ab1019b9f";
+      hash = "sha256-lK0wy6cEf9RSD9G96ywkUFZrRTk1WYtkdNbI7OBGRtg=";
    };
    meta.homepage = "https://github.com/amaanq/tree-sitter-objc";
  };
@ -1465,12 +1465,12 @@
  };
  promql = buildGrammar {
    language = "promql";
-    version = "0.0.0+rev=655afc4";
+    version = "0.0.0+rev=4b6b9f3";
    src = fetchFromGitHub {
      owner = "MichaHoffmann";
      repo = "tree-sitter-promql";
-      rev = "655afc4fe6813f38bde087d6493d8fd4920d6d4a";
-      hash = "sha256-eqpWHPlCoQqMXL4hgLXaakQ0fP/U5tK7p+QAZgq24KI=";
+      rev = "4b6b9f399dc58e408c81da8d8fd7e66ab617eef3";
+      hash = "sha256-CaNCxgKL/N6TUcO838iR09tFTYS/kWJLf8whQF/3hAg=";
    };
    meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-promql";
  };
@ -1498,12 +1498,12 @@
  };
  pug = buildGrammar {
    language = "pug";
-    version = "0.0.0+rev=884e225";
+    version = "0.0.0+rev=a7ff31a";
    src = fetchFromGitHub {
      owner = "zealot128";
      repo = "tree-sitter-pug";
-      rev = "884e225b5ecca5d885ae627275f16ef648acd42e";
-      hash = "sha256-qPfVSnsw9bDznq7rhzftGyv9cGi2OiF6DCh55Lxk8xA=";
+      rev = "a7ff31a38908df9b9f34828d21d6ca5e12413e18";
+      hash = "sha256-WDx2Y1LxuJJuAaeTxfqQrxRXxVd4Cn3niQeherh+5Uc=";
    };
    meta.homepage = "https://github.com/zealot128/tree-sitter-pug";
  };
@ -1575,12 +1575,12 @@
  };
  r = buildGrammar {
    language = "r";
-    version = "0.0.0+rev=80efda5";
+    version = "0.0.0+rev=c55f8b4";
    src = fetchFromGitHub {
      owner = "r-lib";
      repo = "tree-sitter-r";
-      rev = "80efda55672d1293aa738f956c7ae384ecdc31b4";
-      hash = "sha256-qUfyITSZRnSm4zZHfkM/Dm5AeFEFLcCtRrInx0Xs/tg=";
+      rev = "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57";
+      hash = "sha256-NWnEk0FixC7pBdNLwJUGvKifwZj8nzX7VWv8AhgaI2o=";
    };
    meta.homepage = "https://github.com/r-lib/tree-sitter-r";
  };
@ -1705,6 +1705,18 @@
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
  };
+  scfg = buildGrammar {
+    language = "scfg";
+    version = "0.0.0+rev=6deae0c";
+    src = fetchFromSourcehut {
+      owner = "~rockorager";
+      repo = "tree-sitter-scfg";
+      rev = "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0";
+      hash = "sha256-2ubRvjpvRJEBZXpM7ZIkWAwSZARCzP/klydQ6IVpCSk=";
+    };
+    generate = true;
+    meta.homepage = "https://git.sr.ht/~rockorager/tree-sitter-scfg";
+  };
  scheme = buildGrammar {
    language = "scheme";
    version = "0.0.0+rev=ca8af22";
@ -1919,12 +1931,12 @@
  };
  terraform = buildGrammar {
    language = "terraform";
-    version = "0.0.0+rev=becebeb";
+    version = "0.0.0+rev=b553906";
    src = fetchFromGitHub {
      owner = "MichaHoffmann";
      repo = "tree-sitter-hcl";
-      rev = "becebebd3509c02e871c99be55556269be1def1b";
-      hash = "sha256-GR2a+VuhZVMGmLW9Mg7bSALNsy0SyfG+YVaRz1qY6a0=";
+      rev = "b5539065432c08e4118eb3ee7c94902fdda85708";
+      hash = "sha256-okLwoDGgK6aM5+8oelfRnuKqIimTs8Hc0N8Ikrm2eY0=";
    };
    location = "dialects/terraform";
    meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl";
@ -2154,12 +2166,12 @@
  };
  wgsl_bevy = buildGrammar {
    language = "wgsl_bevy";
-    version = "0.0.0+rev=7cd38d6";
+    version = "0.0.0+rev=9e3273e";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-wgsl-bevy";
-      rev = "7cd38d6895060b023353e04f7af099ec64add5d1";
-      hash = "sha256-QzfeFzGhWJGD+l+MeKyedRpdZsH+dGKE7UxRmh2uMH0=";
+      rev = "9e3273e64bdd3f74d1514674286838f9075ee9e4";
+      hash = "sha256-bBGunOcFPrHWLsP1ISgdFBNDIBbB0uhwxKAwmQZg7/k=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy";
  };
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -932,7 +932,7 @@ self: super: {
        pname = "sg-nvim-rust";
        inherit (old) version src;

-        cargoHash = "sha256-KhUCIAGSgf7TxabEzcjo582VgbSU79QSGlaEP7BbJCE=";
+        cargoHash = "sha256-bgroNNFRoKiySTC6Rldoy8Unepxd2OXwqcy3fA+CETs=";

        nativeBuildInputs = [ pkg-config ];

--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -336,6 +336,7 @@ https://github.com/MrcJkb/haskell-tools.nvim/,HEAD,
 https://github.com/neovimhaskell/haskell-vim/,,
 https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
 https://github.com/travitch/hasksyn/,,
+https://github.com/lukas-reineke/headlines.nvim/,HEAD,
 https://github.com/rebelot/heirline.nvim/,,
 https://github.com/RaafatTurki/hex.nvim/,HEAD,
 https://github.com/Yggdroot/hiPairs/,,
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -507,6 +507,22 @@ let
        };
      };

+       bierner.docs-view = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "docs-view";
+          publisher = "bierner";
+          version = "0.0.11";
+          sha256 = "sha256-3njIL2SWGFp87cvQEemABJk2nXzwI1Il/WG3E0ZYZxw=";
+        };
+        meta = {
+          changelog = "https://marketplace.visualstudio.com/items/bierner.docs-view/changelog";
+          description = "A VSCode extension that displays documentation in the sidebar or panel";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.docs-view";
+          homepage = "https://github.com/mattbierner/vscode-docs-view#readme";
+          license = lib.licenses.mit;
+        };
+      };
+
      bierner.emojisense = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "emojisense";
@ -1091,6 +1107,22 @@ let
        };
      };

+      dotenv.dotenv-vscode = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "dotenv-vscode";
+          publisher = "dotenv";
+          version = "0.28.0";
+          sha256 = "sha256-KiQgFvbfLsA/ADROoG6y6c/i0XHuTNH2AN+6mWEm0P8=";
+        };
+        meta = {
+          changelog = "https://marketplace.visualstudio.com/items/dotenv.dotenv-vscode/changelog";
+          description = "Official Dotenv extension for VSCode. Offers syntax highlighting, auto-cloaking, auto-completion, in-code secret peeking, and optionally dotenv-vault";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=dotenv.dotenv-vscode";
+          homepage = "https://github.com/dotenv-org/dotenv-vscode";
+          license = lib.licenses.mit;
+        };
+      };
+
      dotjoshjohnson.xml = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "xml";
@ -1234,6 +1266,38 @@ let
        };
      };

+      emroussel.atomize-atom-one-dark-theme = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "atomize-atom-one-dark-theme";
+          publisher = "emroussel";
+          version = "2.0.2";
+          sha256 = "sha256-GwuFtBVj0Z2rHryst/7cegskvZIMPsrAH12+K942+JA=";
+        };
+        meta = {
+          changelog = "https://marketplace.visualstudio.com/items/emroussel.atomize-atom-one-dark-theme/changelog";
+          description = "A detailed and accurate Atom One Dark theme for VSCode";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=emroussel.atomize-atom-one-dark-theme";
+          homepage = "https://github.com/emroussel/atomize/blob/main/README.md";
+          license = lib.licenses.mit;
+        };
+      };
+
+      enkia.tokyo-night = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "tokyo-night";
+          publisher = "enkia";
+          version = "1.0.0";
+          sha256 = "sha256-/fM+aUDUzVJ6P38i+GrxhLv2eLJNa8OFkKsM4yPBy4c=";
+        };
+        meta = {
+          changelog = "https://marketplace.visualstudio.com/items/enkia.tokyo-night/changelog";
+          description = "A clean Visual Studio Code theme that celebrates the lights of Downtown Tokyo at night";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=enkia.tokyo-night";
+          homepage = "https://github.com/enkia/tokyo-night-vscode-theme";
+          license = lib.licenses.mit;
+        };
+      };
+
      equinusocio.vsc-material-theme = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "vsc-material-theme";
@ -3378,6 +3442,22 @@ let
        };
      };

+      unifiedjs.vscode-mdx = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-mdx";
+          publisher = "unifiedjs";
+          version = "1.4.0";
+          sha256 = "sha256-qqqq0QKTR0ZCLdPltsnQh5eTqGOh9fV1OSOZMjj4xXg=";
+        };
+        meta = {
+          changelog = "https://marketplace.visualstudio.com/items/unifiedjs.vscode-mdx/changelog";
+          description = "VSCode language support for MDX";
+          downloadPage = "https://github.com/mdx-js/mdx-analyzer";
+          homepage = "https://github.com/mdx-js/mdx-analyzer#readme";
+          license = lib.licenses.mit;
+        };
+      };
+
      usernamehw.errorlens = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "errorlens";
@ -3633,6 +3713,21 @@ let
        };
      };

+      wmaurer.change-case = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "change-case";
+          publisher = "wmaurer";
+          version = "1.0.0";
+          sha256 = "sha256-tN/jlG2PzuiCeERpgQvdqDoa3UgrUaM7fKHv6KFqujc=";
+        };
+        meta = {
+          description = "A VSCode extension for quickly changing the case (camelCase, CONSTANT_CASE, snake_case, etc) of the current selection or current word";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=wmaurer.change-case";
+          homepage = "https://github.com/wmaurer/vscode-change-case";
+          license = lib.licenses.mit;
+        };
+      };
+
      xadillax.viml = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "viml";
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@ -43,7 +43,7 @@ let
      comment = "Code Editing. Redefined.";
      genericName = "Text Editor";
      exec = "${executableName} %F";
-      icon = "code";
+      icon = "vs${executableName}";
      startupNotify = true;
      startupWMClass = shortName;
      categories = [ "Utility" "TextEditor" "Development" "IDE" ];
@ -52,7 +52,7 @@ let
      actions.new-empty-window = {
        name = "New Empty Window";
        exec = "${executableName} --new-window %F";
-        icon = "code";
+        icon = "vs${executableName}";
      };
    };

@ -62,7 +62,7 @@ let
      comment = "Code Editing. Redefined.";
      genericName = "Text Editor";
      exec = executableName + " --open-url %U";
-      icon = "code";
+      icon = "vs${executableName}";
      startupNotify = true;
      categories = [ "Utility" "TextEditor" "Development" "IDE" ];
      mimeTypes = [ "x-scheme-handler/vscode" ];
@ -103,8 +103,9 @@ let
      ln -s "$desktopItem/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"
      ln -s "$urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop"

+      # These are named vscode.png, vscode-insiders.png, etc to match the name in upstream *.deb packages.
      mkdir -p "$out/share/pixmaps"
-      cp "$out/lib/vscode/resources/app/resources/linux/code.png" "$out/share/pixmaps/code.png"
+      cp "$out/lib/vscode/resources/app/resources/linux/code.png" "$out/share/pixmaps/vs${executableName}.png"

      # Override the previously determined VSCODE_PATH with the one we know to be correct
      sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}"
--- a/pkgs/applications/editors/vscode/with-extensions.nix
+++ b/pkgs/applications/editors/vscode/with-extensions.nix
@ -83,7 +83,7 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
  mkdir -p "$out/share/applications"
  mkdir -p "$out/share/pixmaps"

-  ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png"
+  ln -sT "${vscode}/share/pixmaps/vs${executableName}.png" "$out/share/pixmaps/vs${executableName}.png"
  ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"
  ln -sT "${vscode}/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop"
  makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${extensionsFlag}
--- a/pkgs/applications/emulators/mame/default.nix
+++ b/pkgs/applications/emulators/mame/default.nix
@ -38,14 +38,14 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "mame";
-  version = "0.256";
+  version = "0.257";
  srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;

  src = fetchFromGitHub {
    owner = "mamedev";
    repo = "mame";
    rev = "mame${srcVersion}";
-    hash = "sha256-rQ1GQks3Nni6ALxfiJzdkKUgbZrXaLu9vJtEDPjgP3Q=";
+    hash = "sha256-iBLHvdqIgF6XkJQX5hFLrP9KkTGWfVvTCs+DRJhsSp4=";
  };

  outputs = [ "out" "tools" ];
--- 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-14";
+  version = "7.1.1-15";

  src = fetchFromGitHub {
    owner = "ImageMagick";
    repo = "ImageMagick";
    rev = finalAttrs.version;
-    hash = "sha256-vZ3ILHIRxwB3ho7hlJpC7hlo7Nhb56SjZ/hgdoh1rwY=";
+    hash = "sha256-/fI/RrwcgvKX5loIrDAur60VF5O4FgyPYN7BbcPP/bU=";
  };

  outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
--- a/pkgs/applications/graphics/vengi-tools/default.nix
+++ b/pkgs/applications/graphics/vengi-tools/default.nix
@ -29,13 +29,13 @@

 stdenv.mkDerivation rec {
  pname = "vengi-tools";
-  version = "0.0.24";
+  version = "0.0.25";

  src = fetchFromGitHub {
    owner = "mgerhardy";
    repo = "vengi";
    rev = "v${version}";
-    sha256 = "sha256-ZkO2CLSuuJcFJFBO4XS8Qec0CxxAJdzOGfFa2zy+4uI=";
+    hash = "sha256-ZY0HG1BpRQV7+RzdXUhKV6JRa/1RIYmCuhnYCZapG8w=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@ -5,11 +5,21 @@
 , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
 , qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
 , qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire
-, wrapGAppsHook
+, wrapGAppsHook, fetchpatch
 }:

 mkDerivation {
  pname = "spectacle";
+
+  patches = [
+    # backport fix for region capture with multi-display high-dpi setups
+    # FIXME: remove in 23.08
+    (fetchpatch {
+      url = "https://invent.kde.org/graphics/spectacle/-/commit/d0886c85445fad227b256152a549cb33bd97b776.patch";
+      hash = "sha256-t0+X1pzjlS2OWduMwQBoYbjh+o/SF4hOkAqzz/MJw3E=";
+    })
+  ];
+
  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
  buildInputs = [
    kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@ -40,7 +40,6 @@ mavenJdk17.buildMavenPackage rec {
  nativeBuildInputs = [
    copyDesktopItems
    makeWrapper
-    mavenJdk17
  ];

  buildInputs = [
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@ -10,16 +10,16 @@

 buildGoModule rec {
  pname = "hugo";
-  version = "0.115.4";
+  version = "0.116.0";

  src = fetchFromGitHub {
    owner = "gohugoio";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-//WWdU6vKgc+X4R3/GClABbsAp+ZBnG3xsVh4YozPFg=";
+    hash = "sha256-Q5aSpKBgPa2EBEI9qJAw/WRM9LjHa2rdsThMFRV2/F8=";
  };

-  vendorHash = "sha256-BmMrdPr3sQI0Pw32iIIVmWy2qLlR7SHyKu7+PLplxkE=";
+  vendorHash = "sha256-ScAjE+va/5K/9sYt05X1GmTJp8AUopMukWN/WlPG1sg=";

  doCheck = false;

--- a/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/pkgs/applications/misc/joplin-desktop/default.nix
@ -11,6 +11,7 @@ let
  suffix = {
    x86_64-linux = "AppImage";
    x86_64-darwin = "dmg";
+    aarch64-darwin = "dmg";
  }.${system} or throwSystem;

  src = fetchurl {
@ -18,6 +19,7 @@ let
    sha256 = {
      x86_64-linux = "sha256-r64+y+LfMrJnUdabVdak5+LQB50YLOuMXftlZ4s3C/w=";
      x86_64-darwin = "sha256-/dvaYHa7PT6FA63kmtjrErJZI9O+hIlKvHnf5RnfeZg=";
+      aarch64-darwin = "sha256-/dvaYHa7PT6FA63kmtjrErJZI9O+hIlKvHnf5RnfeZg=";
    }.${system} or throwSystem;
  };

@ -37,7 +39,7 @@ let
    homepage = "https://joplinapp.org";
    license = licenses.agpl3Plus;
    maintainers = with maintainers; [ hugoreeves qjoly ];
-    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin"];
  };

  linux = appimageTools.wrapType2 rec {
--- a/pkgs/applications/misc/ns-usbloader/99-ns-usbloader.rules
+++ b/pkgs/applications/misc/ns-usbloader/99-ns-usbloader.rules
@ -0,0 +1,4 @@
+# Nintendo Switch HOS
+SUBSYSTEM=="usb", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="3000", MODE="0666"
+# Nintendo Switch RCM
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0955", ATTRS{idProduct}=="7321", MODE="0666"
--- a/pkgs/applications/misc/ns-usbloader/default.nix
+++ b/pkgs/applications/misc/ns-usbloader/default.nix
@ -0,0 +1,88 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, copyDesktopItems
+, makeDesktopItem
+, makeWrapper
+, maven
+, jre
+}:
+let
+  pkgDescription = "All-in-one tool for managing Nintendo Switch homebrew";
+
+  selectSystem = attrs:
+    attrs.${stdenv.hostPlatform.system}
+      or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+
+  jreWithJavaFX = jre.override { enableJavaFX = true; };
+in
+maven.buildMavenPackage rec {
+  pname = "ns-usbloader";
+  version = "7.0";
+
+  src = fetchFromGitHub {
+    owner = "developersu";
+    repo = "ns-usbloader";
+    rev = "v${version}";
+    sha256 = "sha256-x4zGwsDUVUHI4AUMPSqgnZVyZx+pWQA5xvtrFE8U3QU=";
+  };
+
+  patches = [ ./no-launch4j.patch ./make-deterministic.patch ];
+
+  # JavaFX pulls in architecture dependent jar dependencies. :(
+  # May be possible to unify these, but could lead to huge closure sizes.
+  mvnHash = selectSystem {
+    x86_64-linux = "sha256-vXZAlZOh9pXNF1RL78oQRal5pkXFRKDz/7SP9LibgiA=";
+    aarch64-linux = "sha256-xC+feb41EPi30gBrVR8usanVULI2Pt0knztzNagPQiw=";
+  };
+  mvnParameters = "-DskipTests";
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    makeWrapper
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/java
+    install -Dm644 target/ns-usbloader-${version}.jar $out/share/java/ns-usbloader.jar
+
+    mkdir -p $out/bin
+    makeWrapper ${jreWithJavaFX}/bin/java $out/bin/ns-usbloader \
+      --append-flags "-jar $out/share/java/ns-usbloader.jar"
+
+    mkdir -p $out/lib/udev/rules.d
+    install -Dm644 ${./99-ns-usbloader.rules} $out/lib/udev/rules.d/99-ns-usbloader.rules
+
+    mkdir -p $out/share/icons/hicolor
+    install -Dm644 target/classes/res/app_icon32x32.png $out/share/icons/hicolor/32x32/apps/ns-usbloader.png
+    install -Dm644 target/classes/res/app_icon48x48.png $out/share/icons/hicolor/48x48/apps/ns-usbloader.png
+    install -Dm644 target/classes/res/app_icon64x64.png $out/share/icons/hicolor/64x64/apps/ns-usbloader.png
+    install -Dm644 target/classes/res/app_icon128x128.png $out/share/icons/hicolor/128x128/apps/ns-usbloader.png
+
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      type = "Application";
+      name = "ns-usbloader";
+      desktopName = "NS-USBLoader";
+      comment = pkgDescription;
+      exec = "ns-usbloader";
+      icon = "ns-usbloader";
+      categories = [ "Game" ];
+      terminal = false;
+      keywords = [ "nintendo" "switch" ];
+    })
+  ];
+
+  meta = with lib; {
+    description = pkgDescription;
+    homepage = "https://github.com/developersu/ns-usbloader";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ soupglasses ];
+    platforms = [ "x86_64-linux" "aarch64-linux" ];
+  };
+}
--- a/pkgs/applications/misc/ns-usbloader/make-deterministic.patch
+++ b/pkgs/applications/misc/ns-usbloader/make-deterministic.patch
@ -0,0 +1,130 @@
+From 3f85e2754144bbf2805ba68d8c76b3dec3299f4d Mon Sep 17 00:00:00 2001
+From: Sofi <sofi+git@mailbox.org>
+Date: Sat, 29 Jul 2023 11:16:38 +0200
+Subject: [PATCH] make deterministic
+
+---
+ pom.xml | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 57 insertions(+), 6 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 320d4f3..5a594e6 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -51,6 +51,7 @@
+         <maven.build.timestamp.format>yyyyMMdd.HHmmss</maven.build.timestamp.format>
+         <javafx.version>19.0.2.1</javafx.version>
+         <maven.compiler.release>11</maven.compiler.release>
+        <project.build.outputTimestamp>2023-01-01T00:00:00Z</project.build.outputTimestamp>
+     </properties>
+ 
+     <issueManagement>
+@@ -166,7 +167,7 @@
+         </dependency>
+     </dependencies>
+     <build>
+-        <finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+         <resources>
+             <resource>
+                 <directory>src/main/resources</directory>
+@@ -193,26 +194,51 @@
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-surefire-plugin</artifactId>
+-                <version>2.22.2</version>
+                <version>3.1.2</version>
+             </plugin>
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-failsafe-plugin</artifactId>
+-                <version>2.22.2</version>
+                <version>3.1.2</version>
+             </plugin>
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-compiler-plugin</artifactId>
+-                <version>3.10.1</version>
+                <version>3.11.0</version>
+                 <configuration>
+                     <release>11</release>
+                 </configuration>
+             </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-enforcer-plugin</artifactId>
+              <version>3.3.0</version>
+              <executions>
+                <execution>
+                  <id>enforce-versions</id>
+                  <phase>validate</phase>
+                  <goals>
+                    <goal>enforce</goal>
+                  </goals>
+                  <configuration>
+                    <rules>
+                      <requireMavenVersion>
+                        <version>[3.2.5,)</version>
+                      </requireMavenVersion>
+                      <requireJavaVersion>
+                        <version>[1.8,)</version>
+                      </requireJavaVersion>
+                      <requirePluginVersions />
+                    </rules>
+                  </configuration>
+                </execution>
+              </executions>
+            </plugin>
+             <!-- Don't generate default JAR without dependencies -->
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-jar-plugin</artifactId>
+-                <version>3.1.2</version>
+                <version>3.3.0</version>
+                 <!--
+                 <configuration>
+                     <manifestEntries>
+@@ -231,7 +257,7 @@
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-assembly-plugin</artifactId>
+-                <version>3.1.0</version>
+                <version>3.6.0</version>
+                 <configuration>
+                     <archive>
+                         <manifest>
+@@ -253,6 +279,31 @@
+                     </execution>
+                 </executions>
+             </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-deploy-plugin</artifactId>
+              <version>3.1.1</version>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-resources-plugin</artifactId>
+              <version>3.3.1</version>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-site-plugin</artifactId>
+              <version>4.0.0-M9</version>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-install-plugin</artifactId>
+              <version>3.1.1</version>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-clean-plugin</artifactId>
+              <version>3.3.1</version>
+            </plugin>
+         </plugins>
+     </build>
+ </project>
+-- 
+2.41.0
+
--- a/pkgs/applications/misc/ns-usbloader/no-launch4j.patch
+++ b/pkgs/applications/misc/ns-usbloader/no-launch4j.patch
@ -0,0 +1,70 @@
+From ead7a3b988a47a3896ea8a3ff01556e073115f16 Mon Sep 17 00:00:00 2001
+From: Sofi <sofi+git@mailbox.org>
+Date: Thu, 27 Jul 2023 17:23:31 +0200
+Subject: [PATCH] No launch4j
+
+---
+ pom.xml | 47 +----------------------------------------------
+ 1 file changed, 1 insertion(+), 46 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 21352e0..320d4f3 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -253,51 +253,6 @@
+                     </execution>
+                 </executions>
+             </plugin>
+-            <plugin>
+-                <groupId>com.akathist.maven.plugins.launch4j</groupId>
+-                <version>2.2.0</version>
+-                <artifactId>launch4j-maven-plugin</artifactId>
+-                <executions>
+-                    <execution>
+-                        <id>l4j-ns-usbloader</id>
+-                        <phase>package</phase>
+-                        <goals>
+-                            <goal>launch4j</goal>
+-                        </goals>
+-                        <configuration>
+-                            <headerType>gui</headerType>
+-                            <icon>appicon.ico</icon>
+-                            <outfile>target/${project.name}.exe</outfile>
+-                            <jar>target/${project.artifactId}-${project.version}-${maven.build.timestamp}.jar</jar>
+-                            <!-- <downloadUrl>https://download.oracle.com/java/17/archive/jdk-17.0.1_windows-x64_bin.msi</downloadUrl> -->
+-                            <errTitle>Launching error</errTitle>
+-                            <!-- <dontWrapJar>true</dontWrapJar> -->
+-                            <jre>
+-                                <path>%PWD%/jdk</path>
+-                                <minVersion>11.0.0</minVersion>
+-                            </jre>
+-                            <versionInfo>
+-                                <fileVersion>${project.version}.0.0</fileVersion>
+-                                <txtFileVersion>${project.version}</txtFileVersion>
+-                                <fileDescription>NS multi-tool</fileDescription>
+-                                <copyright>GNU General Public License v3, ${project.inceptionYear} ${project.organization.name}, Russia.</copyright>
+-                                <productVersion>${project.version}.0.0</productVersion>
+-                                <txtProductVersion>${project.version}</txtProductVersion>
+-                                <companyName>${project.organization.name}</companyName>
+-                                <productName>${project.name}</productName>
+-                                <internalName>${project.name}</internalName>
+-                                <originalFilename>${project.name}.exe</originalFilename>
+-                            </versionInfo>
+-                            <messages>
+-                                <startupErr>Startup error</startupErr>
+-                                <jreNotFoundErr>JDK not found</jreNotFoundErr>
+-                                <jreVersionErr>JDK Version mismatch</jreVersionErr>
+-                                <launcherErr>Launcher Error</launcherErr>
+-                            </messages>
+-                        </configuration>
+-                    </execution>
+-                </executions>
+-            </plugin>
+         </plugins>
+     </build>
+-</project>
+\ No newline at end of file
+</project>
+-- 
+2.41.0
+
--- a/pkgs/applications/misc/transifex-cli/default.nix
+++ b/pkgs/applications/misc/transifex-cli/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "transifex-cli";
-  version = "1.6.7";
+  version = "1.6.9";

  src = fetchFromGitHub {
    owner = "transifex";
    repo = "cli";
    rev = "v${version}";
-    sha256 = "sha256-5166P44HSRKQ0pCh1BCPd1ZUryh/IBDumcnLYA+CSBY=";
+    sha256 = "sha256-92FT0LLo5kw4uCTNVnY+TLegOG5Xs8WWUocU8yb/HJ4=";
  };

-  vendorSha256 = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU=";
+  vendorHash = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU=";

  ldflags = [
    "-s" "-w" "-X 'github.com/transifex/cli/internal/txlib.Version=${version}'"
--- a/pkgs/applications/misc/ttdl/default.nix
+++ b/pkgs/applications/misc/ttdl/default.nix
@ -5,16 +5,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "ttdl";
-  version = "3.10.0";
+  version = "4.0.0";

  src = fetchFromGitHub {
    owner = "VladimirMarkelov";
    repo = "ttdl";
    rev = "v${version}";
-    sha256 = "sha256-46oqQaDYFxpSjqFdP2V0aBP1S6BDG+hSO/V76WwCzAQ=";
+    sha256 = "sha256-er2IDPVFbcuT0COBCpBymNVBKtETdWjzR2330WUBp6U=";
  };

-  cargoHash = "sha256-Kol7pCHq91zOE9boRatv12pgh/rfra5snUe3HNho1DU=";
+  cargoHash = "sha256-WcqkvnXRgsDJM7p2WGa5lmeeuwNwBy2ZQATVkTHRX7Q=";

  meta = with lib; {
    description = "A CLI tool to manage todo lists in todo.txt format";
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@ -3,10 +3,10 @@
 {
  firefox = buildMozillaMach rec {
    pname = "firefox";
-    version = "115.0.2";
+    version = "115.0.3";
    src = fetchurl {
      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "de6ce8a2512e862c69a7d5c557d6168498d0d40e9c4b54b775f81c444e863a64c43130d57b51b360db4224c34b64a93f3ad263441caee713243b97750ec1eb4b";
+      sha512 = "d42d522e4c2160824c74d94c90b9d61ff7fd0515cddc9e4d544003ddf975fe975aa517493dc28bad31c67915a22477b2fbb42266dc3bda87a2555b7f57a6f5a2";
    };

    meta = {
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@ -17,13 +17,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "lagrange";
-  version = "1.16.5";
+  version = "1.16.6";

  src = fetchFromGitHub {
    owner = "skyjake";
    repo = "lagrange";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-OLKUw0qimt0WgcW26T4IWVK16nDGSmqHSuSJ8tHhbsE=";
+    hash = "sha256-avBZnQi1xuyrJX7YG+8O3+122Of11innCCr5sPYyySg=";
  };

  nativeBuildInputs = [ cmake pkg-config zip ];
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "helmfile";
-  version = "0.155.0";
+  version = "0.155.1";

  src = fetchFromGitHub {
    owner = "helmfile";
    repo = "helmfile";
    rev = "v${version}";
-    sha256 = "sha256-9YOgpXiZegimS81owjHW/in0NbxMTL+DQEgSBWdW7Rs=";
+    sha256 = "sha256-6y+7Jrs/sIpxJjO9Zzv2ht1RprrqcBjwyOsCnqDHxUY=";
  };

-  vendorHash = "sha256-ioZJr3v/8HhOEJJZpsCw5Gkbg9XvMMEOugyfRhevWBc=";
+  vendorHash = "sha256-MCx+6K3CqVfFEYgkxT1sFvy0vshpKwW07AUngEG2muk=";

  doCheck = false;

--- a/pkgs/applications/networking/cluster/helmsman/default.nix
+++ b/pkgs/applications/networking/cluster/helmsman/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "helmsman";
-  version = "3.16.4";
+  version = "3.17.0";

  src = fetchFromGitHub {
    owner = "Praqma";
    repo = "helmsman";
    rev = "v${version}";
-    sha256 = "sha256-8hv68O4U9bPjqqtVOpmY3DwfeTGEZJGVkzIyYhS14aM=";
+    sha256 = "sha256-mXc3CVKh4pFAZVppvk5TTg6s6dOA2Gv+ROLNV37DAl4=";
  };

-  vendorHash = "sha256-aSpv4TGp0YLdk/RYEvfYswlEWnv8sy9iflXGGCcKPHs=";
+  vendorHash = "sha256-zn8q3HpyQWNsksYbqJcgnjOxaBVUr3dIYHk+FAalNxA=";

  doCheck = false;

--- a/pkgs/applications/networking/cluster/k3d/default.nix
+++ b/pkgs/applications/networking/cluster/k3d/default.nix
@ -15,15 +15,16 @@ let
 in
 buildGoModule rec {
  pname = "k3d";
-  version = "5.4.4";
+  version = "5.5.1";

  src = fetchFromGitHub {
    owner = "k3d-io";
    repo = "k3d";
-    rev = "v${version}";
-    sha256 = "sha256-3J25Aj/otKDCWJ+YqAsoJogU2vckZMy7fsS8XR2EMgE=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-cXUuWR5ALgCgr1bK/Qpdpo978p3PRL3/H6j1T7DKrT4=";
  };
-  vendorSha256 = null;
+
+  vendorHash = null;

  nativeBuildInputs = [ installShellFiles ];

@ -54,6 +55,8 @@ buildGoModule rec {
    runHook postInstallCheck
  '';

+  env.GOWORK = "off";
+
  meta = with lib; {
    homepage = "https://github.com/k3d-io/k3d/";
    changelog = "https://github.com/k3d-io/k3d/blob/v${version}/CHANGELOG.md";
--- a/pkgs/applications/networking/cluster/kubectl-explore/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl-explore/default.nix
@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "kubectl-explore";
+  version = "0.7.1";
+
+  src = fetchFromGitHub {
+    owner = "keisku";
+    repo = "kubectl-explore";
+    rev = "v${version}";
+    hash = "sha256-4WxvVsA05Mta7AcrGe26B+Up+x/gwdlCnb/PN9Ehu18=";
+  };
+
+  vendorHash = "sha256-z/bPfY9UVqOnrA9jNUtM7jg53/URAMAJQAqH9D5KVPQ=";
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A better kubectl explain with the fuzzy finder";
+    homepage = "https://github.com/keisku/kubectl-explore";
+    changelog = "https://github.com/keisku/kubectl-explore/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = [ maintainers.koralowiec ];
+  };
+}
--- a/pkgs/applications/networking/cluster/nerdctl/default.nix
+++ b/pkgs/applications/networking/cluster/nerdctl/default.nix
@ -10,16 +10,16 @@

 buildGoModule rec {
  pname = "nerdctl";
-  version = "1.4.0";
+  version = "1.5.0";

  src = fetchFromGitHub {
    owner = "containerd";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-30T5HXQz57Uwgly6HcMroEC/qwynm6nB4B3uwDC2WHo=";
+    hash = "sha256-ngR+xlhTy3oxPN34+MoT9TSOI0+Epp8QG3KiiPmRUts=";
  };

-  vendorHash = "sha256-zsIRdPNoUrlN2FWSlHN8+8yi74CGxW6pX8TYNHtPJ3A=";
+  vendorHash = "sha256-lsD8AtbREVKFXiPsteSFA7xntRlNgOQ1y5c44vOqMa8=";

  nativeBuildInputs = [ makeWrapper installShellFiles ];

--- a/pkgs/applications/networking/cluster/pluto/default.nix
+++ b/pkgs/applications/networking/cluster/pluto/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "pluto";
-  version = "5.18.1";
+  version = "5.18.2";

  src = fetchFromGitHub {
    owner = "FairwindsOps";
    repo = "pluto";
    rev = "v${version}";
-    sha256 = "sha256-E4DPJDBa/WX5JVsWgqdEv/O/XCvHDLyaL+nSMmw6Npg=";
+    sha256 = "sha256-PouKOIyKv7mxlBZJYCBppADdkf/XD28gavozCFFcO24=";
  };

  vendorHash = "sha256-okqDtxSKVLlmnm5JdCKSvRZkXTsghi/L5R9TX10WWjY=";
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@ -1,28 +1,32 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:

 buildGoModule rec {
  pname = "tilt";
  /* Do not use "dev" as a version. If you do, Tilt will consider itself
    running in development environment and try to serve assets from the
    source tree, which is not there once build completes.  */
-  version = "0.33.1";
+  version = "0.33.3";

  src = fetchFromGitHub {
-    owner  = "tilt-dev";
-    repo   = pname;
-    rev    = "v${version}";
-    sha256 = "sha256-3CRE+gpifV3MHyKdiiHmGwGre0ne3IjheYH0r6NMKY8=";
+    owner = "tilt-dev";
+    repo = "tilt";
+    rev = "v${version}";
+    hash = "sha256-TNZE335tH50E96yJzD26U+JbVxjU746Wa/8YDGHFeto=";
  };
+
  vendorHash = null;

  subPackages = [ "cmd/tilt" ];

  ldflags = [ "-X main.version=${version}" ];

-  meta = with lib; {
+  meta = {
    description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production";
    homepage = "https://tilt.dev/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ anton-dessiatov ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ anton-dessiatov ];
  };
 }
--- a/pkgs/applications/networking/cluster/weave-gitops/default.nix
+++ b/pkgs/applications/networking/cluster/weave-gitops/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "weave-gitops";
-  version = "0.27.0";
+  version = "0.28.0";

  src = fetchFromGitHub {
    owner = "weaveworks";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-q19oKawv7hLHMaPAIIdGLl+4N+HiXuIow8f3k9bTt3A=";
+    sha256 = "sha256-chL88vWUMN4kcuh8g2ckWOqYAs9JwE0vnm69zLd5KIM=";
  };

  ldflags = [ "-s" "-w" "-X github.com/weaveworks/weave-gitops/cmd/gitops/version.Version=${version}" ];
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@ -95,6 +95,7 @@ let
        '';
        license = lib.licenses.gpl3;
        maintainers = with lib.maintainers; [ ncfavier ];
+        mainProgram = "weechat";
        platforms = lib.platforms.unix;
      };
    }
--- a/pkgs/applications/networking/onionshare/default.nix
+++ b/pkgs/applications/networking/onionshare/default.nix
@ -124,6 +124,7 @@ rec {
        inherit tor meek obfs4 snowflake;
        inherit (tor) geoip;
      })
+      ./fix-qrcode-gui.patch
    ];

    disable = !isPy3k;
--- a/pkgs/applications/networking/onionshare/fix-qrcode-gui.patch
+++ b/pkgs/applications/networking/onionshare/fix-qrcode-gui.patch
@ -0,0 +1,14 @@
+diff --git desktop/onionshare/widgets.py desktop/onionshare/widgets.py
+index 64a07703..bca974fb 100644
+--- desktop/onionshare/widgets.py
+++ desktop/onionshare/widgets.py
+@@ -101,7 +101,7 @@ class Image(qrcode.image.base.BaseImage):
+     A custom Image class, for use with the QR Code pixmap.
+     """
+ 
+-    def __init__(self, border, width, box_size):
+    def __init__(self, border, width, box_size, *args, **kargs):
+         self.border = border
+         self.width = width
+         self.box_size = box_size
+
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@ -2,7 +2,7 @@
 python3, rsync, cron, openssh, sshfs-fuse, encfs }:

 let
-  python' = python3.withPackages (ps: with ps; [ dbus-python keyring ]);
+  python' = python3.withPackages (ps: with ps; [ dbus-python keyring packaging ]);

  apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ];
 in stdenv.mkDerivation rec {
--- a/pkgs/applications/science/electronics/digital/default.nix
+++ b/pkgs/applications/science/electronics/digital/default.nix
@ -39,9 +39,9 @@ maven.buildMavenPackage rec {
  };

  inherit mvnParameters;
-  mvnHash = "sha256-Ej/JePvd9Ieni8FqSaXBDc2T6Cwr8WP54iko8wYiT68=";
+  mvnHash = "sha256-wm/axWJucoW9P98dKqHI4bjrUnmBTfosCOdJg9VBJ+4=";

-  nativeBuildInputs = [ copyDesktopItems maven makeWrapper ];
+  nativeBuildInputs = [ copyDesktopItems makeWrapper ];

  installPhase = ''
    mkdir -p $out/bin
--- a/pkgs/applications/science/electronics/nvc/default.nix
+++ b/pkgs/applications/science/electronics/nvc/default.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "nvc";
-  version = "1.10.0";
+  version = "1.10.1";

  src = fetchFromGitHub {
    owner = "nickg";
    repo = "nvc";
    rev = "r${version}";
-    hash = "sha256-WwO46x6McV18ebGFjXQ8fvqRh6ih1Wt5JTbfTxVWTi0=";
+    hash = "sha256-7Kw9irZltNE8VRnIvVX786/u0QQtmRhV8pzpba0h1JY=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@ -27,7 +27,7 @@ let
      calculus in one easy-to-use package.
    '';
    homepage = "https://www.geogebra.org/";
-    maintainers = with maintainers; [ sikmir imsofi ];
+    maintainers = with maintainers; [ sikmir soupglasses ];
    license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ];
    sourceProvenance = with sourceTypes; [
      binaryBytecode
--- a/pkgs/applications/science/misc/gephi/default.nix
+++ b/pkgs/applications/science/misc/gephi/default.nix
@ -18,7 +18,7 @@ mavenJdk11.buildMavenPackage rec {

  mvnHash = "sha256-/2/Yb26Ry0NHQQ3j0LXnjwC0wQqJiztvTgWixyMJqvg=";

-  nativeBuildInputs = [ jdk11 mavenJdk11 ];
+  nativeBuildInputs = [ jdk11 ];

  installPhase = ''
    cp -r modules/application/target/gephi $out
--- a/pkgs/applications/version-management/forgejo/default.nix
+++ b/pkgs/applications/version-management/forgejo/default.nix
@ -6,6 +6,7 @@
 , gzip
 , lib
 , makeWrapper
+, nix-update-script
 , nixosTests
 , openssh
 , pam
@ -38,17 +39,17 @@ let
 in
 buildGoModule rec {
  pname = "forgejo";
-  version = "1.20.1-0";
+  version = "1.20.2-0";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "forgejo";
    repo = "forgejo";
    rev = "v${version}";
-    hash = "sha256-3L43hm6Tx4h5UHm3jGTGiOWBgAGx49zVGB0D6om6ayk=";
+    hash = "sha256-8mFI5Zt2J6EQZqu/qcirFp8WMz+IlrkvHeA+oUb0X5U=";
  };

-  vendorHash = "sha256-n2fqqQ6jqHEAWLlaY9t6nd6Ty0viOuTwDWDhTECve+Q=";
+  vendorHash = "sha256-ZoFs2T3NNixrbTDdp7fqTgjJ+G8DpkxHW8K6BM8tZ9w=";

  subPackages = [ "." ];

@ -95,6 +96,9 @@ buildGoModule rec {
  });

  passthru = {
+    # allow nix-update to handle npmDepsHash
+    inherit (frontend) npmDeps;
+
    data-compressed = runCommand "forgejo-data-compressed" {
      nativeBuildInputs = [ brotli xorg.lndir ];
    } ''
@ -108,6 +112,7 @@ buildGoModule rec {
    '';

    tests = nixosTests.forgejo;
+    updateScript = nix-update-script { };
  };

  meta = {
@ -115,7 +120,7 @@ buildGoModule rec {
    homepage = "https://forgejo.org";
    changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/${src.rev}";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ emilylange urandom bendlas ];
+    maintainers = with lib.maintainers; [ emilylange urandom bendlas adamcstephens ];
    broken = stdenv.isDarwin;
    mainProgram = "gitea";
  };
--- a/pkgs/applications/version-management/ghorg/default.nix
+++ b/pkgs/applications/version-management/ghorg/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "ghorg";
-  version = "1.9.6";
+  version = "1.9.7";

  src = fetchFromGitHub {
    owner = "gabrie30";
    repo = "ghorg";
    rev = "v${version}";
-    sha256 = "sha256-++jUs/V4luOWNjCrZpJAT/08aEr00kvl4vDxKTqA5fc=";
+    sha256 = "sha256-uIhYk79ZXcJ/ttexgjtxskI2nEwlq+E4jgIZzwz8hmI=";
  };

  doCheck = false;
--- a/pkgs/data/fonts/scheherazade/default.nix
+++ b/pkgs/data/fonts/scheherazade/default.nix
@ -1,10 +1,11 @@
-{ lib, stdenvNoCC, fetchzip, version ? "3.300" }:
+{ lib, stdenvNoCC, fetchzip, version ? "4.000" }:

 let
  new = lib.versionAtLeast version "3.000";
  hash = {
    "2.100" = "sha256-d2UyOOOnmE1afCwyIrM1bL3lQC7XRwh03hzetk/4V30=";
    "3.300" = "sha256-LaaA6DWAE2dcwVVX4go9cJaiuwI6efYbPk82ym3W3IY=";
+    "4.000" = "sha256-FhgHlHCfojIl3Y11EDYhNTmLYwQ60OrwnA9nbZbZGJE=";
  }."${version}";
  pname = "scheherazade${lib.optionalString new "-new"}";
 in
--- a/pkgs/development/compilers/gambit/bootstrap.nix
+++ b/pkgs/development/compilers/gambit/bootstrap.nix
@ -6,11 +6,11 @@

 gccStdenv.mkDerivation {
  pname = "gambit-bootstrap";
-  version = "4.9.3";
+  version = "4.9.5";

  src = fetchurl {
-    url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz";
-    sha256 = "1p6172vhcrlpjgia6hsks1w4fl8rdyjf9xjh14wxfkv7dnx8a5hk";
+    url = "https://gambitscheme.org/4.9.5/gambit-v4_9_5.tgz";
+    sha256 = "sha256-4o74218OexFZcgwVAFPcq498TK4fDlyDiUR5cHP4wdw=";
  };

  buildInputs = [ autoconf ];
--- a/pkgs/development/compilers/gambit/build.nix
+++ b/pkgs/development/compilers/gambit/build.nix
@ -1,5 +1,5 @@
 { gccStdenv, lib, git, openssl, autoconf, pkgs, makeStaticLibraries, gcc, coreutils, gnused, gnugrep,
-  src, version, git-version,
+  src, version, git-version, stampYmd ? 0, stampHms ? 0,
  gambit-support, optimizationSetting ? "-O1", gambit-params ? pkgs.gambit-support.stable-params }:

 # Note that according to a benchmark run by Marc Feeley on May 2018,
@ -26,6 +26,7 @@ gccStdenv.mkDerivation rec {
  bootstrap = gambit-support.gambit-bootstrap;

  nativeBuildInputs = [ git autoconf ];
+
  # TODO: if/when we can get all the library packages we depend on to have static versions,
  # we could use something like (makeStaticLibraries openssl) to enable creation
  # of statically linked binaries by gsc.
@ -39,11 +40,14 @@ gccStdenv.mkDerivation rec {
    "--enable-targets=${gambit-params.targets}"
    "--enable-single-host"
    "--enable-c-opt=${optimizationSetting}"
+    "--enable-c-opt-rts=-O2"
    "--enable-gcc-opts"
    "--enable-shared"
    "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it.
    "--enable-openssl"
+    #"--enable-default-compile-options='(compactness 9)'" # Make life easier on the JS backend
    "--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}"
+    # "--enable-rtlib-debug" # used by Geiser, but only on recent-enough gambit, and messes js runtime
    # "--enable-debug" # Nope: enables plenty of good stuff, but also the costly console.log
    # "--enable-multiple-versions" # Nope, NixOS already does version multiplexing
    # "--enable-guide"
@ -58,9 +62,9 @@ gccStdenv.mkDerivation rec {
    # "--enable-coverage"
    # "--enable-inline-jumps"
    # "--enable-char-size=1" # default is 4
-  ] ++
-    # due not enable poll on darwin due to https://github.com/gambit/gambit/issues/498
-    lib.optional (!gccStdenv.isDarwin) "--enable-poll";
+  ] ++ gambit-params.extraOptions
+    # Do not enable poll on darwin due to https://github.com/gambit/gambit/issues/498
+    ++ lib.optional (!gccStdenv.isDarwin) "--enable-poll";

  configurePhase = ''
    export CC=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc \
@ -71,31 +75,35 @@ gccStdenv.mkDerivation rec {
           XMKMF=${coreutils}/bin/false
    unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS

-    ${gambit-params.fix-stamp git-version}
+    ${gambit-params.fixStamp git-version stampYmd stampHms}

    ./configure --prefix=$out/gambit ${builtins.concatStringsSep " " configureFlags}

    # OS-specific paths are hardcoded in ./configure
    substituteInPlace config.status \
-      --replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}" \
-      --replace "/usr/local/opt/openssl" "${lib.getLib openssl}"
+      ${lib.optionalString (gccStdenv.isDarwin && !gambit-params.stable)
+         ''--replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}"''} \
+        --replace "/usr/local/opt/openssl" "${lib.getLib openssl}"

    ./config.status
  '';

  buildPhase = ''
-    # Make bootstrap compiler, from release bootstrap
+    # The MAKEFLAGS setting is a workaround for https://github.com/gambit/gambit/issues/833
+    export MAKEFLAGS="--output-sync=recurse"
+    echo "Make bootstrap compiler, from release bootstrap"
    mkdir -p boot
    cp -rp ${bootstrap}/gambit/. boot/.
    chmod -R u+w boot
    cd boot
    cp ../gsc/makefile.in ../gsc/*.scm gsc/
+    echo > include/stamp.h # No stamp needed for the bootstrap compiler
    ./configure
    for i in lib gsi gsc ; do (cd $i ; make -j$NIX_BUILD_CORES) ; done
    cd ..
    cp boot/gsc/gsc gsc-boot

-    # Now use the bootstrap compiler to build the real thing!
+    echo "Now use the bootstrap compiler to build the real thing!"
    make -j$NIX_BUILD_CORES from-scratch
    ${lib.optionalString gambit-params.modules "make -j$NIX_BUILD_CORES modules"}
  '';
@ -107,6 +115,7 @@ gccStdenv.mkDerivation rec {
  '';

  doCheck = true;
+  dontStrip = true;

  meta = gambit-support.meta;
 }
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@ -1,10 +1,10 @@
 { callPackage, fetchurl }:

 callPackage ./build.nix rec {
-  version = "4.9.3";
+  version = "4.9.5";
  git-version = version;
  src = fetchurl {
-    url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz";
-    sha256 = "1p6172vhcrlpjgia6hsks1w4fl8rdyjf9xjh14wxfkv7dnx8a5hk";
+    url = "https://gambitscheme.org/4.9.5/gambit-v4_9_5.tgz";
+    sha256 = "sha256-4o74218OexFZcgwVAFPcq498TK4fDlyDiUR5cHP4wdw=";
  };
 }
--- a/pkgs/development/compilers/gambit/gambit-support.nix
+++ b/pkgs/development/compilers/gambit/gambit-support.nix
@ -3,37 +3,38 @@
 rec {
  stable-params = {
    stable = true;
-    defaultRuntimeOptions = "f8,-8,t8";
-    buildRuntimeOptions = "f8,-8,t8";
-    fix-stamp = git-version : "";
-    targets = "java,js,php,python,ruby";
-    modules = false;
-  };
-
-  unstable-params = {
-    stable = false;
    defaultRuntimeOptions = "iL,fL,-L,tL";
    buildRuntimeOptions = "i8,f8,-8,t8";
-    fix-stamp = git-version : ''
+    targets = "js"; # arm,java,js,php,python,riscv-32,riscv-64,ruby,x86,x86-64
+    #fixStamp = _: _: _: "";
+    fixStamp = git-version: stampYmd: stampHms: ''
+      echo "Fixing timestamp recipe in Makefile"
      substituteInPlace configure \
        --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \
        --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ;
+      substituteInPlace include/makefile.in \
+        --replace "echo > stamp.h;" "(echo '#define ___STAMP_VERSION \"${git-version}\"'; echo '#define ___STAMP_YMD ${toString stampYmd}'; echo '#define ___STAMP_HMS ${toString stampHms}';) > stamp.h;";
    '';
-    targets = "arm,java,js,php,python,riscv-32,riscv-64,ruby,x86,x86-64"; # eats 100% cpu on _digest
-    modules = false;
+    modules = true;
+    extraOptions = [];
+  };
+
+  unstable-params = stable-params // {
+    stable = false;
+    extraOptions = ["--enable-trust-c-tco"];
  };

  export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;";

  gambit-bootstrap = import ./bootstrap.nix ( pkgs );

-  meta = {
+  meta = with lib; {
    description = "Optimizing Scheme to C compiler";
    homepage    = "http://gambitscheme.org";
-    license     = lib.licenses.lgpl21; # dual, also asl20
-    # NB regarding platforms: continuously tested on Linux,
-    # tested on macOS once in a while, *should* work everywhere.
-    platforms   = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ thoughtpolice raskin fare ];
+    license     = licenses.lgpl21Only; # dual, also asl20
+    # NB regarding platforms: continuously tested on Linux x86_64 and regularly tested on macOS x86_64.
+    # *should* work everywhere.
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ thoughtpolice raskin fare ];
  };
 }
--- a/pkgs/development/compilers/gambit/unstable.nix
+++ b/pkgs/development/compilers/gambit/unstable.nix
@ -1,13 +1,15 @@
 { callPackage, fetchFromGitHub, gambit-support }:

 callPackage ./build.nix {
-  version = "unstable-2020-09-20";
-  git-version = "4.9.3-1234-g6acd87df";
+  version = "unstable-2023-07-30";
+  git-version = "4.9.5-3-ge059fffd";
+  stampYmd = 20230730;
+  stampHms = 151945;
  src = fetchFromGitHub {
-    owner = "feeley";
+    owner = "gambit";
    repo = "gambit";
-    rev = "6acd87dfa95bfca33082a431e72f023345dc07ee";
-    sha256 = "0a3dy4ij8hzlp3sjam4b6dp6yvyz5d7g2x784qm3gp89fi2ck56r";
+    rev = "e059fffdfbd91e27c350ff2ebd671adefadd5212";
+    sha256 = "0q7hdfchl6lw53xawmmjvhyjdmqxjdsnzjqv9vpkl2qa4vyir5fs";
  };
  gambit-params = gambit-support.unstable-params;
 }
--- a/pkgs/development/libraries/cegui/default.nix
+++ b/pkgs/development/libraries/cegui/default.nix
@ -1,19 +1,53 @@
-{ lib, stdenv, fetchurl, cmake, ogre, freetype, boost, expat, libiconv }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, ogre
+, freetype
+, boost
+, expat
+, darwin
+, libiconv
+, unstableGitUpdater
+}:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "cegui";
-  version = "0.8.7";
+  version = "unstable-2023-03-18";

-  src = fetchurl {
-    url = "mirror://sourceforge/crayzedsgui/${pname}-${version}.tar.bz2";
-    sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk";
+  src = fetchFromGitHub {
+    owner = "paroj";
+    repo = "cegui";
+    rev = "186ce900e293b98f2721c11930248a8de54aa338";
+    hash = "sha256-RJ4MnxklcuxC+ZYEbfma5RDc2aeJ95LuTwNk+FnEhdo=";
  };

-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ ogre freetype boost expat ]
-    ++ lib.optionals stdenv.isDarwin [ libiconv ];
+  strictDeps = true;

-  cmakeFlags = lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64";
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    ogre
+    freetype
+    boost
+    expat
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Cocoa
+    darwin.apple_sdk.frameworks.Foundation
+    libiconv
+  ];
+
+  cmakeFlags = [
+    "-DCEGUI_OPTION_DEFAULT_IMAGECODEC=OgreRenderer-0"
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}"
+  ];
+
+  passthru.updateScript = unstableGitUpdater {
+    branch = "v0";
+  };

  meta = with lib; {
    homepage = "http://cegui.org.uk/";
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@ -1,6 +1,6 @@
 { lib
 , stdenv
-, fetchFromGitHub
+, fetchFromGitHub, fetchpatch
 , cmake
 , enableShared ? !stdenv.hostPlatform.isStatic

@ -69,5 +69,12 @@ in
  fmt_10 = generic {
    version = "10.0.0";
    sha256 = "sha256-sVY2TVPS/Zx32p5XIYR6ghqN4kOZexzH7Cr+y8sZXK8=";
+    patches = [
+      # fixes a test failure on pkgsMusl.fmt
+      (fetchpatch {
+        url = "https://github.com/fmtlib/fmt/commit/eaa6307691a9edb9e2f2eacf70500fc6989b416c.diff";
+        hash = "sha256-PydnmOn/o9DexBViFGUUAO9KFjVS6CN8GVDHcl/+K8g=";
+      })
+    ];
  };
 }
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@ -47,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  doCheck = true;
+  mesonFlags = lib.optional (!finalAttrs.finalPackage.doCheck) "-Dtests=disabled";

  passthru = {
    updateScript = gnome.updateScript {
--- a/pkgs/development/libraries/ogre/1.10.x.nix
+++ b/pkgs/development/libraries/ogre/1.10.x.nix
@ -1,110 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchpatch
-, cmake
-, pkg-config
-, boost
-, freeimage
-, freetype
-, libpng
-, ois
-, zziplib
-, freeglut
-, libGL
-, libGLU
-, libICE
-, libSM
-, libX11
-, libXaw
-, libXmu
-, libXrandr
-, libXrender
-, libXt
-, libXxf86vm
-, xorgproto
-, darwin
-, withNvidiaCg ? false
-, nvidia_cg_toolkit
-, withSamples ? false
-}:
-
-let
-  inherit (darwin.apple_sdk.frameworks) AGL Cocoa;
-in
-stdenv.mkDerivation rec {
-  pname = "ogre";
-  version = "1.10.11";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/sinbad/ogre/get/v${lib.replaceStrings ["."] ["-"] version}.tar.gz";
-    sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a";
-  };
-
-  patches = [
-    # aarch64-darwin support
-    (fetchpatch {
-      url = "https://github.com/OGRECave/ogre/commit/bd5fbe3482c56e58c6c3b3bf439b1eab8c1be258.patch";
-      includes = [ "OgreMain/include/OgrePlatform*.h" ];
-      sha256 = "sha256-ELeCklQkltz7DeDaGl78Jk1H3Wdfu8fMUiMZaJM4s/Y=";
-    })
-    (fetchpatch {
-      url = "https://github.com/OGRECave/ogre/commit/0873244cc06b613ca2afbcb5522fe9ef89f111c5.patch";
-      sha256 = "sha256-xGvlMB55B2rdthxNMIM5iFf9p/6zuE8bGL9P04qtweQ=";
-    })
-    # aarch64-linux support
-    (fetchpatch {
-      name = "fix-build-on-aarch64-linux.patch";
-      url = "https://github.com/OGRECave/ogre/commit/8ec086e9bc2e24fab373b514c572483b69071d69.patch";
-      sha256 = "sha256-22wlJPZ7lRIPAMqvpI/2YI0neQjGi1UXt8y5zNSpxCw=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    boost
-    freeimage
-    freetype
-    libpng
-    ois
-    zziplib
-  ] ++ lib.optionals stdenv.isLinux [
-    freeglut
-    libGL
-    libGLU
-    libICE
-    libSM
-    libX11
-    libXaw
-    libXmu
-    libXrandr
-    libXrender
-    libXt
-    libXxf86vm
-    xorgproto
-  ] ++ lib.optionals stdenv.isDarwin [
-    AGL
-    Cocoa
-  ] ++ lib.optionals withNvidiaCg [
-    nvidia_cg_toolkit
-  ];
-
-  cmakeFlags = [
-    "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE"
-    "-DOGRE_BUILD_SAMPLES=${toString withSamples}"
-  ] ++ lib.optionals stdenv.isDarwin [
-    "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE"
-  ];
-
-  meta = {
-    description = "3D Object-Oriented Graphics Rendering Engine";
-    homepage = "https://www.ogre3d.org/";
-    maintainers = with lib.maintainers; [ raskin wegank ];
-    platforms = lib.platforms.unix;
-    license = lib.licenses.mit;
-  };
-}
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@ -27,72 +27,85 @@
 , libXxf86vm
 , xorgproto
  # darwin
-, Cocoa
+, darwin
  # optional
 , withNvidiaCg ? false
 , nvidia_cg_toolkit
 , withSamples ? false
 }:

-stdenv.mkDerivation rec {
-  pname = "ogre";
-  version = "13.6.4";
+let
+  common = { version, hash }: stdenv.mkDerivation {
+    pname = "ogre";
+    inherit version;

-  src = fetchFromGitHub {
-    owner = "OGRECave";
-    repo = "ogre";
-    rev = "v${version}";
-    hash = "sha256-MSBWCO0s46t+ExWDdmqi16OxmcQXnduhgFt6I4BG1g8=";
+    src = fetchFromGitHub {
+      owner = "OGRECave";
+      repo = "ogre";
+      rev = "v${version}";
+      inherit hash;
+    };
+
+    nativeBuildInputs = [
+      cmake
+      pkg-config
+      unzip
+    ];
+
+    buildInputs = [
+      SDL2
+      boost
+      freeimage
+      freetype
+      libpng
+      ois
+      pugixml
+      zziplib
+    ] ++ lib.optionals stdenv.isLinux [
+      freeglut
+      libGL
+      libGLU
+      libICE
+      libSM
+      libX11
+      libXaw
+      libXmu
+      libXrandr
+      libXrender
+      libXt
+      libXxf86vm
+      xorgproto
+    ] ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.Cocoa
+    ] ++ lib.optionals withNvidiaCg [
+      nvidia_cg_toolkit
+    ];
+
+    cmakeFlags = [
+      "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE"
+      "-DOGRE_BUILD_DEPENDENCIES=OFF"
+      "-DOGRE_BUILD_SAMPLES=${toString withSamples}"
+    ] ++ lib.optionals stdenv.isDarwin [
+      "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE"
+    ];
+
+    meta = {
+      description = "3D Object-Oriented Graphics Rendering Engine";
+      homepage = "https://www.ogre3d.org/";
+      maintainers = with lib.maintainers; [ raskin wegank ];
+      platforms = lib.platforms.unix;
+      license = lib.licenses.mit;
+    };
+  };
+in
+{
+  ogre_14 = common {
+    version = "14.0.1";
+    hash = "sha256-jtUm0jy0GsxkGlFdODGodPsuSaQgiE77BORnA6SFViU=";
  };

-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    unzip
-  ];
-
-  buildInputs = [
-    SDL2
-    boost
-    freeimage
-    freetype
-    libpng
-    ois
-    pugixml
-    zziplib
-  ] ++ lib.optionals stdenv.isLinux [
-    freeglut
-    libGL
-    libGLU
-    libICE
-    libSM
-    libX11
-    libXaw
-    libXmu
-    libXrandr
-    libXrender
-    libXt
-    libXxf86vm
-    xorgproto
-  ] ++ lib.optionals stdenv.isDarwin [
-    Cocoa
-  ] ++ lib.optionals withNvidiaCg [
-    nvidia_cg_toolkit
-  ];
-
-  cmakeFlags = [
-    "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE"
-    "-DOGRE_BUILD_DEPENDENCIES=OFF"
-    "-DOGRE_BUILD_SAMPLES=${toString withSamples}"
-  ] ++ lib.optionals stdenv.isDarwin [
-    "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE"
-  ];
-
-  meta = {
-    description = "3D Object-Oriented Graphics Rendering Engine";
-    homepage = "https://www.ogre3d.org/";
-    maintainers = with lib.maintainers; [ raskin wegank ];
-    platforms = lib.platforms.unix;
-    license = lib.licenses.mit;
+  ogre_13 = common {
+    version = "13.6.5";
+    hash = "sha256-8VQqePrvf/fleHijVIqWWfwOusGjVR40IIJ13o+HwaE=";
  };
 }
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@ -142,7 +142,19 @@ let
      # trying to build binaries statically.
      ++ lib.optional static "no-ct"
      ++ lib.optional withZlib "zlib"
-      ;
+      ++ lib.optionals (stdenv.hostPlatform.isMips && stdenv.hostPlatform ? gcc.arch) [
+      # This is necessary in order to avoid openssl adding -march
+      # flags which ultimately conflict with those added by
+      # cc-wrapper.  Openssl assumes that it can scan CFLAGS to
+      # detect any -march flags, using this perl code:
+      #
+      #   && !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})
+      #
+      # The following bogus CFLAGS environment variable triggers the
+      # the code above, inhibiting `./Configure` from adding the
+      # conflicting flags.
+      "CFLAGS=-march=${stdenv.hostPlatform.gcc.arch}"
+    ];

    makeFlags = [
      "MANDIR=$(man)/share/man"
--- a/pkgs/development/libraries/tracker/default.nix
+++ b/pkgs/development/libraries/tracker/default.nix
@ -4,6 +4,7 @@
 , fetchpatch
 , gettext
 , meson
+, mesonEmulatorHook
 , ninja
 , pkg-config
 , asciidoc
@ -71,6 +72,8 @@ stdenv.mkDerivation rec {
  ] ++ lib.optionals withIntrospection [
    gobject-introspection
    vala
+  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
  ];

  buildInputs = [
--- a/pkgs/development/ocaml-modules/ptime/default.nix
+++ b/pkgs/development/ocaml-modules/ptime/default.nix
@ -1,28 +1,40 @@
-{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg
+{ stdenv
+, lib
+, fetchurl
+, ocaml
+, findlib
+, ocamlbuild
+, topkg
 }:

-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
-  "ptime is not available for OCaml ${ocaml.version}"
-
-stdenv.mkDerivation rec {
-  version = "1.0.0";
+stdenv.mkDerivation (finalAttrs: {
+  version = "1.1.0";
  pname = "ocaml${ocaml.version}-ptime";

  src = fetchurl {
-    url = "https://erratique.ch/software/ptime/releases/ptime-${version}.tbz";
-    sha256 = "sha256-RByDjAFiyDdR8G663/MxabuSHTTuwVn7urtw7Z3iEQs=";
+    url = "https://erratique.ch/software/ptime/releases/ptime-${finalAttrs.version}.tbz";
+    hash = "sha256-y/WxVFT7JxBeLDNAI+HhHY+TnXF4hw9cvo7SbfcBPrE=";
  };

-  nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
-  buildInputs = [ topkg ];
+  nativeBuildInputs = [
+    findlib
+    ocaml
+    ocamlbuild
+    topkg
+  ];
+
+  buildInputs = [
+    topkg
+  ];

  strictDeps = true;

  inherit (topkg) buildPhase installPhase;

  meta = {
-    homepage = "https://erratique.ch/software/ptime";
    description = "POSIX time for OCaml";
+    homepage = "https://erratique.ch/software/ptime";
+    license = lib.licenses.isc;
    longDescription = ''
      Ptime has platform independent POSIX time support in pure OCaml.
      It provides a type to represent a well-defined range of POSIX timestamps
@ -35,7 +47,6 @@ stdenv.mkDerivation rec {

      Ptime is not a calendar library.
    '';
-    license = lib.licenses.isc;
    maintainers = with lib.maintainers; [ sternenseemann ];
  };
-}
+})
--- a/pkgs/development/ocaml-modules/rfc7748/default.nix
+++ b/pkgs/development/ocaml-modules/rfc7748/default.nix
@ -1,6 +1,7 @@
 { lib
 , buildDunePackage
 , fetchFromGitHub
+, fetchpatch
 , ocaml

 , ounit
@ -18,6 +19,12 @@ buildDunePackage rec {
    sha256 = "sha256-mgZooyfxrKBVQFn01B8PULmFUW9Zq5HJfgHCSJSkJo4=";
  };

+  # Compatibility with OCaml 5.0
+  patches = fetchpatch {
+    url = "https://github.com/burgerdev/ocaml-rfc7748/commit/f66257bae0317c7b24c4b208ee27ab6eb68460e4.patch";
+    hash = "sha256-780yy8gLOwwf7xIKIIIaoGpDPcY7+dZ0jPS4nrkH2s8=";
+  };
+
  minimalOCamlVersion = "4.05";

  propagatedBuildInputs = [ zarith ];
--- a/pkgs/development/ocaml-modules/sosa/default.nix
+++ b/pkgs/development/ocaml-modules/sosa/default.nix
@ -2,9 +2,8 @@
 , findlib, ocaml, ocamlbuild
 }:

-if lib.versionOlder ocaml.version "4.02"
-then throw "sosa is not available for OCaml ${ocaml.version}"
-else
+lib.throwIf (lib.versionOlder ocaml.version "4.02")
+  "sosa is not available for OCaml ${ocaml.version}"

 stdenv.mkDerivation rec {
  pname = "ocaml${ocaml.version}-sosa";
@ -17,6 +16,13 @@ stdenv.mkDerivation rec {
    sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk";
  };

+  postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "4.07") ''
+    for p in functors list_of of_mutable
+    do
+      substituteInPlace src/lib/$p.ml --replace Pervasives. Stdlib.
+    done
+  '';
+
  nativeBuildInputs = [ ocaml ocamlbuild findlib ];

  strictDeps = true;
--- a/pkgs/development/ocaml-modules/xenstore-tool/default.nix
+++ b/pkgs/development/ocaml-modules/xenstore-tool/default.nix
@ -1,13 +1,15 @@
-{ buildDunePackage, xenstore_transport, xenstore, lwt }:
+{ buildDunePackage, camlp-streams, xenstore_transport, xenstore, lwt }:

 buildDunePackage {
  pname = "xenstore-tool";

  inherit (xenstore_transport) src version;

-  duneVersion = "3";
+  postPatch = ''
+    substituteInPlace cli/dune --replace 'libraries ' 'libraries camlp-streams '
+  '';

-  buildInputs = [ xenstore_transport xenstore lwt ];
+  buildInputs = [ camlp-streams xenstore_transport xenstore lwt ];

  meta = xenstore_transport.meta // {
    description = "Command line tool for interfacing with xenstore";
--- a/pkgs/development/python-modules/aiopvpc/default.nix
+++ b/pkgs/development/python-modules/aiopvpc/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "aiopvpc";
-  version = "4.2.1";
+  version = "4.2.2";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "azogue";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-gfF/SFfiZgkWH0cQZF3hxEp6xxRi46nfDBB23Gerv5g=";
+    hash = "sha256-k02lNjFjOcMfHa1jLJlMFUOOVrdTrACNoEXDSZ693K8=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/coredis/default.nix
+++ b/pkgs/development/python-modules/coredis/default.nix
@ -0,0 +1,59 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, async-timeout
+, deprecated
+, pympler
+, wrapt
+, pytestCheckHook
+, redis
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "coredis";
+  version = "4.14.0";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "alisaifee";
+    repo = pname;
+    rev = version;
+    hash = "sha256-pHCQ5dePk2VhYNf/Ka+sovIn2OAVYHnLQhPFVjKmgb4=";
+  };
+
+  postPatch = ''
+    substituteInPlace pytest.ini --replace "-K" ""
+  '';
+
+  propagatedBuildInputs = [
+    async-timeout
+    deprecated
+    pympler
+    wrapt
+  ];
+
+  pythonImportsCheck = [ "coredis" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    redis
+    pytest-asyncio
+  ];
+
+  # all other tests require docker
+  pytestFlagsArray = [
+    "tests/test_lru_cache.py"
+    "tests/test_parsers.py"
+    "tests/test_retry.py"
+    "tests/test_utils.py"
+  ];
+
+  meta = with lib; {
+    changelog = "https://github.com/alisaifee/coredis/blob/${src.rev}/HISTORY.rst";
+    homepage = "https://github.com/alisaifee/coredis";
+    description = "An async redis client with support for redis server, cluster & sentinel";
+    license = licenses.mit;
+    maintainers = with maintainers; [ netali ];
+  };
+}
--- a/pkgs/development/python-modules/mwdblib/default.nix
+++ b/pkgs/development/python-modules/mwdblib/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "mwdblib";
-  version = "4.4.0";
+  version = "4.5.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "CERT-Polska";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-WwSKWfnSDJT8kIAk4e8caeL2UztFaIpNCDy1j46IbzM=";
+    hash = "sha256-+hh7SJFITpLumIuzNgBbXtFh+26tUG66UFv6DLDk5ag=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "mypy-boto3-s3";
-  version = "1.28.12";
+  version = "1.28.15.post1";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-fVSwPgvXLMH+aQ79zp7qyeKFXfuvoVOQoPUYyunigNI=";
+    hash = "sha256-ZVAr6CV4n9FuTKzxCuzWQIVUtgrl0mG+YP1GvuadhZI=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pipdeptree/default.nix
+++ b/pkgs/development/python-modules/pipdeptree/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "pipdeptree";
-  version = "2.10.2";
+  version = "2.12.0";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "tox-dev";
    repo = "pipdeptree";
    rev = "refs/tags/${version}";
-    hash = "sha256-W7aCSekm6vZSlEAgwgrwmUBV2/jCiBol7JyNMYUVpPY=";
+    hash = "sha256-4qRMET04JLVuDRfQtv/uQquf76iU00rnsWNaUXj1Gfw=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/py-radix-sr/default.nix
+++ b/pkgs/development/python-modules/py-radix-sr/default.nix
@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "py-radix-sr";
+  version = "1.0.1";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "SEKOIA-IO";
+    repo = "py-radix";
+    rev = "v${version}";
+    hash = "sha256-aHV+NvPR4Gyk6bEpCftgBylis9rU7BWLpBMatjP4QmE=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "name='py-radix'" "name='py-radix-sr'"
+  '';
+
+  pythonImportsCheck = [ "radix" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = with lib; {
+    description = "Python radix tree for IPv4 and IPv6 prefix matching";
+    homepage = "https://github.com/SEKOIA-IO/py-radix";
+    license = with licenses; [ isc bsdOriginal ];
+    maintainers = with maintainers; [ netali ];
+  };
+}
--- a/pkgs/development/python-modules/pyemd/default.nix
+++ b/pkgs/development/python-modules/pyemd/default.nix
@ -1,16 +1,40 @@
-{ lib, buildPythonPackage, fetchPypi, numpy, cython }:
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, cython
+, packaging
+, setuptools
+, numpy
+, pytestCheckHook
+}:

 buildPythonPackage rec {
  pname = "pyemd";
-  version = "0.5.1";
+  version = "1.0.0";
+
+  disabled = pythonOlder "3.7";
+
+  format = "pyproject";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "fc81c2116f8573e559dfbb8d73e03d9f73c22d0770559f406516984302e07e70";
+    hash = "sha256-tCta57LRWx1N7mOBDqeYo5IX6Kdre0nA62OoTg/ZAP4=";
  };

-  propagatedBuildInputs = [ numpy ];
-  buildInputs = [ cython ];
+  nativeBuildInputs = [
+    cython
+    packaging
+    setuptools
+  ];
+
+  propagatedBuildInputs = [
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];

  meta = with lib; {
    description = "A Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance";
--- a/pkgs/development/python-modules/pyvista/default.nix
+++ b/pkgs/development/python-modules/pyvista/default.nix
@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "pyvista";
-  version = "0.40.1";
+  version = "0.41.1";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-nGLguMbenfKONcY1W5S+BZ6zHmnW/Sivs2/NpDqrEck=";
+    hash = "sha256-vFxEMKEkiFOBrkvmaJPwoo+lOe6V9AmPxl32Tocy9p8=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@ -448,7 +448,7 @@ let
      license = licenses.asl20;
      maintainers = with maintainers; [ abbradar ];
      platforms = with platforms; linux ++ darwin;
-      broken = !(xlaSupport -> cudaSupport);
+      broken = !(xlaSupport -> cudaSupport) || python.pythonVersion == "3.11";
    } // lib.optionalAttrs stdenv.isDarwin {
      timeout = 86400; # 24 hours
      maxSilent = 14400; # 4h, double the default of 7200s
--- a/pkgs/development/python-modules/tpm2-pytss/default.nix
+++ b/pkgs/development/python-modules/tpm2-pytss/default.nix
@ -6,7 +6,6 @@
 , asn1crypto
 , cffi
 , cryptography
-, ibm-sw-tpm2
 , pkgconfig # see nativeBuildInputs
 , pkg-config # see nativeBuildInputs
 , pycparser
@ -15,6 +14,8 @@
 , pyyaml
 , setuptools-scm
 , tpm2-tss
+, tpm2-tools
+, swtpm
 }:

 buildPythonPackage rec {
@ -40,8 +41,22 @@ buildPythonPackage rec {
      url = "https://github.com/baloo/tpm2-pytss/commit/099c069f28cfcd0a3019adebfeafa976f9395221.patch";
      sha256 = "sha256-wU2WfLYFDmkhGzYornZ386tB3zb3GYfGOTc+/QOFb1o=";
    })
+
+    # Lookup tcti via getinfo not system's ld_library_path
+    # https://github.com/tpm2-software/tpm2-pytss/pull/525
+    (fetchpatch {
+      url = "https://github.com/tpm2-software/tpm2-pytss/commit/97289a08ddf44f7bdccdd122d6055c69e12dc584.patch";
+      sha256 = "sha256-VFq3Hv4I8U8ifP/aSjyu0BiW/4jfPlRDKqRcqUGw6UQ=";
+    })
+
+    # Fix hardcoded `fapi-config.json` configuration path
+    ./fapi-config.patch
  ];

+  postPatch = ''
+    sed -i "s#@TPM2_TSS@#${tpm2-tss.out}#" src/tpm2_pytss/FAPI.py
+  '';
+
  nativeBuildInputs = [
    cffi
    pkgconfig # this is the Python module
@ -60,12 +75,12 @@ buildPythonPackage rec {
    pyyaml
  ];

-  # https://github.com/tpm2-software/tpm2-pytss/issues/341
-  doCheck = false;
+  doCheck = true;

  nativeCheckInputs = [
-    ibm-sw-tpm2
    pytestCheckHook
+    tpm2-tools
+    swtpm
  ];

  pythonImportsCheck = [
--- a/pkgs/development/python-modules/tpm2-pytss/fapi-config.patch
+++ b/pkgs/development/python-modules/tpm2-pytss/fapi-config.patch
@ -0,0 +1,12 @@
+diff --git a/src/tpm2_pytss/FAPI.py b/src/tpm2_pytss/FAPI.py
+index 916eda6..1afba3f 100644
+--- a/src/tpm2_pytss/FAPI.py
+++ b/src/tpm2_pytss/FAPI.py
+@@ -23,6 +23,7 @@ logger = logging.getLogger(__name__)
+ 
+ FAPI_CONFIG_ENV = "TSS2_FAPICONF"
+ FAPI_CONFIG_PATHS = [
+    "@TPM2_TSS@/etc/tpm2-tss/fapi-config.json",
+     "/etc/tpm2-tss/fapi-config.json",
+     "/usr/local/etc/tpm2-tss/fapi-config.json",
+ ]
--- a/pkgs/development/python-modules/ttstokenizer/default.nix
+++ b/pkgs/development/python-modules/ttstokenizer/default.nix
@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, anyascii
+, inflect
+, nltk
+, numpy
+}:
+
+buildPythonPackage rec {
+  pname = "ttstokenizer";
+  version = "1.0.0";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-HtDXDKlZ3jpwIgb5DvaqurEkRe8TRJ2xqKl2IKElnKU=";
+  };
+
+  propagatedBuildInputs = [
+    anyascii
+    inflect
+    nltk
+    numpy
+  ];
+
+  pythonImportsCheck = [ "ttstokenizer" ];
+
+  # no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Tokenizer for Text to Speech (TTS) models";
+    homepage = "https://pypi.org/project/ttstokenizer";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ happysalada ];
+  };
+}
--- a/pkgs/development/tools/build-managers/apache-maven/build-package.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/build-package.nix
@ -16,7 +16,7 @@
 # originally extracted from dbeaver
 # created to allow using maven packages in the same style as rust

-stdenv.mkDerivation (rec {
+let
  fetchedMavenDeps = stdenv.mkDerivation ({
    name = "${pname}-${version}-maven-deps";
    inherit src patches;
@ -44,6 +44,13 @@ stdenv.mkDerivation (rec {
    outputHashMode = "recursive";
    outputHash = mvnHash;
  } // mvnFetchExtraArgs);
+in
+stdenv.mkDerivation (builtins.removeAttrs args [ "mvnFetchExtraArgs" ] // {
+  inherit fetchedMavenDeps;
+
+  nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
+    maven
+  ];

  buildPhase = ''
    runHook preBuild
@ -53,4 +60,8 @@ stdenv.mkDerivation (rec {

    runHook postBuild
  '';
-} // builtins.removeAttrs args [ "mvnFetchExtraArgs" ])
+
+  meta = args.meta or { } // {
+    platforms = args.meta.platforms or maven.meta.platforms;
+  };
+})
--- a/pkgs/development/tools/database/schemaspy/default.nix
+++ b/pkgs/development/tools/database/schemaspy/default.nix
@ -33,7 +33,6 @@ maven.buildMavenPackage rec {
  nativeBuildInputs = [
    makeWrapper
    git
-    maven

    # springframework boot gets angry about 1970 sources
    # fix from https://github.com/nix-community/mavenix/issues/25
--- a/pkgs/development/tools/espup/default.nix
+++ b/pkgs/development/tools/espup/default.nix
@ -0,0 +1,82 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, installShellFiles
+, bzip2
+, openssl
+, xz
+, zstd
+, stdenv
+, darwin
+, runCommand
+, espup
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "espup";
+  version = "0.4.1";
+
+  src = fetchFromGitHub {
+    owner = "esp-rs";
+    repo = "espup";
+    rev = "v${version}";
+    hash = "sha256-gzM+RT4Rt+LaYk7CwYUTIMci8DDI0y3+7y+N2yKRDOc=";
+  };
+
+  cargoHash = "sha256-GYhF6VDBAieZbu4x9EiQVVJkmx0aRYK0xwGGP0nuVGc=";
+
+  nativeBuildInputs = [
+    pkg-config
+    installShellFiles
+  ];
+
+  buildInputs = [
+    bzip2
+    openssl
+    xz
+    zstd
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.CoreFoundation
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  env = {
+    OPENSSL_NO_VENDOR = true;
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+  };
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  checkFlags = [
+    # makes network calls
+    "--skip=toolchain::rust::tests::test_xtensa_rust_parse_version"
+  ];
+
+  postInstall = ''
+    installShellCompletion --cmd espup \
+      --bash <($out/bin/espup completions bash) \
+      --fish <($out/bin/espup completions fish) \
+      --zsh <($out/bin/espup completions zsh)
+  '';
+
+  passthru.tests = {
+    simple = runCommand "${pname}-test" { } ''
+      if [[ `${espup}/bin/espup --version` != *"${version}"*  ]]; then
+        echo "Error: program version does not match package version"
+        exit 1
+      fi
+
+      touch $out
+    '';
+  };
+
+  meta = with lib; {
+    description = "Tool for installing and maintaining Espressif Rust ecosystem.";
+    homepage = "https://github.com/esp-rs/espup/";
+    license = with licenses; [ mit asl20 ];
+    maintainers = with maintainers; [ knightpp ];
+  };
+}
--- a/pkgs/development/tools/global-platform-pro/default.nix
+++ b/pkgs/development/tools/global-platform-pro/default.nix
@ -17,9 +17,9 @@ mavenJdk8.buildMavenPackage rec {
    sha256 = "1vws6cbgm3mrwc2xz9j1y262vw21x3hjc9m7rqc4hn3m7gjpwsvg";
  };

-  mvnHash = "sha256-rRLsCTY3fEAvGRDvNXqpjac2Gb5fdlyhK2wTK5CVN9k=";
+  mvnHash = "sha256-xFcEZpJ0+ApJTDTuA63LgvUwLrxATVKoj5Mh3WZyfq8=";

-  nativeBuildInputs = [ jdk8 mavenJdk8 makeWrapper ];
+  nativeBuildInputs = [ jdk8 makeWrapper ];

  installPhase = ''
    mkdir -p "$out/lib/java" "$out/share/java"
@ -41,11 +41,10 @@ mavenJdk8.buildMavenPackage rec {
    homepage = "https://github.com/martinpaljak/GlobalPlatformPro";
    sourceProvenance = with sourceTypes; [
      fromSource
-      binaryBytecode  # deps
+      binaryBytecode # deps
    ];
    license = with licenses; [ lgpl3 ];
    maintainers = with maintainers; [ ekleog ];
    mainProgram = "gp";
-    platforms = platforms.all;
  };
 }
--- a/pkgs/development/tools/go-task/default.nix
+++ b/pkgs/development/tools/go-task/default.nix
@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "go-task";
-  version = "3.27.1";
+  version = "3.28.0";

  src = fetchFromGitHub {
    owner = pname;
    repo = "task";
    rev = "refs/tags/v${version}";
-    hash = "sha256-MwZtdxoWo5yeJKzbMIfigt0WUjZ52B8MeRsx43D8n1k=";
+    hash = "sha256-jVRQnZGM+N3W/f4mW322qPiv7PFrFoyUHNdZNoAkpAc=";
  };

-  vendorHash = "sha256-05+/NbLks9Dp9Z7KscK9yeEzFJug7VFBqViievX6UOs=";
+  vendorHash = "sha256-gXWuKOTb/7AIF6orXlIHpdSxdYxl12Es2cl4egdJfxo=";

  doCheck = false;

--- a/pkgs/development/tools/java/java-language-server/default.nix
+++ b/pkgs/development/tools/java/java-language-server/default.nix
@ -24,9 +24,9 @@ maven.buildMavenPackage rec {

  mvnFetchExtraArgs.dontConfigure = true;
  mvnParameters = "-DskipTests";
-  mvnHash = "sha256-bzYBSrCS9Kp+qnVO60h915Or1VWabphwLEu6lcBULuc=";
+  mvnHash = "sha256-XhAqd67RtETd9XvqbiEuTOwPUsUtoLkhXy2Dde7NLTo=";

-  nativeBuildInputs = [ maven jdk makeWrapper ];
+  nativeBuildInputs = [ jdk makeWrapper ];

  dontConfigure = true;
  preBuild = ''
@ -56,6 +56,5 @@ maven.buildMavenPackage rec {
    homepage = "https://github.com/georgewfraser/java-language-server";
    license = licenses.mit;
    maintainers = with maintainers; [ hqurve ];
-    platforms = platforms.all;
  };
 }
--- a/pkgs/development/tools/language-servers/gopls/default.nix
+++ b/pkgs/development/tools/language-servers/gopls/default.nix
@ -2,17 +2,17 @@

 buildGoModule rec {
  pname = "gopls";
-  version = "0.12.4";
+  version = "0.13.0";

  src = fetchFromGitHub {
    owner = "golang";
    repo = "tools";
    rev = "gopls/v${version}";
-    sha256 = "sha256-OieIbWgc5l7HS6otkRxsKYQmNIjPbADQ+C3A6qJr2h0=";
+    sha256 = "sha256-E/QX3J/ux7GAG93b1K7OdDjYBAzte2HMa6bfALtXgcU=";
  };

  modRoot = "gopls";
-  vendorSha256 = "sha256-0Svz0VFmNW/f8Po+DpIQi0bJB1ICLcSJM1sG/Nju+ZY=";
+  vendorSha256 = "sha256-e83y8bu0xKGEg7o2BWt4CzM2YosLDefFRgTfA0f3ZmI=";

  doCheck = false;

--- a/pkgs/development/tools/misc/grcov/default.nix
+++ b/pkgs/development/tools/misc/grcov/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "grcov";
-  version = "0.8.18";
+  version = "0.8.19";

  src = fetchFromGitHub {
    owner = "mozilla";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-IC5ROi4kwZLCX7/kFb7VgOzQtsj74hujQ5IrrFneFTA=";
+    sha256 = "sha256-1t+hzB9sSApLScCkjBnLk9i2dsoEwZmWCFukEOvHhZI=";
  };

-  cargoHash = "sha256-DcPidu3WFyVWBS4EVavxFhy9wwqP4rGmaALKnfxua2E=";
+  cargoHash = "sha256-4KzFbfUqnGmle2fwSaHMPIJHQFDq8H2Qzm4FdYdqpuM=";

  # tests do not find grcov path correctly
  checkFlags = let
--- a/pkgs/development/tools/ocaml/dune/3.nix
+++ b/pkgs/development/tools/ocaml/dune/3.nix
@ -6,11 +6,11 @@ else

 stdenv.mkDerivation rec {
  pname = "dune";
-  version = "3.9.2";
+  version = "3.10.0";

  src = fetchurl {
    url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
-    hash = "sha256-TzrL1F09zbu9qJE3L0PwVpQra5btl37FKBupqHUTSt8=";
+    hash = "sha256-n/AzhKmKjfeYUsxnTwtHOLqK7BcCm24u61FPiV5xA1U=";
  };

  nativeBuildInputs = [ ocaml findlib ];
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@ -18,7 +18,7 @@ let
  availableBinaries = {
    x86_64-linux = {
      platform = "linux-x64";
-      checksum = "sha256-wzdtFHsSzXl8TCtTBVAwwsvzUd4DakCAPRVHtwoGLB0=";
+      checksum = "sha256-QL1Kca1yM1P4Tn+Citw4UG6wPX/ji6oBjCONE4tyNPQ=";
    };
    aarch64-linux = {
      platform = "linux-arm64";
@ -30,7 +30,7 @@ let
  inherit (binary) platform checksum;
 in stdenv.mkDerivation rec {
  pname = "cypress";
-  version = "12.17.1";
+  version = "12.17.2";

  src = fetchzip {
    url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip";
--- a/pkgs/development/web/minify/default.nix
+++ b/pkgs/development/web/minify/default.nix
@ -9,18 +9,16 @@

 buildGoModule rec {
  pname = "minify";
-  version = "2.12.7";
+  version = "2.12.8";

  src = fetchFromGitHub {
    owner = "tdewolff";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-V3lFM58ciU9RrIp5s+ZMaCUAfRJxbTuQxusXhLCiGmI=";
+    hash = "sha256-5p1HWXx9kKKaiC0dTQDd1JpRDhKkDGdnDpuz+I0kgpo=";
  };

-  patches = [ ./update-go-version-mod.patch ];
-
-  vendorHash = "sha256-v3ZPaeE1YW9BRXHxGsmN8tHv3ApOY+NivfePctOmYlM=";
+  vendorHash = "sha256-RBBCcqahIF1KjnK/Kxr0TZlRJirFffo9Dt40gNk5EQE=";

  nativeBuildInputs = [ installShellFiles ];

@ -47,5 +45,6 @@ buildGoModule rec {
    downloadPage = "https://github.com/tdewolff/minify";
    changelog = "https://github.com/tdewolff/minify/releases/tag/v${version}";
    license = licenses.mit;
+    maintainers = with maintainers; [ gaelreyrol ];
  };
 }
--- a/pkgs/development/web/minify/update-go-version-mod.patch
+++ b/pkgs/development/web/minify/update-go-version-mod.patch
@ -1,12 +0,0 @@
-diff --git a/go.mod b/go.mod
-index cebe363..f9ae9c8 100644
--- a/go.mod
-+++ b/go.mod
-@@ -1,6 +1,6 @@
- module github.com/tdewolff/minify/v2
- 
-go 1.13
-+go 1.18
- 
- require (
- 	github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 // indirect
--- a/pkgs/games/aaaaxy/default.nix
+++ b/pkgs/games/aaaaxy/default.nix
@ -19,17 +19,17 @@

 buildGoModule rec {
  pname = "aaaaxy";
-  version = "1.4.33";
+  version = "1.4.39";

  src = fetchFromGitHub {
    owner = "divVerent";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-PE5TYzfO2/3DehCVmo9mNNXgghnNR02frqRe6I0EfFY=";
+    hash = "sha256-eawsTvPJwWKDSZd/2XBneitoydSRxEAU5RAPZgE6NSo=";
    fetchSubmodules = true;
  };

-  vendorHash = "sha256-qnn+2aUpYQYg31p+rAHTGHgrwfEHRtZECOg9oIERrrc=";
+  vendorHash = "sha256-uHTYp8PBXdQ2w+kjxLVvUOzOvDfXF53lcBriK8sif7A=";

  buildInputs = [
    alsa-lib
--- a/pkgs/games/ferium/default.nix
+++ b/pkgs/games/ferium/default.nix
@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec {
    description = "Fast and multi-source CLI program for managing Minecraft mods and modpacks from Modrinth, CurseForge, and GitHub Releases";
    homepage = "https://github.com/gorilla-devs/ferium";
    license = licenses.mpl20;
-    maintainers = with maintainers; [ leo60228 imsofi ];
+    maintainers = with maintainers; [ leo60228 soupglasses ];
  };
 }
--- a/pkgs/games/forge-mtg/default.nix
+++ b/pkgs/games/forge-mtg/default.nix
@ -29,7 +29,7 @@ maven.buildMavenPackage {
  mvnParameters = "-DskipTests";
  mvnHash = "sha256-ajrHnaiJS7ZnR9BjLaXK2bnAKCp5UWQqYpjWbz3z6bw=";

-  nativeBuildInputs = [ maven makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];

  installPhase = ''
    runHook preInstall
@ -59,7 +59,6 @@ maven.buildMavenPackage {
  meta = with lib; {
    description = "Magic: the Gathering card game with rules enforcement";
    homepage = "https://www.slightlymagic.net/forum/viewforum.php?f=26";
-    platforms = openjdk.meta.platforms;
    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ eigengrau ];
  };
--- a/pkgs/games/gnubg/default.nix
+++ b/pkgs/games/gnubg/default.nix
@ -1,15 +1,16 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, python2, gtk2, readline }:
+{ lib, stdenv, fetchurl, pkg-config, glib, python3, gtk2, readline,
+  copyDesktopItems, makeDesktopItem }:

 stdenv.mkDerivation rec {
  pname = "gnubg";
-  version = "1.06.002";
+  version = "1.07.001";

  src = fetchurl {
-    url = "http://gnubg.org/media/sources/gnubg-release-${version}-sources.tar.gz";
-    sha256 = "11xwhcli1h12k6rnhhyq4jphzrhfik7i8ah3k32pqw803460n6yf";
+    url = "mirror://gnu/gnubg/gnubg-release-${version}-sources.tar.gz";
+    hash = "sha256-cjmXKUGcrZ8RLDBmoS0AANpFCkVq3XsJTYkVUGnWgh4=";
  };

-  nativeBuildInputs = [ pkg-config python2 glib ];
+  nativeBuildInputs = [ copyDesktopItems pkg-config python3 glib ];

  buildInputs = [ gtk2 readline ];

@ -17,9 +18,19 @@ stdenv.mkDerivation rec {

  configureFlags = [ "--with-gtk" "--with--board3d" ];

+  desktopItems = makeDesktopItem {
+    desktopName = "GNU Backgammon";
+    name = pname;
+    genericName = "Backgammon";
+    comment = meta.description;
+    exec = pname;
+    icon = pname;
+    categories = [ "Game" "GTK" "StrategyGame" ];
+  };
+
  meta = with lib;
    { description = "World class backgammon application";
-      homepage = "http://www.gnubg.org/";
+      homepage = "https://www.gnu.org/software/gnubg/";
      license = licenses.gpl3;
      maintainers = [ maintainers.ehmry ];
      platforms = platforms.linux;
--- a/Show More
+++ b/Show More