Merge master into staging-next

2023-05-30 18:01:10 +00:00 · 2023-05-30 18:01:10 +00:00 · 15b82046fb
commit 15b82046fb
parent 8ca315db3e 592d4ee6e7
34 changed files with 925 additions and 336 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -5253,6 +5253,12 @@
    githubId = 2489598;
    name = "Felix Breidenstein";
  };
+  flemzord = {
+    email = "maxence@maireaux.fr";
+    github = "flemzord";
+    githubId = 1952914;
+    name = "Maxence Maireaux";
+  };
  flexagoon = {
    email = "flexagoon@pm.me";
    github = "flexagoon";
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@ -97,6 +97,8 @@ In addition to numerous new and updated packages, this release has the following

 - [ivpn](https://www.ivpn.net/), a secure, private VPN with fast WireGuard connections. Available as [services.ivpn](#opt-services.ivpn.enable).

+- [vmalert](https://victoriametrics.com/), an alerting engine for VictoriaMetrics. Available as [services.vmalert](#opt-services.vmalert.enable).
+
 - [jellyseerr](https://github.com/Fallenbagel/jellyseerr), a web-based requests manager for Jellyfin, forked from Overseerr. Available as [services.jellyseerr](#opt-services.jellyseerr.enable).

 - [kavita](https://kavitareader.com), a self-hosted digital library. Available as [services.kavita](options.html#opt-services.kavita.enable).
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -777,6 +777,7 @@
  ./services/monitoring/uptime-kuma.nix
  ./services/monitoring/uptime.nix
  ./services/monitoring/vmagent.nix
+  ./services/monitoring/vmalert.nix
  ./services/monitoring/vnstat.nix
  ./services/monitoring/zabbix-agent.nix
  ./services/monitoring/zabbix-proxy.nix
--- a/nixos/modules/services/monitoring/vmalert.nix
+++ b/nixos/modules/services/monitoring/vmalert.nix
@ -0,0 +1,136 @@
+{ config, pkgs, lib, ... }: with lib;
+let
+  cfg = config.services.vmalert;
+
+  format = pkgs.formats.yaml {};
+
+  confOpts = concatStringsSep " \\\n" (mapAttrsToList mkLine (filterAttrs (_: v: v != false) cfg.settings));
+  confType = with types;
+    let
+      valueType = oneOf [ bool int path str ];
+    in
+    attrsOf (either valueType (listOf valueType));
+
+  mkLine = key: value:
+    if value == true then "-${key}"
+    else if isList value then concatMapStringsSep " " (v: "-${key}=${escapeShellArg (toString v)}") value
+    else "-${key}=${escapeShellArg (toString value)}"
+  ;
+in
+{
+  # interface
+  options.services.vmalert = {
+    enable = mkEnableOption (mdDoc "vmalert");
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.victoriametrics;
+      defaultText = "pkgs.victoriametrics";
+      description = mdDoc ''
+        The VictoriaMetrics derivation to use.
+      '';
+    };
+
+    settings = mkOption {
+      type = types.submodule {
+        freeformType = confType;
+        options = {
+
+          "datasource.url" = mkOption {
+            type = types.nonEmptyStr;
+            example = "http://localhost:8428";
+            description = mdDoc ''
+              Datasource compatible with Prometheus HTTP API.
+            '';
+          };
+
+          "notifier.url" = mkOption {
+            type = with types; listOf nonEmptyStr;
+            default = [];
+            example = [ "http://127.0.0.1:9093" ];
+            description = mdDoc ''
+              Prometheus Alertmanager URL. List all Alertmanager URLs if it runs in the cluster mode to ensure high availability.
+            '';
+          };
+
+          "rule" = mkOption {
+            type = with types; listOf path;
+            description = mdDoc ''
+              Path to the files with alerting and/or recording rules.
+
+              ::: {.note}
+              Consider using the {option}`services.vmalert.rules` option as a convenient alternative for declaring rules
+              directly in the `nix` language.
+              :::
+            '';
+          };
+
+        };
+      };
+      default = { };
+      example = {
+        "datasource.url" = "http://localhost:8428";
+        "datasource.disableKeepAlive" = true;
+        "datasource.showURL" = false;
+        "rule" = [
+          "http://<some-server-addr>/path/to/rules"
+          "dir/*.yaml"
+        ];
+      };
+      description = mdDoc ''
+        `vmalert` configuration, passed via command line flags. Refer to
+        <https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/app/vmalert/README.md#configuration>
+        for details on supported values.
+      '';
+    };
+
+    rules = mkOption {
+      type = format.type;
+      default = {};
+      example = {
+        group = [
+          { name = "TestGroup";
+            rules = [
+              { alert = "ExampleAlertAlwaysFiring";
+                expr = ''
+                  sum by(job)
+                  (up == 1)
+                '';
+              }
+            ];
+          }
+        ];
+      };
+      description = mdDoc ''
+        A list of the given alerting or recording rules against configured `"datasource.url"` compatible with
+        Prometheus HTTP API for `vmalert` to execute. Refer to
+        <https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/app/vmalert/README.md#rules>
+        for details on supported values.
+      '';
+    };
+  };
+
+  # implementation
+  config = mkIf cfg.enable {
+
+    environment.etc."vmalert/rules.yml".source = format.generate "rules.yml" cfg.rules;
+
+    services.vmalert.settings.rule = [
+      "/etc/vmalert/rules.yml"
+    ];
+
+    systemd.services.vmalert = {
+      description = "vmalert service";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      reloadTriggers = [ config.environment.etc."vmalert/rules.yml".source ];
+
+      serviceConfig = {
+        DynamicUser = true;
+        Restart = "on-failure";
+        ExecStart = "${cfg.package}/bin/vmalert ${confOpts}";
+        ExecReload = ''${pkgs.coreutils}/bin/kill -SIGHUP "$MAINPID"'';
+      };
+    };
+  };
+}
--- a/pkgs/applications/finance/denaro/default.nix
+++ b/pkgs/applications/finance/denaro/default.nix
@ -2,7 +2,6 @@
 , stdenvNoCC
 , buildDotnetModule
 , fetchFromGitHub
-, fetchpatch
 , dotnetCorePackages
 , gtk4
 , libadwaita
@ -10,20 +9,19 @@
 , wrapGAppsHook4
 , glib
 , shared-mime-info
-, python3
-, desktop-file-utils
 , gdk-pixbuf
+, blueprint-compiler
 }:

 buildDotnetModule rec {
  pname = "denaro";
-  version = "2023.2.2";
+  version = "2023.5.0";

  src = fetchFromGitHub {
-    owner = "nlogozzo";
-    repo = "NickvisionMoney";
+    owner = "NickvisionApps";
+    repo = "Denaro";
    rev = version;
-    hash = "sha256-B84uzJ+B7kGU+O2tuObrIFCvgUfszLd1VU7F5tL90bU=";
+    hash = "sha256-kYN4Qm4xxOUkMi3twyVkT9PBnauDp7aenYy0YXzwKNA=";
  };

  dotnet-sdk = dotnetCorePackages.sdk_7_0;
@ -42,15 +40,19 @@ buildDotnetModule rec {
    wrapGAppsHook4
    glib # For glib-compile-resources
    shared-mime-info # For update-mime-database
-    python3
-    desktop-file-utils
    gdk-pixbuf # Fixes icon missing in envs where GDK_PIXBUF_MODULE_FILE is not set
+    blueprint-compiler
  ];

+  buildInputs = [ gtk4 libadwaita ]; # Used by blueprint-compiler
+
+  # Denaro switches installation tool frequently (bash -> just -> cake)
+  # For maintainability, let's do it ourselves
  postInstall = ''
-    sh NickvisionMoney.GNOME/install_extras.sh $out
-    desktop-file-edit $out/share/applications/org.nickvision.money.desktop \
-      --set-key=Exec --set-value=$out/bin/NickvisionMoney.GNOME
+    substituteInPlace NickvisionMoney.Shared/org.nickvision.money.desktop.in --replace '@EXEC@' "NickvisionMoney.GNOME"
+    install -Dm444 NickvisionMoney.Shared/Resources/org.nickvision.money.svg -t $out/share/icons/hicolor/scalable/apps/
+    install -Dm444 NickvisionMoney.Shared/Resources/org.nickvision.money-symbolic.svg -t $out/share/icons/hicolor/symbolic/apps/
+    install -Dm444 NickvisionMoney.Shared/org.nickvision.money.desktop.in -T $out/share/applications/org.nickvision.money.desktop
  '';

  runtimeDeps = [
@ -59,6 +61,8 @@ buildDotnetModule rec {
    glib # Fixes "Could not retrieve parent type - is the typeid valid?"
  ];

+  passthru.updateScript = ./update.sh;
+
  meta = with lib; {
    description = "Personal finance manager for GNOME";
    homepage = "https://github.com/nlogozzo/NickvisionMoney";
--- a/pkgs/applications/finance/denaro/deps.nix
+++ b/pkgs/applications/finance/denaro/deps.nix
@ -2,6 +2,7 @@
 # Please dont edit it manually, your changes might get overwritten!

 { fetchNuGet }: [
+  (fetchNuGet { pname = "Cake.Tool"; version = "3.0.0"; sha256 = "0gjacqdgnh1d40sm9vrdb8vr6jv3vyh6j265gj1aaf9af2569637"; })
  (fetchNuGet { pname = "Docnet.Core"; version = "2.3.1"; sha256 = "03b39x0vlymdknwgwhsmnpw4gj3njmbl9pd57ls3rhfn9r832d44"; })
  (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.3.0"; sha256 = "1bsjqxck58dff9hnw21cp3xk1afly8721sfsbnxcr5i39hlrbl37"; })
  (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.3.0"; sha256 = "1zb8ilgywpwgjrzrbdvzvy70f46fb05iy49592mkjg2lv24q5l3y"; })
@ -21,14 +22,15 @@
  (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; })
  (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; })
  (fetchNuGet { pname = "Hazzik.Qif"; version = "1.0.3"; sha256 = "16v6cfy3pa0qy699v843pss3418rvq5agz6n43sikzh69vzl2azy"; })
-  (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.3"; sha256 = "00rdsirs32vlqpa1hri3f1m368b05d4r0k95wv5n2y0xi5i8lml6"; })
+  (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.5"; sha256 = "11gkdlf2apnzvwfd7bxdhjvb4qd0p2ridp4rrz44f7h76x1sb0gk"; })
  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; })
  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
  (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
  (fetchNuGet { pname = "OfxSharp.NetStandard"; version = "1.0.0"; sha256 = "1v7yw2glyywb4s0y5fw306bzh2vw175bswrhi5crvd92wf93makj"; })
-  (fetchNuGet { pname = "QuestPDF"; version = "2022.12.1"; sha256 = "0nbbk43jr73f0pfgdx3fzn57mjba34sir5jzxk2rscyfljfw002x"; })
+  (fetchNuGet { pname = "PdfSharpCore"; version = "1.3.56"; sha256 = "0a01b2a14gygh25rq3509rky85331l8808q052br2fzidhb2vc10"; })
+  (fetchNuGet { pname = "QuestPDF"; version = "2023.5.1"; sha256 = "1yfjwb7aj975aars7mcp1dxvarxl8aq122bndpw808b4cx3058gl"; })
  (fetchNuGet { pname = "ReadSharp.Ports.SgmlReader.Core"; version = "1.0.0"; sha256 = "0pcvlh0gq513vw6y12lfn90a0br56a6f26lvppcj4qb839zmh3id"; })
  (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; })
  (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; })
@ -46,16 +48,19 @@
  (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; })
  (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; })
  (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; })
+  (fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; })
+  (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0-beta17"; sha256 = "1qm8q82wzj54nbv63kx3ybln51k47sl18hia3jnzk1zrb6wdsw9a"; })
  (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.3"; sha256 = "12qb0r7v2v91vw8q8ygr67y527gwhbas6d6zdvrv4ksxwjx9dzp9"; })
  (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; })
  (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; })
  (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; })
  (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; })
  (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.4"; sha256 = "1v9wly6v2bj244wch6ijfx2imrbgmafn1w9km44718fngdxfhysq"; })
+  (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.5"; sha256 = "0xnzpkhm9z09yay76wxgn4j8js260pansx8r10lrksxv2b4b0n4x"; })
  (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlcipher"; version = "2.1.4"; sha256 = "14qr84h88jfvy263yx51zjm059aqgwlvgi6g02yxhbr2m7brs4mm"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlcipher"; version = "2.1.4"; sha256 = "1s1dv1qfgjsvcdbwf2pl48c6k60hkxwyy6z5w8g32fypksnvb7cs"; })
+  (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.5"; sha256 = "03181hahmxv8jlaikx0nkzfc2q1l1cdp3chgx5q6780nhqyjkhhx"; })
+  (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlcipher"; version = "2.1.5"; sha256 = "1chij7jlpi2mdm55chrkn8bmlda5qb3q6idkljgc3rz26n6c2l5b"; })
+  (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlcipher"; version = "2.1.5"; sha256 = "11xah1nfzryh52zfwhlvfm2ra7d3an5ygff2brylp75wa685gm7g"; })
  (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; })
  (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
  (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
--- a/pkgs/applications/finance/denaro/update.sh
+++ b/pkgs/applications/finance/denaro/update.sh
@ -0,0 +1,18 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts
+#shellcheck shell=bash
+
+set -eu -o pipefail
+
+version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
+    https://api.github.com/repos/NickvisionApps/Denaro/releases/latest | jq -e -r .tag_name)
+old_version=$(nix-instantiate --eval -A denaro.version | jq -e -r)
+
+if [[ $version == "$old_version" ]]; then
+    echo "New version same as old version, nothing to do." >&2
+    exit 0
+fi
+
+update-source-version denaro "$version"
+
+$(nix-build -A denaro.fetch-deps --no-out-link) "$(dirname -- "${BASH_SOURCE[0]}")/deps.nix"
--- a/pkgs/applications/misc/snagboot/default.nix
+++ b/pkgs/applications/misc/snagboot/default.nix
@ -0,0 +1,76 @@
+{ lib
+, stdenv
+, fetchPypi
+, pythonRelaxDepsHook
+, python3
+, snagboot
+, testers
+, gitUpdater
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "snagboot";
+  version = "1.0";
+  format = "pyproject";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-wtIcrd3s/ZfdYqi2a2+IvVYnJie5txJy6d2m+GjuhxU=";
+  };
+
+  passthru = {
+    updateScript = gitUpdater {
+      rev-prefix = "v";
+      ignoredVersions = ".(rc|beta).*";
+    };
+
+    tests.version = testers.testVersion {
+      package = snagboot;
+      command = "snagrecover --version";
+      version = "v${version}";
+    };
+  };
+
+  nativeBuildInputs = [
+    pythonRelaxDepsHook
+  ];
+
+  pythonRemoveDeps = [
+    "pylibfdt"
+    "swig"
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    setuptools
+    pyusb
+    pyserial
+    hid
+    crccheck
+    six
+    xmodem
+    pyyaml
+    libfdt
+    tftpy
+  ];
+
+  postInstall = lib.optionalString stdenv.isLinux ''
+    rules="src/snagrecover/80-snagboot.rules"
+    if [ ! -f "$rules" ]; then
+        echo "$rules is missing, must update the Nix file."
+        exit 1
+    fi
+
+    mkdir -p "$out/lib/udev/rules.d"
+    cp "$rules" "$out/lib/udev/rules.d/80-snagboot.rules"
+  '';
+
+  # There are no tests
+  doCheck = false;
+
+  meta = {
+    homepage = "https://github.com/bootlin/snagboot";
+    description = "Generic recovery and reflashing tool for embedded platforms";
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ otavio ];
+  };
+}
--- a/pkgs/applications/office/libreoffice/src-fresh/download.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix
@ -301,11 +301,11 @@
    md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz";
  }
  {
-    name = "harfbuzz-5.2.0.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/harfbuzz-5.2.0.tar.xz";
-    sha256 = "735a94917b47936575acb4d4fa7e7986522f8a89527e4635721474dee2bc942c";
+    name = "harfbuzz-7.1.0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/harfbuzz-7.1.0.tar.xz";
+    sha256 = "f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b";
    md5 = "";
-    md5name = "735a94917b47936575acb4d4fa7e7986522f8a89527e4635721474dee2bc942c-harfbuzz-5.2.0.tar.xz";
+    md5name = "f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b-harfbuzz-7.1.0.tar.xz";
  }
  {
    name = "hsqldb_1_8_0.zip";
@ -420,11 +420,11 @@
    md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
  }
  {
-    name = "libjpeg-turbo-2.1.5.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.5.tar.gz";
-    sha256 = "bc12bc9dce55300c6bf4342bc233bcc26bd38bf289eedf147360d731c668ddaf";
+    name = "libjpeg-turbo-2.1.5.1.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.5.1.tar.gz";
+    sha256 = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf";
    md5 = "";
-    md5name = "bc12bc9dce55300c6bf4342bc233bcc26bd38bf289eedf147360d731c668ddaf-libjpeg-turbo-2.1.5.tar.gz";
+    md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz";
  }
  {
    name = "language-subtag-registry-2022-08-08.tar.bz2";
@ -504,11 +504,11 @@
    md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip";
  }
  {
-    name = "libwebp-1.2.4.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/libwebp-1.2.4.tar.gz";
-    sha256 = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df";
+    name = "libwebp-1.3.0.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/libwebp-1.3.0.tar.gz";
+    sha256 = "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c";
    md5 = "";
-    md5name = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df-libwebp-1.2.4.tar.gz";
+    md5name = "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c-libwebp-1.3.0.tar.gz";
  }
  {
    name = "xmlsec1-1.2.37.tar.gz";
@ -518,11 +518,11 @@
    md5name = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c-xmlsec1-1.2.37.tar.gz";
  }
  {
-    name = "libxml2-2.10.3.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/libxml2-2.10.3.tar.xz";
-    sha256 = "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c";
+    name = "libxml2-2.10.4.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libxml2-2.10.4.tar.xz";
+    sha256 = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45";
    md5 = "";
-    md5name = "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c-libxml2-2.10.3.tar.xz";
+    md5name = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45-libxml2-2.10.4.tar.xz";
  }
  {
    name = "libxslt-1.1.35.tar.xz";
@ -784,11 +784,11 @@
    md5name = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09-libwpd-0.10.3.tar.xz";
  }
  {
-    name = "libwpg-0.3.3.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz";
-    sha256 = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c";
+    name = "libwpg-0.3.4.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libwpg-0.3.4.tar.xz";
+    sha256 = "b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3";
    md5 = "";
-    md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz";
+    md5name = "b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3-libwpg-0.3.4.tar.xz";
  }
  {
    name = "libwps-0.4.12.tar.xz";
--- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
@ -8,8 +8,8 @@ rec {

  major = "7";
  minor = "5";
-  patch = "2";
-  tweak = "2";
+  patch = "4";
+  tweak = "1";

  subdir = "${major}.${minor}.${patch}";

@ -17,13 +17,13 @@ rec {

  src = fetchurl {
    url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    hash = "sha256-YYuQfdNrj4DgfdwTpgXo58EhJh323cmmQ24FQUMkLdM=";
+    hash = "sha256-dWE7yXldkiEnsJOxfxyZ9p05eARqexgRRgNV158VVF4=";
  };

  # FIXME rename
  translations = fetchSrc {
    name = "translations";
-    hash = "sha256-IPdXQibM+xz1Wok/XnRxyNVqvwh4BarWCH9FceylN/0=";
+    hash = "sha256-dv3L8DtdxZcwmeXnqtTtwIpOvwZg3aH3VvJBiiZzbh0=";
  };

  # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@ -31,6 +31,6 @@ rec {

  help = fetchSrc {
    name = "help";
-    hash = "sha256-h1uQ3EaroSyz6uCU7SFC06TuGMvaXm97/v9zCKvNxDY=";
+    hash = "sha256-2CrGEyK5AQEAo1Qz1ACmvMH7BaOubW5BNLWv3fDEdOY=";
  };
 }
--- a/pkgs/applications/office/libreoffice/src-still/download.nix
+++ b/pkgs/applications/office/libreoffice/src-still/download.nix
@ -98,11 +98,11 @@
    md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
  }
  {
-    name = "curl-7.88.1.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/curl-7.88.1.tar.xz";
-    sha256 = "1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f";
+    name = "curl-8.0.1.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/curl-8.0.1.tar.xz";
+    sha256 = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0";
    md5 = "";
-    md5name = "1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f-curl-7.88.1.tar.xz";
+    md5name = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0-curl-8.0.1.tar.xz";
  }
  {
    name = "libe-book-0.1.3.tar.xz";
@ -329,11 +329,11 @@
    md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz";
  }
  {
-    name = "harfbuzz-4.3.0.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/harfbuzz-4.3.0.tar.xz";
-    sha256 = "a49628f4c4c8e6d8df95ef44935a93446cf2e46366915b0e3ca30df21fffb530";
+    name = "harfbuzz-7.1.0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/harfbuzz-7.1.0.tar.xz";
+    sha256 = "f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b";
    md5 = "";
-    md5name = "a49628f4c4c8e6d8df95ef44935a93446cf2e46366915b0e3ca30df21fffb530-harfbuzz-4.3.0.tar.xz";
+    md5name = "f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b-harfbuzz-7.1.0.tar.xz";
  }
  {
    name = "hsqldb_1_8_0.zip";
@ -546,11 +546,11 @@
    md5name = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262-xmlsec1-1.2.34.tar.gz";
  }
  {
-    name = "libxml2-2.10.3.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/libxml2-2.10.3.tar.xz";
-    sha256 = "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c";
+    name = "libxml2-2.10.4.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libxml2-2.10.4.tar.xz";
+    sha256 = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45";
    md5 = "";
-    md5name = "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c-libxml2-2.10.3.tar.xz";
+    md5name = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45-libxml2-2.10.4.tar.xz";
  }
  {
    name = "libxslt-1.1.35.tar.xz";
--- a/pkgs/applications/office/libreoffice/src-still/primary.nix
+++ b/pkgs/applications/office/libreoffice/src-still/primary.nix
@ -8,7 +8,7 @@ rec {

  major = "7";
  minor = "4";
-  patch = "6";
+  patch = "7";
  tweak = "2";

  subdir = "${major}.${minor}.${patch}";
@ -17,13 +17,13 @@ rec {

  src = fetchurl {
    url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    hash = "sha256-GHOuiYbww/DSK/DpSqAaB/jgppKacjGSYIOPqGnmIJM=";
+    hash = "sha256-dD2R8qE4png4D6eo7LWyQB2ZSwZ7MwdQ8DrY9SOi+yA=";
  };

  # FIXME rename
  translations = fetchSrc {
    name = "translations";
-    hash = "sha256-ES4r9Pk7DYeFTPg8iPXQP84SpGn6x8G10Pfs1WQVixM=";
+    hash = "sha256-7wea0EClmvwcPvgQDGagkOF7eBVvYTZScCEEpirdXnE=";
  };

  # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@ -31,6 +31,6 @@ rec {

  help = fetchSrc {
    name = "help";
-    hash = "sha256-o0JnybhmMFZhcbTrWRllJ+J9+tcUbFLcbftymgECT9E=";
+    hash = "sha256-vcQWE3mBZx2sBQ9KzTh6zM7277mK9twfvyESTzTiII8=";
  };
 }
--- a/pkgs/desktops/xfce/core/xfce4-session/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix
@ -1,13 +1,35 @@
-{ lib, mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck, xfce4-session }:
+{ lib
+, mkXfceDerivation
+, polkit
+, exo
+, libxfce4util
+, libxfce4ui
+, xfconf
+, iceauth
+, gtk3
+, glib
+, libwnck
+, xfce4-session
+}:

 mkXfceDerivation {
  category = "xfce";
  pname = "xfce4-session";
-  version = "4.18.2";
+  version = "4.18.3";

-  sha256 = "sha256-EyDMHGFjZWux7atpiUoCMmJIN2PGlF9h2L5qaFAzrKU=";
+  sha256 = "sha256-qCkE3aVYVwphoO1ZAyzpL1ZtsLaP6XT1H1rlFoBI3yg=";

-  buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck xfconf polkit iceauth ];
+  buildInputs = [
+    exo
+    gtk3
+    glib
+    libxfce4ui
+    libxfce4util
+    libwnck
+    xfconf
+    polkit
+    iceauth
+  ];

  configureFlags = [ "--with-xsession-prefix=${placeholder "out"}" ];

--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@ -222,8 +222,8 @@ in {


  openssl_1_1 = common {
-    version = "1.1.1t";
-    sha256 = "sha256-je6bJL2x3L8MPR6bAvuPa/IhZegH9Fret8lndTaFnTs=";
+    version = "1.1.1u";
+    sha256 = "sha256-4vjYS1I+7NBse+diaDA3AwD7zBU4a/UULXJ1j2lj68Y=";
    patches = [
      ./1.1/nix-ssl-cert-file.patch

--- a/pkgs/development/python-modules/aioairzone-cloud/default.nix
+++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix
@ -0,0 +1,47 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, setuptools
+, wheel
+}:
+
+buildPythonPackage rec {
+  pname = "aioairzone-cloud";
+  version = "0.1.6";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "Noltari";
+    repo = "aioairzone-cloud";
+    rev = "refs/tags/${version}";
+    hash = "sha256-9VLjZaIru3FRZyovZ4j8ks7lNZOft2bwAzDodTdqjH0=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+    wheel
+  ];
+
+  propagatedBuildInputs = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [
+    "aioairzone_cloud"
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Library to control Airzone via Cloud API";
+    homepage = "https://github.com/Noltari/aioairzone-cloud";
+    changelog = "https://github.com/Noltari/aioairzone-cloud/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@ -74,7 +74,7 @@

 buildPythonPackage rec {
  pname = "langchain";
-  version = "0.0.183";
+  version = "0.0.184";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -83,7 +83,7 @@ buildPythonPackage rec {
    owner = "hwchase17";
    repo = "langchain";
    rev = "refs/tags/v${version}";
-    hash = "sha256-AE3OKrp+F6z7j5rGaqeo+hwN5Wi6ik638WrxCtAJ7Ro=";
+    hash = "sha256-DIPlOsV+s7KQF70stCE7M2UwfvAqp3LskR0UtuOnuCs=";
  };

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

 buildPythonPackage rec {
  pname = "pydyf";
-  version = "0.5.0";
+  version = "0.6.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-UedRrhUEA3wfwfSBURkTewEYAs1fbDU52wZsRVsUp+E=";
+    hash = "sha256-tEo4hV1+R7dAs80xq2Oi9bmyeTkx1QsMyu07t7hpEvw=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/pyzipper/default.nix
+++ b/pkgs/development/python-modules/pyzipper/default.nix
@ -0,0 +1,55 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pytestCheckHook
+, pycryptodomex
+}:
+
+buildPythonPackage rec {
+  pname = "pyzipper";
+  version = "0.3.6";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "danifus";
+    repo = "pyzipper";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-+fZXoAUeB/bUI3LrIFlMTktJgn+GNFBiDHvH2Jgo0pg=";
+  };
+
+  propagatedBuildInputs = [
+    pycryptodomex
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pyzipper"
+  ];
+
+  disabledTests = [
+    # Tests are parsing CLI output
+    "test_args_from_interpreter_flags"
+    "test_bad_use"
+    "test_bad_use"
+    "test_check__all__"
+    "test_create_command"
+    "test_extract_command"
+    "test_main"
+    "test_temp_dir__forked_child"
+    "test_test_command"
+  ];
+
+  meta = with lib; {
+    description = "Python zipfile extensions";
+    homepage = "https://github.com/danifus/pyzipper";
+    changelog = "https://github.com/danifus/pyzipper/blob/v${version}/HISTORY.rst";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@ -24,7 +24,7 @@

 buildPythonPackage rec {
  pname = "weasyprint";
-  version = "58.1";
+  version = "59.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -32,7 +32,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit version;
    pname = "weasyprint";
-    hash = "sha256-YXMAnjE75lgH/vv3ioBRzrepN3bv2n67uIwT9XaXlPM=";
+    hash = "sha256-Ijp2Y2s3ROqkq4oohfUM9Gz467GsuZtSdtAv7M9QdJI=";
  };

  patches = [
--- a/pkgs/development/python-modules/xknxproject/default.nix
+++ b/pkgs/development/python-modules/xknxproject/default.nix
@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, cryptography
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+, pyzipper
+, setuptools
+}:
+
+buildPythonPackage rec {
+  pname = "xknxproject";
+  version = "3.1.0";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "XKNX";
+    repo = "xknxproject";
+    rev = "refs/tags/${version}";
+    hash = "sha256-j9Bfzl1cYhmDV2Cw4/aobo6Uai50V5JrzQWrrkDm3lw=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  propagatedBuildInputs = [
+    cryptography
+    pyzipper
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "xknxproject"
+  ];
+
+  meta = with lib; {
+    description = "ETS project parser";
+    homepage = "https://github.com/XKNX/xknxproject";
+    changelog = "https://github.com/XKNX/xknxproject/releases/tag/${version}";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/tools/build-managers/moon/default.nix
+++ b/pkgs/development/tools/build-managers/moon/default.nix
@ -0,0 +1,44 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, darwin
+, stdenv
+, openssl
+, pkg-config
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "moon";
+  version = "v1.5.1";
+
+  src = fetchFromGitHub {
+    owner = "moonrepo";
+    repo = pname;
+    rev = version;
+    hash = "sha256-TA27e0W0XSOC326lnO/mSlJNLGn6roJhd1CrQadWb/U=";
+  };
+
+  cargoHash = "sha256-Q044nxI6VGGal9I31VuZeGLho4KIz/Rzg4Lrn1prj4Y=";
+
+  env = {
+    RUSTFLAGS = "-C strip=symbols";
+    OPENSSL_NO_VENDOR = 1;
+  };
+
+  buildInputs = [ openssl ] ++
+    lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.Security
+      darwin.apple_sdk.frameworks.SystemConfiguration
+  ];
+  nativeBuildInputs = [ pkg-config ];
+
+  # Some tests fail, because test using internet connection and install NodeJS by example
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A task runner and repo management tool for the web ecosystem, written in Rust";
+    homepage = "https://github.com/moonrepo/moon";
+    license = licenses.mit;
+    maintainers = with maintainers; [ flemzord ];
+  };
+}
--- a/pkgs/development/web/bun/default.nix
+++ b/pkgs/development/web/bun/default.nix
@ -12,7 +12,7 @@
 }:

 stdenvNoCC.mkDerivation rec {
-  version = "0.6.3";
+  version = "0.6.5";
  pname = "bun";

  src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec {
    sources = {
      "aarch64-darwin" = fetchurl {
        url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
-        sha256 = "u2sgfejY9I6zjpo30H63Pf8FrnI9yzvKZKdVCEwuMJo=";
+        sha256 = "NZU2C1zve8nBTKhk3DpeuEL4aY9Qk+3UnGzH6F7i0hY=";
      };
      "aarch64-linux" = fetchurl {
        url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
-        sha256 = "fGq9m17WZ382UOROpAHUuk21mU1WhgmzQDUAb0RpGfo=";
+        sha256 = "qC4WbrxD7s9PexQruUpHp8AgDmDLl7cguR4rTurFB9c=";
      };
      "x86_64-darwin" = fetchurl {
        url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
-        sha256 = "npRAY3ffTDd5uOcHGoKksD5mDHPBqYAqxuuQKd4PC3Q=";
+        sha256 = "G7vCZOoeE0YtW4Ha4yW8DboIQUxIjdEh43Om5iH+B1M=";
      };
      "x86_64-linux" = fetchurl {
        url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
-        sha256 = "UBrNOjrK+40OlkiFT8d8oav/2ZSAaz0xWYCalGtahs8=";
+        sha256 = "Coz+NyX6YBS6NEzzcXoVa9ArBJxD7LhxpT+2Q1rNmYs=";
      };
    };
    updateScript = writeShellScript "update-bun" ''
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "flyctl";
-  version = "0.1.18";
+  version = "0.1.20";

  src = fetchFromGitHub {
    owner = "superfly";
    repo = "flyctl";
    rev = "v${version}";
-    hash = "sha256-ZRLkqymNeSIHfMYqT6T4YzkOuHCrUWRiJHFN1bWbzmk=";
+    hash = "sha256-S0jYNNbXTR1Vr6YHoUXxhTM+MKuokI0Tyc5svh31DM8=";
  };

  vendorHash = "sha256-UCP73yAeT3JO7fhpshTpbhmB2wLGc26GiLY/DkBAgTg=";
--- a/pkgs/misc/vencord/default.nix
+++ b/pkgs/misc/vencord/default.nix
@ -8,13 +8,13 @@
 }:
 buildNpmPackage rec {
  pname = "vencord";
-  version = "1.1.6";
+  version = "1.2.5";

  src = fetchFromGitHub {
    owner = "Vendicated";
    repo = "Vencord";
    rev = "v${version}";
-    sha256 = "sha256-V9fzSoRqVlk9QqpzzR2x+aOwGHhQhQiSjXZWMC0uLnQ=";
+    sha256 = "sha256-AqzhTzfqbYotQxLrkhkjvSPB4irL/q2fxXusWgCibpI=";
  };

  ESBUILD_BINARY_PATH = lib.getExe (esbuild.override {
@ -33,7 +33,7 @@ buildNpmPackage rec {
  # Supresses an error about esbuild's version.
  npmRebuildFlags = [ "|| true" ];

-  npmDepsHash = "sha256-jKSdeyQ8oHw7ZGby0XzDg4O8mtH276ykVuBcw7dU/Ls=";
+  npmDepsHash = "sha256-Sj74qx9Tdz1EsoOVqk4ZdXTXxB4ShrFl3VRCWJ6/KcQ=";
  npmFlags = [ "--legacy-peer-deps" ];
  npmBuildScript = if buildWebExtension then "buildWeb" else "build";

@ -49,7 +49,7 @@ buildNpmPackage rec {
  ];

  installPhase = if buildWebExtension then ''
-    cp -r dist/extension-unpacked/ $out
+    cp -r dist/chromium-unpacked/ $out
  '' else ''
    cp -r dist/ $out
  '';
--- a/pkgs/misc/vencord/package-lock.json
+++ b/pkgs/misc/vencord/package-lock.json
@ -1,29 +1,29 @@
 {
    "name": "vencord",
-    "version": "1.1.6",
+    "version": "1.2.5",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
        "": {
            "name": "vencord",
-            "version": "1.1.6",
+            "version": "1.2.5",
            "license": "GPL-3.0",
            "dependencies": {
                "@vap/core": "0.0.12",
-                "@vap/shiki": "0.10.3",
+                "@vap/shiki": "0.10.5",
                "fflate": "^0.7.4",
                "nanoid": "^4.0.2",
                "virtual-merge": "^1.0.1"
            },
            "devDependencies": {
-                "@types/diff": "^5.0.2",
-                "@types/lodash": "^4.14.191",
-                "@types/node": "^18.11.18",
-                "@types/react": "^18.0.27",
-                "@types/react-dom": "^18.0.10",
+                "@types/diff": "^5.0.3",
+                "@types/lodash": "^4.14.194",
+                "@types/node": "^18.16.3",
+                "@types/react": "^18.2.0",
+                "@types/react-dom": "^18.2.1",
                "@types/yazl": "^2.4.2",
-                "@typescript-eslint/eslint-plugin": "^5.49.0",
-                "@typescript-eslint/parser": "^5.49.0",
+                "@typescript-eslint/eslint-plugin": "^5.59.1",
+                "@typescript-eslint/parser": "^5.59.1",
                "diff": "^5.1.0",
                "discord-types": "^1.3.26",
                "esbuild": "^0.15.18",
@ -31,17 +31,17 @@
                "eslint-import-resolver-alias": "^1.1.2",
                "eslint-plugin-header": "^3.1.1",
                "eslint-plugin-path-alias": "^1.0.0",
-                "eslint-plugin-simple-import-sort": "^8.0.0",
+                "eslint-plugin-simple-import-sort": "^10.0.0",
                "eslint-plugin-unused-imports": "^2.0.0",
                "highlight.js": "10.6.0",
                "moment": "^2.29.4",
-                "puppeteer-core": "^19.6.0",
+                "puppeteer-core": "^19.11.1",
                "standalone-electron-types": "^1.0.0",
-                "stylelint": "^14.16.1",
-                "stylelint-config-standard": "^29.0.0",
-                "tsx": "^3.12.6",
-                "type-fest": "^3.5.3",
-                "typescript": "^4.9.4"
+                "stylelint": "^15.6.0",
+                "stylelint-config-standard": "^33.0.0",
+                "tsx": "^3.12.7",
+                "type-fest": "^3.9.0",
+                "typescript": "^5.0.4"
            },
            "engines": {
                "node": ">=18",
@ -154,6 +154,52 @@
                "node": ">=4"
            }
        },
+        "node_modules/@csstools/css-parser-algorithms": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.1.1.tgz",
+            "integrity": "sha512-viRnRh02AgO4mwIQb2xQNJju0i+Fh9roNgmbR5xEuG7J3TGgxjnE95HnBLgsFJOJOksvcfxOUCgODcft6Y07cA==",
+            "dev": true,
+            "engines": {
+                "node": "^14 || ^16 || >=18"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/csstools"
+            },
+            "peerDependencies": {
+                "@csstools/css-tokenizer": "^2.1.1"
+            }
+        },
+        "node_modules/@csstools/css-tokenizer": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.1.1.tgz",
+            "integrity": "sha512-GbrTj2Z8MCTUv+52GE0RbFGM527xuXZ0Xa5g0Z+YN573uveS4G0qi6WNOMyz3yrFM/jaILTTwJ0+umx81EzqfA==",
+            "dev": true,
+            "engines": {
+                "node": "^14 || ^16 || >=18"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/csstools"
+            }
+        },
+        "node_modules/@csstools/media-query-list-parser": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.0.4.tgz",
+            "integrity": "sha512-GyYot6jHgcSDZZ+tLSnrzkR7aJhF2ZW6d+CXH66mjy5WpAQhZD4HDke2OQ36SivGRWlZJpAz7TzbW6OKlEpxAA==",
+            "dev": true,
+            "engines": {
+                "node": "^14 || ^16 || >=18"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/csstools"
+            },
+            "peerDependencies": {
+                "@csstools/css-parser-algorithms": "^2.1.1",
+                "@csstools/css-tokenizer": "^2.1.1"
+            }
+        },
        "node_modules/@csstools/selector-specificity": {
            "version": "2.2.0",
            "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
@ -378,9 +424,9 @@
            }
        },
        "node_modules/@puppeteer/browsers": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.4.1.tgz",
-            "integrity": "sha512-4IICvy1McAkT/HyNZHIs7sp8ngBX1dmO0TPQ+FWq9ATQMqI8p+Ulm5A3kS2wYDh5HDHHkYrrETOu6rlj64VuTw==",
+            "version": "0.5.0",
+            "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.5.0.tgz",
+            "integrity": "sha512-Uw6oB7VvmPRLE4iKsjuOh8zgDabhNX67dzo8U/BB0f9527qx+4eeUs+korU98OhG5C4ubg7ufBgVi63XYwS6TQ==",
            "dev": true,
            "dependencies": {
                "debug": "4.3.4",
@ -414,9 +460,9 @@
            "dev": true
        },
        "node_modules/@types/json-schema": {
-            "version": "7.0.11",
-            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-            "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+            "version": "7.0.12",
+            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
+            "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
            "dev": true
        },
        "node_modules/@types/lodash": {
@ -432,9 +478,9 @@
            "dev": true
        },
        "node_modules/@types/node": {
-            "version": "18.15.11",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
-            "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==",
+            "version": "18.16.16",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.16.tgz",
+            "integrity": "sha512-NpaM49IGQQAUlBhHMF82QH80J08os4ZmyF9MkpCzWAGuOHqE4gTEbhzd7L3l5LmWuZ6E0OiC1FweQ4tsiW35+g==",
            "dev": true
        },
        "node_modules/@types/normalize-package-data": {
@ -443,12 +489,6 @@
            "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
            "dev": true
        },
-        "node_modules/@types/parse-json": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-            "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-            "dev": true
-        },
        "node_modules/@types/prop-types": {
            "version": "15.7.5",
            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
@ -456,9 +496,9 @@
            "dev": true
        },
        "node_modules/@types/react": {
-            "version": "18.0.35",
-            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.35.tgz",
-            "integrity": "sha512-6Laome31HpetaIUGFWl1VQ3mdSImwxtFZ39rh059a1MNnKGqBpC88J6NJ8n/Is3Qx7CefDGLgf/KhN/sYCf7ag==",
+            "version": "18.2.7",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.7.tgz",
+            "integrity": "sha512-ojrXpSH2XFCmHm7Jy3q44nXDyN54+EYKP2lBhJ2bqfyPj6cIUW/FZW/Csdia34NQgq7KYcAlHi5184m4X88+yw==",
            "dev": true,
            "dependencies": {
                "@types/prop-types": "*",
@ -467,9 +507,9 @@
            }
        },
        "node_modules/@types/react-dom": {
-            "version": "18.0.11",
-            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.11.tgz",
-            "integrity": "sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw==",
+            "version": "18.2.4",
+            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.4.tgz",
+            "integrity": "sha512-G2mHoTMTL4yoydITgOGwWdWMVd8sNgyEP85xVmMKAPUBwQWm9wBPQUmvbeF4V3WBY1P7mmL4BkjQ0SqUpf1snw==",
            "dev": true,
            "dependencies": {
                "@types/react": "*"
@ -482,9 +522,9 @@
            "dev": true
        },
        "node_modules/@types/semver": {
-            "version": "7.3.13",
-            "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
-            "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
+            "version": "7.5.0",
+            "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
+            "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
            "dev": true
        },
        "node_modules/@types/yauzl": {
@ -507,15 +547,15 @@
            }
        },
        "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "5.58.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.58.0.tgz",
-            "integrity": "sha512-vxHvLhH0qgBd3/tW6/VccptSfc8FxPQIkmNTVLWcCOVqSBvqpnKkBTYrhcGlXfSnd78azwe+PsjYFj0X34/njA==",
+            "version": "5.59.8",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.8.tgz",
+            "integrity": "sha512-JDMOmhXteJ4WVKOiHXGCoB96ADWg9q7efPWHRViT/f09bA8XOMLAVHHju3l0MkZnG1izaWXYmgvQcUjTRcpShQ==",
            "dev": true,
            "dependencies": {
                "@eslint-community/regexpp": "^4.4.0",
-                "@typescript-eslint/scope-manager": "5.58.0",
-                "@typescript-eslint/type-utils": "5.58.0",
-                "@typescript-eslint/utils": "5.58.0",
+                "@typescript-eslint/scope-manager": "5.59.8",
+                "@typescript-eslint/type-utils": "5.59.8",
+                "@typescript-eslint/utils": "5.59.8",
                "debug": "^4.3.4",
                "grapheme-splitter": "^1.0.4",
                "ignore": "^5.2.0",
@ -541,14 +581,14 @@
            }
        },
        "node_modules/@typescript-eslint/parser": {
-            "version": "5.58.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.58.0.tgz",
-            "integrity": "sha512-ixaM3gRtlfrKzP8N6lRhBbjTow1t6ztfBvQNGuRM8qH1bjFFXIJ35XY+FC0RRBKn3C6cT+7VW1y8tNm7DwPHDQ==",
+            "version": "5.59.8",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.8.tgz",
+            "integrity": "sha512-AnR19RjJcpjoeGojmwZtCwBX/RidqDZtzcbG3xHrmz0aHHoOcbWnpDllenRDmDvsV0RQ6+tbb09/kyc+UT9Orw==",
            "dev": true,
            "dependencies": {
-                "@typescript-eslint/scope-manager": "5.58.0",
-                "@typescript-eslint/types": "5.58.0",
-                "@typescript-eslint/typescript-estree": "5.58.0",
+                "@typescript-eslint/scope-manager": "5.59.8",
+                "@typescript-eslint/types": "5.59.8",
+                "@typescript-eslint/typescript-estree": "5.59.8",
                "debug": "^4.3.4"
            },
            "engines": {
@ -568,13 +608,13 @@
            }
        },
        "node_modules/@typescript-eslint/scope-manager": {
-            "version": "5.58.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.58.0.tgz",
-            "integrity": "sha512-b+w8ypN5CFvrXWQb9Ow9T4/6LC2MikNf1viLkYTiTbkQl46CnR69w7lajz1icW0TBsYmlpg+mRzFJ4LEJ8X9NA==",
+            "version": "5.59.8",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.8.tgz",
+            "integrity": "sha512-/w08ndCYI8gxGf+9zKf1vtx/16y8MHrZs5/tnjHhMLNSixuNcJavSX4wAiPf4aS5x41Es9YPCn44MIe4cxIlig==",
            "dev": true,
            "dependencies": {
-                "@typescript-eslint/types": "5.58.0",
-                "@typescript-eslint/visitor-keys": "5.58.0"
+                "@typescript-eslint/types": "5.59.8",
+                "@typescript-eslint/visitor-keys": "5.59.8"
            },
            "engines": {
                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@ -585,13 +625,13 @@
            }
        },
        "node_modules/@typescript-eslint/type-utils": {
-            "version": "5.58.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.58.0.tgz",
-            "integrity": "sha512-FF5vP/SKAFJ+LmR9PENql7fQVVgGDOS+dq3j+cKl9iW/9VuZC/8CFmzIP0DLKXfWKpRHawJiG70rVH+xZZbp8w==",
+            "version": "5.59.8",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.8.tgz",
+            "integrity": "sha512-+5M518uEIHFBy3FnyqZUF3BMP+AXnYn4oyH8RF012+e7/msMY98FhGL5SrN29NQ9xDgvqCgYnsOiKp1VjZ/fpA==",
            "dev": true,
            "dependencies": {
-                "@typescript-eslint/typescript-estree": "5.58.0",
-                "@typescript-eslint/utils": "5.58.0",
+                "@typescript-eslint/typescript-estree": "5.59.8",
+                "@typescript-eslint/utils": "5.59.8",
                "debug": "^4.3.4",
                "tsutils": "^3.21.0"
            },
@ -612,9 +652,9 @@
            }
        },
        "node_modules/@typescript-eslint/types": {
-            "version": "5.58.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.58.0.tgz",
-            "integrity": "sha512-JYV4eITHPzVQMnHZcYJXl2ZloC7thuUHrcUmxtzvItyKPvQ50kb9QXBkgNAt90OYMqwaodQh2kHutWZl1fc+1g==",
+            "version": "5.59.8",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.8.tgz",
+            "integrity": "sha512-+uWuOhBTj/L6awoWIg0BlWy0u9TyFpCHrAuQ5bNfxDaZ1Ppb3mx6tUigc74LHcbHpOHuOTOJrBoAnhdHdaea1w==",
            "dev": true,
            "engines": {
                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@ -625,13 +665,13 @@
            }
        },
        "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "5.58.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.58.0.tgz",
-            "integrity": "sha512-cRACvGTodA+UxnYM2uwA2KCwRL7VAzo45syNysqlMyNyjw0Z35Icc9ihPJZjIYuA5bXJYiJ2YGUB59BqlOZT1Q==",
+            "version": "5.59.8",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.8.tgz",
+            "integrity": "sha512-Jy/lPSDJGNow14vYu6IrW790p7HIf/SOV1Bb6lZ7NUkLc2iB2Z9elESmsaUtLw8kVqogSbtLH9tut5GCX1RLDg==",
            "dev": true,
            "dependencies": {
-                "@typescript-eslint/types": "5.58.0",
-                "@typescript-eslint/visitor-keys": "5.58.0",
+                "@typescript-eslint/types": "5.59.8",
+                "@typescript-eslint/visitor-keys": "5.59.8",
                "debug": "^4.3.4",
                "globby": "^11.1.0",
                "is-glob": "^4.0.3",
@ -652,17 +692,17 @@
            }
        },
        "node_modules/@typescript-eslint/utils": {
-            "version": "5.58.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.58.0.tgz",
-            "integrity": "sha512-gAmLOTFXMXOC+zP1fsqm3VceKSBQJNzV385Ok3+yzlavNHZoedajjS4UyS21gabJYcobuigQPs/z71A9MdJFqQ==",
+            "version": "5.59.8",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.8.tgz",
+            "integrity": "sha512-Tr65630KysnNn9f9G7ROF3w1b5/7f6QVCJ+WK9nhIocWmx9F+TmCAcglF26Vm7z8KCTwoKcNEBZrhlklla3CKg==",
            "dev": true,
            "dependencies": {
                "@eslint-community/eslint-utils": "^4.2.0",
                "@types/json-schema": "^7.0.9",
                "@types/semver": "^7.3.12",
-                "@typescript-eslint/scope-manager": "5.58.0",
-                "@typescript-eslint/types": "5.58.0",
-                "@typescript-eslint/typescript-estree": "5.58.0",
+                "@typescript-eslint/scope-manager": "5.59.8",
+                "@typescript-eslint/types": "5.59.8",
+                "@typescript-eslint/typescript-estree": "5.59.8",
                "eslint-scope": "^5.1.1",
                "semver": "^7.3.7"
            },
@ -678,12 +718,12 @@
            }
        },
        "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "5.58.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.58.0.tgz",
-            "integrity": "sha512-/fBraTlPj0jwdyTwLyrRTxv/3lnU2H96pNTVM6z3esTWLtA5MZ9ghSMJ7Rb+TtUAdtEw9EyJzJ0EydIMKxQ9gA==",
+            "version": "5.59.8",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.8.tgz",
+            "integrity": "sha512-pJhi2ms0x0xgloT7xYabil3SGGlojNNKjK/q6dB3Ey0uJLMjK2UDGJvHieiyJVW/7C3KI+Z4Q3pEHkm4ejA+xQ==",
            "dev": true,
            "dependencies": {
-                "@typescript-eslint/types": "5.58.0",
+                "@typescript-eslint/types": "5.59.8",
                "eslint-visitor-keys": "^3.3.0"
            },
            "engines": {
@ -703,9 +743,9 @@
            }
        },
        "node_modules/@vap/shiki": {
-            "version": "0.10.3",
-            "resolved": "https://registry.npmjs.org/@vap/shiki/-/shiki-0.10.3.tgz",
-            "integrity": "sha512-tZPHZxDKEBlorQ2BaprytGfkbo5yKBvdxdAF144p94HCTpjO3ScJk/f319wi7GtV1NE4DV8HBQo/0XpldixWQA==",
+            "version": "0.10.5",
+            "resolved": "https://registry.npmjs.org/@vap/shiki/-/shiki-0.10.5.tgz",
+            "integrity": "sha512-5BHVGvQT8qonbLSASon5aQFQ18OZU4FxSl9tLSj6oJ0sap3KdMbYcfGq25M9zFZR1g1dJN7fgjmZXBIS5omIdw==",
            "dependencies": {
                "jsonc-parser": "^3.0.0",
                "vscode-oniguruma": "^1.6.1",
@ -1072,9 +1112,9 @@
            "dev": true
        },
        "node_modules/chromium-bidi": {
-            "version": "0.4.6",
-            "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.6.tgz",
-            "integrity": "sha512-TQOkWRaLI/IWvoP8XC+7jO4uHTIiAUiklXU1T0qszlUFEai9LgKXIBXy3pOS3EnQZ3bQtMbKUPkug0fTAEHCSw==",
+            "version": "0.4.7",
+            "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.7.tgz",
+            "integrity": "sha512-6+mJuFXwTMU6I3vYLs6IL8A1DyQTPjCfIL971X0aMPVGRbGnNfl6i6Cl0NMbxi2bRYLGESt9T2ZIMRM5PAEcIQ==",
            "dev": true,
            "dependencies": {
                "mitt": "3.0.0"
@ -1254,19 +1294,21 @@
            }
        },
        "node_modules/cosmiconfig": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
-            "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+            "version": "8.1.3",
+            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
+            "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
            "dev": true,
            "dependencies": {
-                "@types/parse-json": "^4.0.0",
                "import-fresh": "^3.2.1",
+                "js-yaml": "^4.1.0",
                "parse-json": "^5.0.0",
-                "path-type": "^4.0.0",
-                "yaml": "^1.10.0"
+                "path-type": "^4.0.0"
            },
            "engines": {
-                "node": ">=10"
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/d-fischer"
            }
        },
        "node_modules/cross-fetch": {
@ -1301,6 +1343,19 @@
                "node": ">=12.22"
            }
        },
+        "node_modules/css-tree": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+            "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+            "dev": true,
+            "dependencies": {
+                "mdn-data": "2.0.30",
+                "source-map-js": "^1.0.1"
+            },
+            "engines": {
+                "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+            }
+        },
        "node_modules/cssesc": {
            "version": "3.0.0",
            "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
@ -1646,9 +1701,9 @@
            }
        },
        "node_modules/eslint-plugin-simple-import-sort": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-8.0.0.tgz",
-            "integrity": "sha512-bXgJQ+lqhtQBCuWY/FUWdB27j4+lqcvXv5rUARkzbeWLwea+S5eBZEQrhnO+WgX3ZoJHVj0cn943iyXwByHHQw==",
+            "version": "10.0.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz",
+            "integrity": "sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==",
            "dev": true,
            "peerDependencies": {
                "eslint": ">=5.0.0"
@ -2019,6 +2074,20 @@
            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
            "dev": true
        },
+        "node_modules/fsevents": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "dev": true,
+            "hasInstallScript": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
        "node_modules/function-bind": {
            "version": "1.1.1",
            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@ -2654,9 +2723,9 @@
            }
        },
        "node_modules/known-css-properties": {
-            "version": "0.26.0",
-            "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz",
-            "integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==",
+            "version": "0.27.0",
+            "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.27.0.tgz",
+            "integrity": "sha512-uMCj6+hZYDoffuvAJjFAPz56E9uoowFHmTkqRtRq5WyC5Q6Cu/fTZKNQpX/RbzChBYLLl3lo8CjFZBAZXq9qFg==",
            "dev": true
        },
        "node_modules/levn": {
@ -2760,6 +2829,12 @@
                "url": "https://github.com/sponsors/wooorm"
            }
        },
+        "node_modules/mdn-data": {
+            "version": "2.0.30",
+            "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+            "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
+            "dev": true
+        },
        "node_modules/meow": {
            "version": "9.0.0",
            "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
@ -3270,9 +3345,9 @@
            }
        },
        "node_modules/postcss": {
-            "version": "8.4.22",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.22.tgz",
-            "integrity": "sha512-XseknLAfRHzVWjCEtdviapiBtfLdgyzExD50Rg2ePaucEesyh8Wv4VPdW0nbyDa1ydbrAxV19jvMT4+LFmcNUA==",
+            "version": "8.4.24",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
+            "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
            "dev": true,
            "funding": [
                {
@ -3326,9 +3401,9 @@
            }
        },
        "node_modules/postcss-selector-parser": {
-            "version": "6.0.11",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
-            "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
+            "version": "6.0.13",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+            "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
            "dev": true,
            "dependencies": {
                "cssesc": "^3.0.0",
@ -3406,13 +3481,13 @@
            }
        },
        "node_modules/puppeteer-core": {
-            "version": "19.9.0",
-            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.9.0.tgz",
-            "integrity": "sha512-IJYfCE0oFpi5dTvNFqOwo8Dey6zzx7hANy7z6K2bjpCux9oPOSOIubq40awNhaHlfi8soYtgU4qabnzMXB7xBQ==",
+            "version": "19.11.1",
+            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.11.1.tgz",
+            "integrity": "sha512-qcuC2Uf0Fwdj9wNtaTZ2OvYRraXpAK+puwwVW8ofOhOgLPZyz1c68tsorfIZyCUOpyBisjr+xByu7BMbEYMepA==",
            "dev": true,
            "dependencies": {
-                "@puppeteer/browsers": "0.4.1",
-                "chromium-bidi": "0.4.6",
+                "@puppeteer/browsers": "0.5.0",
+                "chromium-bidi": "0.4.7",
                "cross-fetch": "3.1.5",
                "debug": "4.3.4",
                "devtools-protocol": "0.0.1107588",
@ -3843,10 +3918,16 @@
            }
        },
        "node_modules/signal-exit": {
-            "version": "3.0.7",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-            "dev": true
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.2.tgz",
+            "integrity": "sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==",
+            "dev": true,
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
        },
        "node_modules/slash": {
            "version": "3.0.0",
@ -4285,16 +4366,20 @@
            "dev": true
        },
        "node_modules/stylelint": {
-            "version": "14.16.1",
-            "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.16.1.tgz",
-            "integrity": "sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==",
+            "version": "15.6.2",
+            "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.6.2.tgz",
+            "integrity": "sha512-fjQWwcdUye4DU+0oIxNGwawIPC5DvG5kdObY5Sg4rc87untze3gC/5g/ikePqVjrAsBUZjwMN+pZsAYbDO6ArQ==",
            "dev": true,
            "dependencies": {
-                "@csstools/selector-specificity": "^2.0.2",
+                "@csstools/css-parser-algorithms": "^2.1.1",
+                "@csstools/css-tokenizer": "^2.1.1",
+                "@csstools/media-query-list-parser": "^2.0.4",
+                "@csstools/selector-specificity": "^2.2.0",
                "balanced-match": "^2.0.0",
                "colord": "^2.9.3",
-                "cosmiconfig": "^7.1.0",
+                "cosmiconfig": "^8.1.3",
                "css-functions-list": "^3.1.0",
+                "css-tree": "^2.3.1",
                "debug": "^4.3.4",
                "fast-glob": "^3.2.12",
                "fastest-levenshtein": "^1.0.16",
@ -4302,38 +4387,38 @@
                "global-modules": "^2.0.0",
                "globby": "^11.1.0",
                "globjoin": "^0.1.4",
-                "html-tags": "^3.2.0",
-                "ignore": "^5.2.1",
+                "html-tags": "^3.3.1",
+                "ignore": "^5.2.4",
                "import-lazy": "^4.0.0",
                "imurmurhash": "^0.1.4",
                "is-plain-object": "^5.0.0",
-                "known-css-properties": "^0.26.0",
+                "known-css-properties": "^0.27.0",
                "mathml-tag-names": "^2.1.3",
                "meow": "^9.0.0",
                "micromatch": "^4.0.5",
                "normalize-path": "^3.0.0",
                "picocolors": "^1.0.0",
-                "postcss": "^8.4.19",
+                "postcss": "^8.4.23",
                "postcss-media-query-parser": "^0.2.3",
                "postcss-resolve-nested-selector": "^0.1.1",
                "postcss-safe-parser": "^6.0.0",
-                "postcss-selector-parser": "^6.0.11",
+                "postcss-selector-parser": "^6.0.12",
                "postcss-value-parser": "^4.2.0",
                "resolve-from": "^5.0.0",
                "string-width": "^4.2.3",
                "strip-ansi": "^6.0.1",
                "style-search": "^0.1.0",
-                "supports-hyperlinks": "^2.3.0",
+                "supports-hyperlinks": "^3.0.0",
                "svg-tags": "^1.0.0",
                "table": "^6.8.1",
                "v8-compile-cache": "^2.3.0",
-                "write-file-atomic": "^4.0.2"
+                "write-file-atomic": "^5.0.1"
            },
            "bin": {
                "stylelint": "bin/stylelint.js"
            },
            "engines": {
-                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+                "node": "^14.13.1 || >=16.0.0"
            },
            "funding": {
                "type": "opencollective",
@ -4341,24 +4426,24 @@
            }
        },
        "node_modules/stylelint-config-recommended": {
-            "version": "9.0.0",
-            "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-9.0.0.tgz",
-            "integrity": "sha512-9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ==",
+            "version": "12.0.0",
+            "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-12.0.0.tgz",
+            "integrity": "sha512-x6x8QNARrGO2sG6iURkzqL+Dp+4bJorPMMRNPScdvaUK8PsynriOcMW7AFDKqkWAS5wbue/u8fUT/4ynzcmqdQ==",
            "dev": true,
            "peerDependencies": {
-                "stylelint": "^14.10.0"
+                "stylelint": "^15.5.0"
            }
        },
        "node_modules/stylelint-config-standard": {
-            "version": "29.0.0",
-            "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-29.0.0.tgz",
-            "integrity": "sha512-uy8tZLbfq6ZrXy4JKu3W+7lYLgRQBxYTUUB88vPgQ+ZzAxdrvcaSUW9hOMNLYBnwH+9Kkj19M2DHdZ4gKwI7tg==",
+            "version": "33.0.0",
+            "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-33.0.0.tgz",
+            "integrity": "sha512-eyxnLWoXImUn77+ODIuW9qXBDNM+ALN68L3wT1lN2oNspZ7D9NVGlNHb2QCUn4xDug6VZLsh0tF8NyoYzkgTzg==",
            "dev": true,
            "dependencies": {
-                "stylelint-config-recommended": "^9.0.0"
+                "stylelint-config-recommended": "^12.0.0"
            },
            "peerDependencies": {
-                "stylelint": "^14.14.0"
+                "stylelint": "^15.5.0"
            }
        },
        "node_modules/stylelint/node_modules/balanced-match": {
@ -4398,16 +4483,16 @@
            }
        },
        "node_modules/supports-hyperlinks": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
-            "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz",
+            "integrity": "sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==",
            "dev": true,
            "dependencies": {
                "has-flag": "^4.0.0",
                "supports-color": "^7.0.0"
            },
            "engines": {
-                "node": ">=8"
+                "node": ">=14.18"
            }
        },
        "node_modules/supports-preserve-symlinks-flag": {
@ -4603,9 +4688,9 @@
            }
        },
        "node_modules/tsx": {
-            "version": "3.12.6",
-            "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.6.tgz",
-            "integrity": "sha512-q93WgS3lBdHlPgS0h1i+87Pt6n9K/qULIMNYZo07nSeu2z5QE2CellcAZfofVXBo2tQg9av2ZcRMQ2S2i5oadQ==",
+            "version": "3.12.7",
+            "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.7.tgz",
+            "integrity": "sha512-C2Ip+jPmqKd1GWVQDvz/Eyc6QJbGfE7NrR3fx5BpEHMZsEHoIxHL1j+lKdGobr8ovEyqeNkPLSKp6SCSOt7gmw==",
            "dev": true,
            "dependencies": {
                "@esbuild-kit/cjs-loader": "^2.4.2",
@ -4632,9 +4717,9 @@
            }
        },
        "node_modules/type-fest": {
-            "version": "3.8.0",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.8.0.tgz",
-            "integrity": "sha512-FVNSzGQz9Th+/9R6Lvv7WIAkstylfHN2/JYxkyhhmKFYh9At2DST8t6L6Lref9eYO8PXFTfG9Sg1Agg0K3vq3Q==",
+            "version": "3.11.0",
+            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.11.0.tgz",
+            "integrity": "sha512-JaPw5U9ixP0XcpUbQoVSbxSDcK/K4nww20C3kjm9yE6cDRRhptU28AH60VWf9ltXmCrIfIbtt9J+2OUk2Uqiaw==",
            "dev": true,
            "engines": {
                "node": ">=14.16"
@ -4644,16 +4729,16 @@
            }
        },
        "node_modules/typescript": {
-            "version": "4.9.5",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-            "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+            "version": "5.0.4",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
+            "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
            "dev": true,
            "bin": {
                "tsc": "bin/tsc",
                "tsserver": "bin/tsserver"
            },
            "engines": {
-                "node": ">=4.2.0"
+                "node": ">=12.20"
            }
        },
        "node_modules/unbzip2-stream": {
@ -4864,16 +4949,16 @@
            "dev": true
        },
        "node_modules/write-file-atomic": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-            "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+            "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
            "dev": true,
            "dependencies": {
                "imurmurhash": "^0.1.4",
-                "signal-exit": "^3.0.7"
+                "signal-exit": "^4.0.1"
            },
            "engines": {
-                "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+                "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
            }
        },
        "node_modules/ws": {
@ -4912,15 +4997,6 @@
            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
            "dev": true
        },
-        "node_modules/yaml": {
-            "version": "1.10.2",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 6"
-            }
-        },
        "node_modules/yargs": {
            "version": "17.7.1",
            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
--- a/pkgs/tools/admin/oxidized/Gemfile
+++ b/pkgs/tools/admin/oxidized/Gemfile
@ -1,5 +1,11 @@
 source 'https://rubygems.org'

-gem 'oxidized', '0.26.3'
+gem 'oxidized', '0.29.1'
 gem 'oxidized-web', '0.13.1'
-gem 'oxidized-script', '0.6.0'
+
+# The version on rubygems is not up2date
+gem 'oxidized-script', git: 'https://github.com/ytti/oxidized-script.git', ref: '988cded5d89f52e274afb545bd3e011e19d5d22d'
+
+# Fix for https://github.com/ytti/oxidized/issues/2769
+gem 'psych', '~> 3.3.2'
+
--- a/pkgs/tools/admin/oxidized/Gemfile.lock
+++ b/pkgs/tools/admin/oxidized/Gemfile.lock
@ -1,31 +1,39 @@
+GIT
+  remote: https://github.com/ytti/oxidized-script.git
+  revision: 988cded5d89f52e274afb545bd3e011e19d5d22d
+  ref: 988cded5d89f52e274afb545bd3e011e19d5d22d
+  specs:
+    oxidized-script (0.6.0)
+      oxidized (~> 0.28)
+      slop (~> 4.6)
+
 GEM
  remote: https://rubygems.org/
  specs:
-    asetus (0.3.0)
-    backports (3.14.0)
-    charlock_holmes (0.7.6)
+    asetus (0.4.0)
+    backports (3.24.1)
+    bcrypt_pbkdf (1.1.0)
+    charlock_holmes (0.7.7)
+    ed25519 (1.3.0)
    emk-sinatra-url-for (0.2.1)
      sinatra (>= 0.9.1.1)
-    ffi (1.10.0)
-    git (1.5.0)
-    haml (5.0.4)
+    ffi (1.15.5)
+    haml (5.2.2)
      temple (>= 0.8.0)
      tilt
    htmlentities (4.3.4)
-    json (2.2.0)
-    multi_json (1.13.1)
-    net-ssh (5.2.0)
-    net-telnet (0.1.1)
-    oxidized (0.26.3)
+    json (2.6.3)
+    multi_json (1.15.0)
+    net-ssh (7.1.0)
+    net-telnet (0.2.0)
+    oxidized (0.29.1)
      asetus (~> 0.1)
-      git (~> 1)
-      net-ssh (~> 5)
-      net-telnet (~> 0.1.1)
-      rugged (~> 0.21, >= 0.21.4)
-      slop (~> 3.5)
-    oxidized-script (0.6.0)
-      oxidized (~> 0.25)
-      slop (~> 3.5)
+      bcrypt_pbkdf (~> 1.0)
+      ed25519 (~> 1.2)
+      net-ssh (~> 7.1)
+      net-telnet (~> 0.2)
+      rugged (~> 1.6)
+      slop (~> 4.6)
    oxidized-web (0.13.1)
      charlock_holmes (~> 0.7.5)
      emk-sinatra-url-for (~> 0.2)
@ -38,16 +46,17 @@ GEM
      sass (~> 3.3)
      sinatra (~> 1.4, >= 1.4.6)
      sinatra-contrib (~> 1.4, >= 1.4.6)
+    psych (3.3.4)
    puma (3.11.4)
-    rack (1.6.11)
+    rack (1.6.13)
    rack-protection (1.5.5)
      rack
    rack-test (0.7.0)
      rack (>= 1.0, < 3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
      ffi (~> 1.0)
-    rugged (0.28.1)
+    rugged (1.6.3)
    sass (3.7.4)
      sass-listen (~> 4.0.0)
    sass-listen (4.0.0)
@ -64,17 +73,18 @@ GEM
      rack-test
      sinatra (~> 1.4.0)
      tilt (>= 1.3, < 3)
-    slop (3.6.0)
-    temple (0.8.1)
-    tilt (2.0.9)
+    slop (4.10.1)
+    temple (0.10.1)
+    tilt (2.1.0)

 PLATFORMS
-  ruby
+  x86_64-linux

 DEPENDENCIES
-  oxidized (= 0.26.3)
-  oxidized-script (= 0.6.0)
+  oxidized (= 0.29.1)
+  oxidized-script!
  oxidized-web (= 0.13.1)
+  psych (~> 3.3.2)

 BUNDLED WITH
-   2.1.4
+   2.3.26
--- a/pkgs/tools/admin/oxidized/default.nix
+++ b/pkgs/tools/admin/oxidized/default.nix
@ -6,7 +6,7 @@ bundlerApp {

  inherit ruby;

-  exes = [ "oxidized" "oxidized-web" "oxidized-script" ];
+  exes = [ "oxidized" "oxs" ];

  passthru.updateScript = bundlerUpdateScript "oxidized";

@ -14,7 +14,7 @@ bundlerApp {
    description = "A network device configuration backup tool. It's a RANCID replacement!";
    homepage    = "https://github.com/ytti/oxidized";
    license     = licenses.asl20;
-    maintainers = with maintainers; [ willibutz nicknovitski ];
+    maintainers = with maintainers; [ willibutz nicknovitski netali ];
    platforms   = platforms.linux;
  };
 }
--- a/pkgs/tools/admin/oxidized/gemset.nix
+++ b/pkgs/tools/admin/oxidized/gemset.nix
@ -4,30 +4,50 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1zkr8cbp8klanqmhzz7qmimzlxh6zmsy98zb3s75af34l7znq790";
+      sha256 = "0li09rcpgc21ymfayvhnjwvfl10s75g8aj52973gk0gvygscrhah";
      type = "gem";
    };
-    version = "0.3.0";
+    version = "0.4.0";
  };
  backports = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn";
+      sha256 = "1f3zcy0q88rw3clk0r7bai7sp4r253lndf0qmdgczq1ykbm219w3";
      type = "gem";
    };
-    version = "3.14.0";
+    version = "3.24.1";
+  };
+  bcrypt_pbkdf = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445";
+      type = "gem";
+    };
+    version = "1.1.0";
  };
  charlock_holmes = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
+      sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p";
      type = "gem";
    };
-    version = "0.7.6";
+    version = "0.7.7";
+  };
+  ed25519 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji";
+      type = "gem";
+    };
+    version = "1.3.0";
  };
  emk-sinatra-url-for = {
    dependencies = ["sinatra"];
@ -45,20 +65,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
+      sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
      type = "gem";
    };
-    version = "1.10.0";
-  };
-  git = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bf83icwypi3p3pd97vlqbnp3hvf31ncd440m9kh9y7x6yk74wyh";
-      type = "gem";
-    };
-    version = "1.5.0";
+    version = "1.15.5";
  };
  haml = {
    dependencies = ["temple" "tilt"];
@ -66,10 +76,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac";
+      sha256 = "035fgbfr20m08w4603ls2lwqbggr0vy71mijz0p68ib1am394xbf";
      type = "gem";
    };
-    version = "5.0.4";
+    version = "5.2.2";
  };
  htmlentities = {
    groups = ["default"];
@ -86,60 +96,62 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
+      sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
      type = "gem";
    };
-    version = "2.2.0";
+    version = "2.6.3";
  };
  multi_json = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
+      sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
      type = "gem";
    };
-    version = "1.13.1";
+    version = "1.15.0";
  };
  net-ssh = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40";
+      sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687";
      type = "gem";
    };
-    version = "5.2.0";
+    version = "7.1.0";
  };
  net-telnet = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx";
+      sha256 = "16nkxc79nqm7fd6w1fba4kb98vpgwnyfnlwxarpdcgywz300fc15";
      type = "gem";
    };
-    version = "0.1.1";
+    version = "0.2.0";
  };
  oxidized = {
-    dependencies = ["asetus" "git" "net-ssh" "net-telnet" "rugged" "slop"];
+    dependencies = ["asetus" "bcrypt_pbkdf" "ed25519" "net-ssh" "net-telnet" "rugged" "slop"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "07hpxmdjkfpkc00ln3hhh5qkj0lyhcmgbi0jza2c8cnjyy9sc73x";
+      sha256 = "1ww8iv89zvklnvq9cv2lb6wyb5y73hinzm6xgd21za4204aanlps";
      type = "gem";
    };
-    version = "0.26.3";
+    version = "0.29.1";
  };
  oxidized-script = {
    dependencies = ["oxidized" "slop"];
    groups = ["default"];
    platforms = [];
    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15cxsyaz2mwd7jj63gfv3lzyqkvb3gz29wxfy7xyjdzkc19c7vk6";
-      type = "gem";
+      fetchSubmodules = false;
+      rev = "988cded5d89f52e274afb545bd3e011e19d5d22d";
+      sha256 = "13vglj6w37xd6dqfn98xdan3kqbs460akj1rdr4bm7lsrpa281gf";
+      type = "git";
+      url = "https://github.com/ytti/oxidized-script.git";
    };
    version = "0.6.0";
  };
@ -154,6 +166,16 @@
    };
    version = "0.13.1";
  };
+  psych = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "186i2hc6sfvg4skhqf82kxaf4mb60g65fsif8w8vg1hc9mbyiaph";
+      type = "gem";
+    };
+    version = "3.3.4";
+  };
  puma = {
    groups = ["default"];
    platforms = [];
@ -169,10 +191,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
+      sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0";
      type = "gem";
    };
-    version = "1.6.11";
+    version = "1.6.13";
  };
  rack-protection = {
    dependencies = ["rack"];
@ -201,10 +223,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
+      sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423";
      type = "gem";
    };
-    version = "0.10.3";
+    version = "0.11.2";
  };
  rb-inotify = {
    dependencies = ["ffi"];
@ -212,20 +234,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4";
+      sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
      type = "gem";
    };
-    version = "0.10.0";
+    version = "0.10.1";
  };
  rugged = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
+      sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in";
      type = "gem";
    };
-    version = "0.28.1";
+    version = "1.6.3";
  };
  sass = {
    dependencies = ["sass-listen"];
@ -276,29 +298,29 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n";
+      sha256 = "1iyrjskgxyn8i1679qwkzns85p909aq77cgx2m4fs5ygzysj4hw4";
      type = "gem";
    };
-    version = "3.6.0";
+    version = "4.10.1";
  };
  temple = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "158d7ygbwcifqnvrph219p7m78yjdjazhykv5darbkms7bxm5y09";
+      sha256 = "1jj8lny5hp8gm920k73r6xpb40j5mpiw1dcr8g5id4hxjggkw8by";
      type = "gem";
    };
-    version = "0.8.1";
+    version = "0.10.1";
  };
  tilt = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
+      sha256 = "1qmhi6d9przjzhsyk9g5pq2j75c656msh6xzprqd2mxgphf23jxs";
      type = "gem";
    };
-    version = "2.0.9";
+    version = "2.1.0";
  };
 }
--- a/pkgs/tools/networking/ockam/default.nix
+++ b/pkgs/tools/networking/ockam/default.nix
@ -12,7 +12,7 @@

 let
  pname = "ockam";
-  version = "0.87.0";
+  version = "0.88.0";
 in
 rustPlatform.buildRustPackage {
  inherit pname version;
@ -21,10 +21,10 @@ rustPlatform.buildRustPackage {
    owner = "build-trust";
    repo = pname;
    rev = "ockam_v${version}";
-    sha256 = "sha256-cg1DsQADhNK5xKKly7F7I4pIc5Ku91niCb6rUwOpAO4=";
+    sha256 = "sha256-M7lDXgQ1ofzg6LwI9ZcvtzjWyKuon+hdtxKmLqyOQpc=";
  };

-  cargoHash = "sha256-eUvWh7o3zhbs8hF2aiLpdkKWVAu7CvyqVvr+bhd5PLI=";
+  cargoHash = "sha256-ZTTfxndoTOgtg6rWVEPv5vmdNxdn7wPXXwTDVJoTc+c=";
  nativeBuildInputs = [ git pkg-config ];
  buildInputs = [ openssl dbus ]
    ++ lib.optionals stdenv.isDarwin [ Security ];
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@ -178,8 +178,8 @@ in lib.makeExtensible (self: {
  };

  nix_2_15 = common {
-    version = "2.15.0";
-    sha256 = "sha256-hNHfvmb1bIWwqFT5nesQgwh4V0OlyZHxj5ZVSQbZ+p4=";
+    version = "2.15.1";
+    sha256 = "sha256-o7bxsNeq2LF6/dTl+lT2k50bSItkID80/uoZYVtlxro=";
  };

  stable = self.nix_2_13;
--- a/pkgs/tools/security/grype/default.nix
+++ b/pkgs/tools/security/grype/default.nix
@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "grype";
-  version = "0.62.1";
+  version = "0.62.2";

  src = fetchFromGitHub {
    owner = "anchore";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-DuM4hgM8jXFSoNQv8wI5Mkpzy37txNey1CSeMJH888s=";
+    hash = "sha256-11uxu9oa0lSZH+zd+Uj2P9flw9wp9UD7bXKP4jxXDoE=";
    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
    leaveDotGit = true;
@ -28,7 +28,7 @@ buildGoModule rec {

  proxyVendor = true;

-  vendorHash = "sha256-GSVKeaAf4/6SWHdh+zRhFnzyJ4tv4yGGh0YfKTa0aLQ=";
+  vendorHash = "sha256-n0daAFCP0KtS1mQGfq/EQv2m6c8jjdbFR6YWSeClHBg=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -1705,6 +1705,8 @@ with pkgs;

  shell-genie = callPackage  ../applications/misc/shell-genie { };

+  snagboot = python3.pkgs.callPackage  ../applications/misc/snagboot { };
+
  simple-dlna-browser = callPackage ../tools/networking/simple-dlna-browser { };

  sorted-grep = callPackage ../tools/text/sorted-grep { };
@ -18882,6 +18884,8 @@ with pkgs;
      else llvmPackages.stdenv;
  };

+  moon = callPackage ../development/tools/build-managers/moon/default.nix { };
+
  msgpack-tools = callPackage ../development/tools/msgpack-tools { };

  msgpuck = callPackage ../development/libraries/msgpuck { };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -126,6 +126,8 @@ self: super: with self; {

  aioairzone = callPackage ../development/python-modules/aioairzone { };

+  aioairzone-cloud = callPackage ../development/python-modules/aioairzone-cloud { };
+
  aioairq = callPackage ../development/python-modules/aioairq { };

  aioaladdinconnect = callPackage ../development/python-modules/aioaladdinconnect { };
@ -7784,6 +7786,8 @@ self: super: with self; {

  pyzbar = callPackage ../development/python-modules/pyzbar { };

+  pyzipper = callPackage ../development/python-modules/pyzipper { };
+
  pkutils = callPackage ../development/python-modules/pkutils { };

  plac = callPackage ../development/python-modules/plac { };
@ -13108,6 +13112,8 @@ self: super: with self; {

  xknx = callPackage ../development/python-modules/xknx { };

+  xknxproject = callPackage ../development/python-modules/xknxproject { };
+
  xlib = callPackage ../development/python-modules/xlib { };

  xlrd = callPackage ../development/python-modules/xlrd { };