Merge master into staging-next

nixos/doc/manual/release-notes/rl-2411.section.md

@@ -44,6 +44,8 @@
 
 - [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable) service.
 
+- [Gancio](https://gancio.org/), a shared agenda for local communities. Available as [services.gancio](#opt-services.gancio.enable).
+
 - [Goatcounter](https://www.goatcounter.com/), Easy web analytics. No tracking of personal data. Available as [services.goatcounter](options.html#opt-services.goatcocunter.enable).
 
 - [UWSM](https://github.com/Vladimir-csp/uwsm), a wayland session manager to wrap Wayland Compositors into useful systemd units such as `graphical-session.target`. Available as [programs.uwsm](#opt-programs.uwsm.enable).
@@ -458,6 +460,8 @@
 
 - Kanidm previously had an incorrect systemd service type, causing dependent units with an `after` and `requires` directive to start before `kanidm*` finished startup. The module has now been updated in line with upstream recommendations.
 
+- The kubelet configuration file can now be amended with arbitrary additional content using the `services.kubernetes.kubelet.extraConfig` option.
+
 - To facilitate dependency injection, the `imgui` package now builds a static archive using vcpkg' CMake rules.
   The derivation now installs "impl" headers selectively instead of by a wildcard.
   Use `imgui.src` if you just want to access the unpacked sources.

nixos/modules/module-list.nix

@@ -1411,6 +1411,7 @@
   ./services/web-apps/fluidd.nix
   ./services/web-apps/freshrss.nix
   ./services/web-apps/galene.nix
+  ./services/web-apps/gancio.nix
   ./services/web-apps/gerrit.nix
   ./services/web-apps/glance.nix
   ./services/web-apps/gotify-server.nix

nixos/modules/services/cluster/kubernetes/kubelet.nix

@@ -66,6 +66,7 @@ let
     // lib.optionalAttrs (cfg.clusterDomain != "")  { clusterDomain = cfg.clusterDomain; }
     // lib.optionalAttrs (cfg.clusterDns != [])     { clusterDNS = cfg.clusterDns; }
     // lib.optionalAttrs (cfg.featureGates != {})   { featureGates = cfg.featureGates; }
+    // lib.optionalAttrs (cfg.extraConfig != {})    cfg.extraConfig
   ));
 
   manifestPath = "kubernetes/manifests";
@@ -184,6 +185,12 @@ in
       type = separatedString " ";
     };
 
+    extraConfig = mkOption {
+      description = "Kubernetes kubelet extra configuration file entries.";
+      default = {};
+      type = attrsOf attrs;
+    };
+
     featureGates = mkOption {
       description = "Attribute set of feature gate";
       default = top.featureGates;

nixos/modules/services/network-filesystems/samba.nix

@@ -106,13 +106,39 @@ in
       '';
 
       settings = lib.mkOption {
-        type = lib.types.submodule { freeformType = settingsFormat.type; };
+        type = lib.types.submodule {
-        default = {};
+          freeformType = settingsFormat.type;
+          options = {
+            global.security = lib.mkOption {
+              type = lib.types.enum [ "auto" "user" "domain" "ads" ];
+              default = "user";
+              description = "Samba security type.";
+            };
+            global."invalid users" = lib.mkOption {
+              type = lib.types.listOf lib.types.str;
+              default = [ "root" ];
+              description = "List of users who are denied to login via Samba.";
+              apply = x: lib.concatStringsSep " " x;
+            };
+            global."passwd program" = lib.mkOption {
+              type = lib.types.str;
+              default = "/run/wrappers/bin/passwd %u";
+              description = "Path to a program that can be used to set UNIX user passwords.";
+            };
+          };
+        };
+        default = {
+          "global" = {
+            "security" = "user";
+            "passwd program" = "/run/wrappers/bin/passwd %u";
+            "invalid users" = [ "root" ];
+          };
+        };
         example = {
           "global" = {
             "security" = "user";
             "passwd program" = "/run/wrappers/bin/passwd %u";
-            "invalid users" = "root";
+            "invalid users" = [ "root" ];
           };
           "public" = {
             "path" = "/srv/public";

nixos/modules/services/web-apps/gancio.nix

@@ -0,0 +1,280 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.gancio;
+  settingsFormat = pkgs.formats.json { };
+  inherit (lib)
+    mkEnableOption
+    mkPackageOption
+    mkOption
+    types
+    literalExpression
+    mkIf
+    optional
+    mapAttrsToList
+    concatStringsSep
+    concatMapStringsSep
+    getExe
+    mkMerge
+    mkDefault
+    ;
+in
+{
+  options.services.gancio = {
+    enable = mkEnableOption "Gancio, a shared agenda for local communities";
+
+    package = mkPackageOption pkgs "gancio" { };
+
+    plugins = mkOption {
+      type = with types; listOf package;
+      default = [ ];
+      example = literalExpression "[ pkgs.gancioPlugins.telegram-bridge ]";
+      description = ''
+        Paths of gancio plugins to activate (linked under $WorkingDirectory/plugins/).
+      '';
+    };
+
+    user = mkOption {
+      type = types.str;
+      description = "The user (and PostgreSQL database name) used to run the gancio server";
+      default = "gancio";
+    };
+
+    settings = mkOption rec {
+      type = types.submodule {
+        freeformType = settingsFormat.type;
+        options = {
+          hostname = mkOption {
+            type = types.str;
+            description = "The domain name under which the server is reachable.";
+          };
+          baseurl = mkOption {
+            type = types.str;
+            default = "";
+            example = "/gancio";
+            description = "The URL path under which the server is reachable.";
+          };
+          server = {
+            host = mkOption {
+              type = types.str;
+              default = "localhost";
+              example = "::";
+              description = ''
+                The address (IPv4, IPv6 or DNS) for the gancio server to listen on.
+              '';
+            };
+            port = mkOption {
+              type = types.port;
+              default = 13120;
+              description = ''
+                Port number of the gancio server to listen on.
+              '';
+            };
+          };
+          db = {
+            dialect = mkOption {
+              type = types.enum [
+                "sqlite"
+                "postgres"
+              ];
+              default = "sqlite";
+              description = ''
+                The database dialect to use
+              '';
+            };
+            storage = mkOption {
+              description = ''
+                Location for the SQLite database.
+              '';
+              readOnly = true;
+              type = types.nullOr types.str;
+              default = if cfg.settings.db.dialect == "sqlite" then "/var/lib/gancio/db.sqlite" else null;
+              defaultText = ''
+                if cfg.settings.db.dialect == "sqlite" then "/var/lib/gancio/db.sqlite" else null
+              '';
+            };
+            host = mkOption {
+              description = ''
+                Connection string for the PostgreSQL database
+              '';
+              readOnly = true;
+              type = types.nullOr types.str;
+              default = if cfg.settings.db.dialect == "postgres" then "/run/postgresql" else null;
+              defaultText = ''
+                if cfg.settings.db.dialect == "postgres" then "/run/postgresql" else null
+              '';
+            };
+            database = mkOption {
+              description = ''
+                Name of the PostgreSQL database
+              '';
+              readOnly = true;
+              type = types.nullOr types.str;
+              default = if cfg.settings.db.dialect == "postgres" then cfg.user else null;
+              defaultText = ''
+                if cfg.settings.db.dialect == "postgres" then cfg.user else null
+              '';
+            };
+          };
+          log_level = mkOption {
+            description = "Gancio log level.";
+            type = types.enum [
+              "debug"
+              "info"
+              "warning"
+              "error"
+            ];
+            default = "info";
+          };
+          # FIXME upstream proper journald logging
+          log_path = mkOption {
+            description = "Directory Gancio logs into";
+            readOnly = true;
+            type = types.str;
+            default = "/var/log/gancio";
+          };
+        };
+      };
+      description = ''
+        Configuration for Gancio, see <https://gancio.org/install/config> for supported values.
+      '';
+    };
+
+    userLocale = mkOption {
+      type = with types; attrsOf (attrsOf (attrsOf str));
+      default = { };
+      example = {
+        en.register.description = "My new registration page description";
+      };
+      description = ''
+        Override default locales within gancio.
+        See [https://framagit.org/les/gancio/tree/master/locales](default languages and locales).
+      '';
+    };
+
+    nginx = mkOption {
+      type = types.submodule (import ../web-servers/nginx/vhost-options.nix { inherit config lib; });
+      default = { };
+      example = {
+        enableACME = true;
+        forceSSL = true;
+      };
+      description = "Extra configuration for the nginx virtual host of gancio.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+
+    users.users.gancio = lib.mkIf (cfg.user == "gancio") {
+      isSystemUser = true;
+      group = cfg.user;
+      home = "/var/lib/gancio";
+    };
+    users.groups.gancio = lib.mkIf (cfg.user == "gancio") { };
+
+    systemd.tmpfiles.settings."10-gancio" =
+      let
+        rules = {
+          mode = "0755";
+          user = cfg.user;
+          group = config.users.users.${cfg.user}.group;
+        };
+      in
+      {
+        "/var/lib/gancio/user_locale".d = rules;
+        "/var/lib/gancio/plugins".d = rules;
+      };
+
+    systemd.services.gancio =
+      let
+        configFile = settingsFormat.generate "gancio-config.json" cfg.settings;
+      in
+      {
+        description = "Gancio server";
+        documentation = [ "https://gancio.org/" ];
+
+        wantedBy = [ "multi-user.target" ];
+        after = [
+          "network.target"
+        ] ++ optional (cfg.settings.db.dialect == "postgres") "postgresql.service";
+
+        environment = {
+          NODE_ENV = "production";
+        };
+
+        preStart = ''
+          # We need this so the gancio executable run by the user finds the right settings.
+          ln -sf ${configFile} config.json
+
+          rm -f user_locale/*
+          ${concatStringsSep "\n" (
+            mapAttrsToList (
+              l: c: "ln -sf ${settingsFormat.generate "gancio-${l}-locale.json" c} user_locale/${l}.json"
+            ) cfg.userLocale
+          )}
+
+          rm -f plugins/*
+          ${concatMapStringsSep "\n" (p: "ln -sf ${p} plugins/") cfg.plugins}
+        '';
+
+        serviceConfig = {
+          ExecStart = "${getExe cfg.package} start ${configFile}";
+          StateDirectory = "gancio";
+          WorkingDirectory = "/var/lib/gancio";
+          LogsDirectory = "gancio";
+          User = cfg.user;
+          # hardening
+          RestrictRealtime = true;
+          RestrictNamespaces = true;
+          LockPersonality = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectKernelLogs = true;
+          ProtectControlGroups = true;
+          ProtectClock = true;
+          RestrictSUIDSGID = true;
+          SystemCallArchitectures = "native";
+          CapabilityBoundingSet = "";
+          ProtectProc = "invisible";
+        };
+      };
+
+    services.postgresql = mkIf (cfg.settings.db.dialect == "postgres") {
+      enable = true;
+      ensureDatabases = [ cfg.user ];
+      ensureUsers = [
+        {
+          name = cfg.user;
+          ensureDBOwnership = true;
+        }
+      ];
+    };
+
+    services.nginx = {
+      enable = true;
+      virtualHosts."${cfg.settings.hostname}" = mkMerge [
+        cfg.nginx
+        {
+          enableACME = mkDefault true;
+          forceSSL = mkDefault true;
+          locations = {
+            "/" = {
+              index = "index.html";
+              tryFiles = "$uri $uri @proxy";
+            };
+            "@proxy" = {
+              proxyWebsockets = true;
+              proxyPass = "http://${cfg.settings.server.host}:${toString cfg.settings.server.port}";
+              recommendedProxySettings = true;
+            };
+          };
+        }
+      ];
+    };
+  };
+}

nixos/tests/all-tests.nix

@@ -364,6 +364,7 @@ in {
   ft2-clone = handleTest ./ft2-clone.nix {};
   legit = handleTest ./legit.nix {};
   mimir = handleTest ./mimir.nix {};
+  gancio = handleTest ./gancio.nix {};
   garage = handleTest ./garage {};
   gemstash = handleTest ./gemstash.nix {};
   geoserver = runTest ./geoserver.nix;

nixos/tests/gancio.nix

@@ -0,0 +1,87 @@
+import ./make-test-python.nix (
+  { pkgs, ... }:
+  let
+    extraHosts = ''
+      192.168.13.12 agenda.example.com
+    '';
+  in
+  {
+    name = "gancio";
+    meta.maintainers = with pkgs.lib.maintainers; [ jbgi ];
+
+    nodes = {
+      server =
+        { pkgs, ... }:
+        {
+          networking = {
+            interfaces.eth1 = {
+              ipv4.addresses = [
+                {
+                  address = "192.168.13.12";
+                  prefixLength = 24;
+                }
+              ];
+            };
+            inherit extraHosts;
+            firewall.allowedTCPPorts = [ 80 ];
+          };
+          environment.systemPackages = [ pkgs.gancio ];
+          services.gancio = {
+            enable = true;
+            settings = {
+              hostname = "agenda.example.com";
+              db.dialect = "postgres";
+            };
+            plugins = [ pkgs.gancioPlugins.telegram-bridge ];
+            userLocale = {
+              en = {
+                register = {
+                  description = "My new registration page description";
+                };
+              };
+            };
+            nginx = {
+              enableACME = false;
+              forceSSL = false;
+            };
+          };
+        };
+
+      client =
+        { pkgs, ... }:
+        {
+          environment.systemPackages = [ pkgs.jq ];
+          networking = {
+            interfaces.eth1 = {
+              ipv4.addresses = [
+                {
+                  address = "192.168.13.1";
+                  prefixLength = 24;
+                }
+              ];
+            };
+            inherit extraHosts;
+          };
+        };
+    };
+
+    testScript = ''
+      start_all()
+
+      server.wait_for_unit("postgresql")
+      server.wait_for_unit("gancio")
+      server.wait_for_unit("nginx")
+      server.wait_for_open_port(13120)
+      server.wait_for_open_port(80)
+
+      # Check can create user via cli
+      server.succeed("cd /var/lib/gancio && sudo -u gancio gancio users create admin dummy admin")
+
+      # Check event list is returned
+      client.wait_until_succeeds("curl --verbose --fail-with-body http://agenda.example.com/api/events", timeout=30)
+
+      server.shutdown()
+      client.shutdown()
+    '';
+  }
+)

nixos/tests/sourcehut/nodes/common.nix

@@ -44,37 +44,37 @@ in
       pgp-privkey = toString (pkgs.writeText "sourcehut.pgp-privkey" ''
         -----BEGIN PGP PRIVATE KEY BLOCK-----
 
-        lFgEYqDRORYJKwYBBAHaRw8BAQdAehGoy36FUx2OesYm07be2rtLyvR5Pb/ltstd
+        lFgEZrFBKRYJKwYBBAHaRw8BAQdAS1Ffiytk0h0z0jfaT3qyiDUV/plVIUwOg1Yr
-        Gk7hYQoAAP9X4oPmxxrHN8LewBpWITdBomNqlHoiP7mI0nz/BOPJHxEktDZuaXhv
+        AXP2YmsAAP0W6QMC3G2G41rzCGLeSHeGibor1+XuxvcwUpVdW7ge+BH/tDZuaXhv
         cy90ZXN0cy9zb3VyY2VodXQgPHJvb3QraHV0QHNvdXJjZWh1dC5sb2NhbGRvbWFp
-        bj6IlwQTFgoAPxYhBPqjgjnL8RHN4JnADNicgXaYm0jJBQJioNE5AhsDBQkDwmcA
+        bj6IkwQTFgoAOxYhBMISh2Z08FCi969cq9R2wSP9QF2bBQJmsUEpAhsDBQsJCAcC
-        BgsJCAcDCgUVCgkICwUWAwIBAAIeBQIXgAAKCRDYnIF2mJtIySVCAP9e2nHsVHSi
+        AiICBhUKCQgLAgQWAgMBAh4HAheAAAoJENR2wSP9QF2b4JMA+wQLdxVcod/ppyvH
-        2B1YGZpVG7Xf36vxljmMkbroQy+0gBPwRwEAq+jaiQqlbGhQ7R/HMFcAxBIVsq8h
+        QguGqqhkpk8KquCddOuFnQVAfHFWAQCK5putVk4mGzsoLTbOJCSGRC4pjEktZawQ
-        Aw1rngsUd0o3dAicXQRioNE5EgorBgEEAZdVAQUBAQdAXZV2Sd5ZNBVTBbTGavMv
+        MTqJmnOuC5xdBGaxQSkSCisGAQQBl1UBBQEBB0Aed6UYJyighTY+KuPNQ439st3x
-        D6ORrUh8z7TI/3CsxCE7+yADAQgHAAD/c1RU9xH+V/uI1fE7HIn/zL0LUPpsuce2
+        x04T1j58sx3AnKgYewMBCAcAAP9WLB79HO1zFRqTCnk7GIEWWogMFKVpazeBUNu9
-        cH++g4u3kBgTOYh+BBgWCgAmFiEE+qOCOcvxEc3gmcAM2JyBdpibSMkFAmKg0TkC
+        h9rzCA2+iHgEGBYKACAWIQTCEodmdPBQovevXKvUdsEj/UBdmwUCZrFBKQIbDAAK
-        GwwFCQPCZwAACgkQ2JyBdpibSMlKagD/cTre6p1m8QuJ7kwmCFRSz5tBzIuYMMgN
+        CRDUdsEj/UBdmwgJAQDVk/px/pSzqreSeDLzxlb6dOo+N1KcicsJ0akhSJUcvwD9
-        xtT7dmS91csA/35fWsOykSiFRojQ7ccCSUTHL7ApF2EbL968tP/D2hIG
+        EPhpEDZu/UBKchAutOhWwz+y6pyoF4Vt7XG+jbJQtA4=
-        =Hjoc
+        =KaQc
         -----END PGP PRIVATE KEY BLOCK-----
       '');
       pgp-pubkey = pkgs.writeText "sourcehut.pgp-pubkey" ''
         -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-        mDMEYqDRORYJKwYBBAHaRw8BAQdAehGoy36FUx2OesYm07be2rtLyvR5Pb/ltstd
+        mDMEZrFBKRYJKwYBBAHaRw8BAQdAS1Ffiytk0h0z0jfaT3qyiDUV/plVIUwOg1Yr
-        Gk7hYQq0Nm5peG9zL3Rlc3RzL3NvdXJjZWh1dCA8cm9vdCtodXRAc291cmNlaHV0
+        AXP2Ymu0Nm5peG9zL3Rlc3RzL3NvdXJjZWh1dCA8cm9vdCtodXRAc291cmNlaHV0
-        LmxvY2FsZG9tYWluPoiXBBMWCgA/FiEE+qOCOcvxEc3gmcAM2JyBdpibSMkFAmKg
+        LmxvY2FsZG9tYWluPoiTBBMWCgA7FiEEwhKHZnTwUKL3r1yr1HbBI/1AXZsFAmax
-        0TkCGwMFCQPCZwAGCwkIBwMKBRUKCQgLBRYDAgEAAh4FAheAAAoJENicgXaYm0jJ
+        QSkCGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQ1HbBI/1AXZvgkwD7
-        JUIA/17acexUdKLYHVgZmlUbtd/fq/GWOYyRuuhDL7SAE/BHAQCr6NqJCqVsaFDt
+        BAt3FVyh3+mnK8dCC4aqqGSmTwqq4J1064WdBUB8cVYBAIrmm61WTiYbOygtNs4k
-        H8cwVwDEEhWyryEDDWueCxR3Sjd0CLg4BGKg0TkSCisGAQQBl1UBBQEBB0BdlXZJ
+        JIZELimMSS1lrBAxOomac64LuDgEZrFBKRIKKwYBBAGXVQEFAQEHQB53pRgnKKCF
-        3lk0FVMFtMZq8y8Po5GtSHzPtMj/cKzEITv7IAMBCAeIfgQYFgoAJhYhBPqjgjnL
+        Nj4q481Djf2y3fHHThPWPnyzHcCcqBh7AwEIB4h4BBgWCgAgFiEEwhKHZnTwUKL3
-        8RHN4JnADNicgXaYm0jJBQJioNE5AhsMBQkDwmcAAAoJENicgXaYm0jJSmoA/3E6
+        r1yr1HbBI/1AXZsFAmaxQSkCGwwACgkQ1HbBI/1AXZsICQEA1ZP6cf6Us6q3kngy
-        3uqdZvELie5MJghUUs+bQcyLmDDIDcbU+3ZkvdXLAP9+X1rDspEohUaI0O3HAklE
+        88ZW+nTqPjdSnInLCdGpIUiVHL8A/RD4aRA2bv1ASnIQLrToVsM/suqcqBeFbe1x
-        xy+wKRdhGy/evLT/w9oSBg==
+        vo2yULQO
-        =pJD7
+        =luxZ
         -----END PGP PUBLIC KEY BLOCK-----
       '';
-      pgp-key-id = "0xFAA38239CBF111CDE099C00CD89C8176989B48C9";
+      pgp-key-id = "0xC212876674F050A2F7AF5CABD476C123FD405D9B";
     };
   };
 

pkgs/applications/audio/audacity/default.nix

@@ -62,13 +62,13 @@
 
 stdenv.mkDerivation rec {
   pname = "audacity";
-  version = "3.6.1";
+  version = "3.6.2";
 
   src = fetchFromGitHub {
     owner = "audacity";
     repo = "audacity";
     rev = "Audacity-${version}";
-    hash = "sha256-MZ/u4wUUhDo1Mm9jxOY4MtzeV2797meT4HjYi5bCSM0=";
+    hash = "sha256-x3UeZM00kmZB3IG9EBx1jssyWmC3gcYTPtwMmJNSzgM=";
   };
 
   postPatch = ''

pkgs/applications/audio/reaper/default.nix

@@ -92,7 +92,6 @@ stdenv.mkDerivation rec {
 
     mkdir $out/bin
     ln -s $out/opt/REAPER/reaper $out/bin/
-    ln -s $out/opt/REAPER/reamote-server $out/bin/
 
     runHook postInstall
   '';

pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix

@@ -451,6 +451,13 @@ let
 
         orgit-forge = buildWithGit super.orgit-forge;
 
+        ormolu = super.ormolu.overrideAttrs (attrs: {
+          postPatch = attrs.postPatch or "" + ''
+            substituteInPlace ormolu.el \
+              --replace-fail 'ormolu-process-path "ormolu"' 'ormolu-process-path "${lib.getExe pkgs.ormolu}"'
+          '';
+        });
+
         ox-rss = buildWithGit super.ox-rss;
 
         python-isort = super.python-isort.overrideAttrs (attrs: {

pkgs/applications/editors/texmaker/default.nix

@@ -1,17 +1,40 @@
-{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler, wrapGAppsHook3 }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  cmake,
+  pkg-config,
+  wrapQtAppsHook,
+  poppler,
+  qtbase,
+  qttools,
+  qtwebengine,
+  qt5compat,
+  zlib
+}:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "texmaker";
-  version = "5.1.4";
+  version = "6.0.0";
 
   src = fetchurl {
-    url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2";
+    url = "http://www.xm1math.net/texmaker/texmaker-${version}.tar.bz2";
-    sha256 = "sha256-MgUE1itxtZHAa30LEgKsdQoxEv4soyjjBYAFXrMI/qY=";
+    hash = "sha256-l3zlgOJcGrbgvD2hA74LQ+v2C4zg0nJzEE/df1hhd/w=";
   };
 
-  buildInputs = [ qtbase qtscript poppler zlib qtwebengine ];
+  buildInputs = [
-  nativeBuildInputs = [ pkg-config poppler qmake wrapGAppsHook3 ];
+    poppler
-  env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
+    qtbase
+    qtwebengine
+    qt5compat
+    qttools
+    zlib
+  ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapQtAppsHook
+  ];
 
   qmakeFlags = [
     "DESKTOPDIR=${placeholder "out"}/share/applications"
@@ -19,15 +42,9 @@ mkDerivation rec {
     "METAINFODIR=${placeholder "out"}/share/metainfo"
   ];
 
-  dontWrapGApps = true;
-
-  preFixup = ''
-    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
   meta = with lib; {
     description = "TeX and LaTeX editor";
-    longDescription=''
+    longDescription = ''
       This editor is a full fledged IDE for TeX and
       LaTeX editing with completion, structure viewer, preview,
       spell checking and support of any compilation chain.
@@ -35,7 +52,10 @@ mkDerivation rec {
     homepage = "http://www.xm1math.net/texmaker/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ cfouche markuskowa ];
+    maintainers = with maintainers; [
+      cfouche
+      markuskowa
+    ];
     mainProgram = "texmaker";
   };
 }

pkgs/applications/science/molecular-dynamics/gromacs/default.nix

@@ -45,8 +45,8 @@ let
       }
     else
       {
-        version = "2024.2";
+        version = "2024.3";
-        hash = "sha256-gCp+M18uiVdw9XsVnk7DaOuw/yzm2sz3BsboAlw2hSs=";
+        hash = "sha256-u9oFbuWTkL59WNhME6nsDU42NWF63y63RwNJIsuh8Ck=";
       };
 
 in stdenv.mkDerivation rec {

pkgs/applications/video/mkvtoolnix/default.nix

@@ -49,13 +49,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mkvtoolnix";
-  version = "86.0";
+  version = "87.0";
 
   src = fetchFromGitLab {
     owner = "mbunkus";
     repo = "mkvtoolnix";
     rev = "release-${version}";
-    hash = "sha256-h9rVs4A7JihnCj15XUus9xMvShKWyYhJN/90v/fl0PE=";
+    hash = "sha256-UU57ZgH1sxCXspwfKXScw08aJYiv+k526U8q8N1tA+4=";
   };
 
   nativeBuildInputs = [

pkgs/applications/virtualization/singularity/packages.nix

@@ -9,14 +9,14 @@ let
     callPackage
       (import ./generic.nix rec {
         pname = "apptainer";
-        version = "1.3.3";
+        version = "1.3.4";
         projectName = "apptainer";
 
         src = fetchFromGitHub {
           owner = "apptainer";
           repo = "apptainer";
           rev = "refs/tags/v${version}";
-          hash = "sha256-xQZCQa9z1aJ2tVtxMlwcNhlm0EV/nn8OnbfaVZRm4JI=";
+          hash = "sha256-eByF0OpL1OKGq0wY7kw8Sv9sZuVE0K3TGIm4Chk9PC4=";
         };
 
         # Update by running
@@ -47,20 +47,20 @@ let
     callPackage
       (import ./generic.nix rec {
         pname = "singularity-ce";
-        version = "4.1.5";
+        version = "4.2.0";
         projectName = "singularity";
 
         src = fetchFromGitHub {
           owner = "sylabs";
           repo = "singularity";
           rev = "refs/tags/v${version}";
-          hash = "sha256-klOnQAJfVsohJKeQbNaW6PzQ7ejhO281+vcDMoJ4WMk=";
+          hash = "sha256-CxHbUke0Y9BDnyqTRZZqNtU006XGxFj3gond1BaYZO0=";
         };
 
         # Update by running
         # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules"
         # at the root directory of the Nixpkgs repository
-        vendorHash = "sha256-NyNNTe2X5OuDun6xNiRLGzvUxcRM4S7fD68I+I6IMKs=";
+        vendorHash = "sha256-R4hMg5TX5YXtnBopl7CYYCwA540BAx98/aaNfLpExV4=";
 
         # Do not build conmon and squashfuse from the Git submodule sources,
         # Use Nixpkgs provided version

pkgs/by-name/al/albert/package.nix

@@ -2,19 +2,12 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  qt6,
   cmake,
   libqalculate,
   muparser,
   libarchive,
   python3Packages,
-  qtbase,
-  qtscxml,
-  qtsvg,
-  qtdeclarative,
-  qtwayland,
-  qt5compat,
-  qttools,
-  wrapQtAppsHook,
   nix-update-script,
   pkg-config,
 }:
@@ -34,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs =
@@ -42,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: {
       libqalculate
       libarchive
       muparser
-      qtbase
+      qt6.qtbase
-      qtscxml
+      qt6.qtscxml
-      qtsvg
+      qt6.qtsvg
-      qtdeclarative
+      qt6.qtdeclarative
-      qtwayland
+      qt6.qtwayland
-      qt5compat
+      qt6.qt5compat
-      qttools
+      qt6.qttools
     ]
     ++ (with python3Packages; [
       python

pkgs/by-name/au/authentik/ldap.nix

@@ -4,7 +4,7 @@ buildGoModule {
   pname = "authentik-ldap-outpost";
   inherit (authentik) version src;
 
-  vendorHash = "sha256-hxtyXyCfVemsjYQeo//gd68x4QO/4Vcww8i2ocsUVW8=";
+  vendorHash = "sha256-BcL9QAc2jJqoPaQImJIFtCiu176nxmVcCLPjXjNBwqI=";
 
   CGO_ENABLED = 0;
 

pkgs/by-name/au/authentik/package.nix

@@ -14,13 +14,13 @@
 , makeWrapper }:
 
 let
-  version = "2024.6.1";
+  version = "2024.6.4";
 
   src = fetchFromGitHub {
     owner = "goauthentik";
     repo = "authentik";
     rev = "version/${version}";
-    hash = "sha256-SMupiJGJbkBn33JP4WLF3IsBdt3SN3JvZg/EYlz443g=";
+    hash = "sha256-QwK/auMLCJEHHtyexFnO+adCq/u0fezHQ90fXW9J4c4=";
   };
 
   meta = with lib; {
@@ -87,7 +87,7 @@ let
       ln -s ${src}/website $out/
       ln -s ${clientapi} $out/web/node_modules/@goauthentik/api
     '';
-    npmDepsHash = "sha256-v9oD8qV5UDJeZn4GZDEPlVM/jGVSeTqdIUDJl6tYXZw=";
+    npmDepsHash = "sha256-8TzB3ylZzVLePD86of8E/lGgIQCciWMQF9m1Iqv9ZTY=";
 
     postPatch = ''
       cd web
@@ -383,7 +383,7 @@ let
 
     CGO_ENABLED = 0;
 
-    vendorHash = "sha256-hxtyXyCfVemsjYQeo//gd68x4QO/4Vcww8i2ocsUVW8=";
+    vendorHash = "sha256-BcL9QAc2jJqoPaQImJIFtCiu176nxmVcCLPjXjNBwqI=";
 
     postInstall = ''
       mv $out/bin/server $out/bin/authentik

pkgs/by-name/au/authentik/radius.nix

@@ -4,7 +4,7 @@ buildGoModule {
   pname = "authentik-radius-outpost";
   inherit (authentik) version src;
 
-  vendorHash = "sha256-hxtyXyCfVemsjYQeo//gd68x4QO/4Vcww8i2ocsUVW8=";
+  vendorHash = "sha256-BcL9QAc2jJqoPaQImJIFtCiu176nxmVcCLPjXjNBwqI=";
 
   CGO_ENABLED = 0;
 

pkgs/by-name/ch/chirp/package.nix

@@ -10,13 +10,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "chirp";
-  version = "0.4.0-unstable-2024-08-31";
+  version = "0.4.0-unstable-2024-09-05";
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "fddaaa00e3baa3c4e854ab88ab46fd3b4ced3a62";
+    rev = "f9f5afa33388d3b05af75b40195b6a45a19df9a2";
-    hash = "sha256-KPdv8E0ZaLK49H2Q749UaLYIXdiplIKTrbkD7+KTAYg=";
+    hash = "sha256-wpUtSXSmT9SgwKMYeto7jJGK7ZEFQ/t37wWjUMB86YQ=";
   };
   buildInputs = [
     glib

pkgs/by-name/di/diesel-cli/package.nix

@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
 
 rustPlatform.buildRustPackage rec {
   pname = "diesel-cli";
-  version = "2.2.3";
+  version = "2.2.4";
 
   src = fetchCrate {
     inherit version;
     crateName = "diesel_cli";
-    hash = "sha256-pv75bvswi+JfeL7B8GPaQgXyNdNvzNgXs9VYgzKRn2U=";
+    hash = "sha256-kTwAG1B4gy+1jj5ar5RkmIUMAO9wYsG7QnMcZii/OZk=";
   };
 
-  cargoHash = "sha256-BMMh4BEoB1UhavoiQWfFhsSZsvfFSfEJhEewjA1ukLQ=";
+  cargoHash = "sha256-qcyNFuKJldHVJDAye4K1rHPf/SvpZ+BmqBast1vh/3Q=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/es/eslint/package.nix

@@ -2,24 +2,35 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
+  stdenv,
+  overrideSDK,
 }:
-
+let
-buildNpmPackage rec {
+  buildNpmPackage' = buildNpmPackage.override {
+    stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
+  };
+in
+buildNpmPackage' rec {
   pname = "eslint";
-  version = "9.9.1";
+  version = "9.10.0";
 
   src = fetchFromGitHub {
     owner = "eslint";
     repo = "eslint";
     rev = "refs/tags/v${version}";
-    hash = "sha256-n07a50bigglwr3ItZqbyQxu0mPZawTSVunwIe8goJBQ=";
+    hash = "sha256-R5DO4xN3PkwGAIfyMkohs9SvFiLjWf1ddOwkY6wbsjA=";
   };
 
+  # NOTE: Generating lock-file
+  # arch = [ x64 arm64 ]
+  # platform = [ darwin linux]
+  # npm install --package-lock-only --arch=<arch> --platform=<os>
+  # darwin seems to generate a cross platform compatible lockfile
   postPatch = ''
     cp ${./package-lock.json} package-lock.json
   '';
 
-  npmDepsHash = "sha256-/E1JUsbPyHzWJ4kuNRg/blYRaAdATYbk+jnJFJyzHLE=";
+  npmDepsHash = "sha256-Nrcld0ONfjdSh/ItdbDMp6dXVFKoj83aaoGXDgoNE60=";
 
   dontNpmBuild = true;
   dontNpmPrune = true;

pkgs/by-name/ga/gancio/package.json

@@ -0,0 +1,145 @@
+{
+  "name": "gancio",
+  "version": "1.19.0",
+  "description": "A shared agenda for local communities",
+  "author": "lesion",
+  "scripts": {
+    "build": "nuxt build --modern",
+    "start:inspect": "NODE_ENV=production node --inspect node_modules/.bin/nuxt start --modern",
+    "dev": "nuxt dev",
+    "dev:inspect": "node --inspect node_modules/.bin/nuxt dev",
+    "test-sqlite": "export NODE_ENV=test; export DB=sqlite; jest --forceExit --runInBand --bail=1 --testTimeout=10000",
+    "test-mariadb": "export NODE_ENV=test; export DB=mariadb; jest  --runInBand  --bail=1",
+    "test-postgresql": "export NODE_ENV=test; export DB=postgresql; jest  --runInBand  --bail=1",
+    "start": "nuxt start --modern",
+    "doc": "cd docs && bundle exec jekyll b",
+    "doc:dev": "cd docs && bundle exec jekyll s --drafts",
+    "migrate": "NODE_ENV=production sequelize db:migrate",
+    "migrate:dev": "sequelize db:migrate",
+    "analyze": "nuxt build --analyze",
+    "build:wc": "cd webcomponents; yarn build:lib; cp dist/gancio-events.js ../wp-plugin/js/gancio-events.es.js; cp dist/gancio-events.js ../assets/gancio-events.es.js; cp dist/gancio-events.js ../docs/assets/js/gancio-events.es.js; cp dist/gancio-events.js ../static/gancio-events.es.js;"
+  },
+  "files": [
+    "server/",
+    "assets/",
+    "modules/",
+    "nuxt.config.js",
+    "static/",
+    "views/",
+    "locales/email/",
+    "locales/",
+    "store/",
+    ".nuxt/",
+    "gancio_plugins",
+    "yarn.lock"
+  ],
+  "engines": {
+    "node": ">=14 <=22"
+  },
+  "dependencies": {
+    "@mdi/js": "^7.4.47",
+    "@nuxtjs/auth": "^4.9.1",
+    "@nuxtjs/axios": "^5.13.6",
+    "@nuxtjs/i18n": "^7.3.1",
+    "@nuxtjs/sitemap": "^2.4.0",
+    "@peertube/http-signature": "^1.7.0",
+    "accept-language": "^3.0.18",
+    "bcryptjs": "^2.4.3",
+    "body-parser": "^2.0.0-beta.2",
+    "cookie-parser": "^1.4.6",
+    "cookie-session": "^2.1.0",
+    "cookie-universal-nuxt": "^2.2.2",
+    "cors": "^2.8.5",
+    "dayjs": "^1.11.11",
+    "dompurify": "^3.1.5",
+    "email-templates": "^11.1.1",
+    "express": "^4.19.2",
+    "express-async-errors": "^3.1.1",
+    "express-rate-limit": "^7.3.1",
+    "https-proxy-agent": "^7.0.4",
+    "ical.js": "^2.0.1",
+    "ics": "^3.7.6",
+    "jsdom": "^24.1.0",
+    "leaflet": "^1.9.4",
+    "linkify-html": "^4.1.3",
+    "linkifyjs": "4.1.3",
+    "lodash": "^4.17.21",
+    "luxon": "^3.4.4",
+    "mariadb": "^2.5.6",
+    "memory-cache": "^0.2.0",
+    "microformat-node": "^2.0.4",
+    "minify-css-string": "^1.0.0",
+    "mkdirp": "^3.0.1",
+    "multer": "^1.4.5-lts.1",
+    "nuxt-edge": "2.17.2-28258581.6132947",
+    "oauth2orize": "^1.12.0",
+    "passport": "^0.7.0",
+    "passport-anonymous": "^1.0.1",
+    "passport-custom": "^1.1.1",
+    "passport-http": "^0.3.0",
+    "passport-http-bearer": "^1.0.1",
+    "passport-oauth2-client-password": "^0.1.2",
+    "passport-oauth2-client-public": "^0.0.1",
+    "pg": "^8.12.0",
+    "semver": "^7.6.2",
+    "sequelize": "^6.37.3",
+    "sequelize-slugify": "^1.6.2",
+    "sharp": "^0.27.2",
+    "sqlite3": "^5.1.7",
+    "telegraf": "^4.16.3",
+    "tiptap": "^1.32.2",
+    "tiptap-extensions": "^1.35.2",
+    "umzug": "^2.3.0",
+    "v-calendar": "^2.4.2",
+    "vue2-leaflet": "^2.7.1",
+    "vuetify": "2.6.14",
+    "winston": "^3.13.0",
+    "winston-daily-rotate-file": "^5.0.0",
+    "yargs": "^17.7.2"
+  },
+  "devDependencies": {
+    "@nuxtjs/vuetify": "^1.12.3",
+    "@vue/language-plugin-pug": "^1.8.27",
+    "jest": "^29.7.0",
+    "jest-environment-node": "^29.7.0",
+    "prettier": "^2.8.8",
+    "pug": "^3.0.3",
+    "pug-plain-loader": "^1.1.0",
+    "sass": "^1.77.6",
+    "sequelize-cli": "^6.6.2",
+    "supertest": "^6.3.4",
+    "webpack": "^4.47.0",
+    "webpack-cli": "^4.10.0"
+  },
+  "resolutions": {
+    "vue": "2.7.16",
+    "vue-template-compiler": "2.7.16",
+    "vue-server-renderer": "2.7.16"
+  },
+  "bin": {
+    "gancio": "server/cli.js"
+  },
+  "bugs": {
+    "email": "lesion@autistici.org",
+    "url": "https://framagit.org/les/gancio/issues"
+  },
+  "homepage": "https://gancio.org",
+  "keywords": [
+    "AP",
+    "gancio",
+    "events",
+    "federation",
+    "activitypub",
+    "event",
+    "server",
+    "self-host",
+    "app"
+  ],
+  "license": "AGPL-3.0",
+  "repository": {
+    "type": "git",
+    "url": "https://framagit.org/les/gancio"
+  },
+  "snyk": true,
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+}

pkgs/by-name/ga/gancio/package.nix

@@ -0,0 +1,101 @@
+{
+  mkYarnPackage,
+  fetchFromGitLab,
+  fetchYarnDeps,
+  python3,
+  pkg-config,
+  nodePackages,
+  node-gyp,
+  vips,
+  lib,
+  nixosTests,
+}:
+mkYarnPackage rec {
+  inherit (nodePackages) nodejs;
+  version = "1.19.0";
+
+  src = fetchFromGitLab {
+    domain = "framagit.org";
+    owner = "les";
+    repo = "gancio";
+    rev = "v${version}";
+    hash = "sha256-cMUM7jqLsrw57gySiIK7DBZA7lPiXL2HAadMk+7wkzs=";
+  };
+
+  offlineCache = fetchYarnDeps {
+    yarnLock = src + "/yarn.lock";
+    hash = "sha256-ONPvBvT3zf8IVkIEOmiQgcjI7zPCFwDuQfo+fOvDGzM=";
+  };
+
+  packageJSON = ./package.json;
+
+  # for pkg-config dependencies:
+  yarnPreBuild = ''
+    export npm_config_nodedir=${nodePackages.nodejs}
+  '';
+  # So that sqlite can be found:
+  pkgConfig.sqlite3 = {
+    nativeBuildInputs = [
+      pkg-config
+      nodePackages.prebuild-install
+      node-gyp
+      python3
+    ];
+    postInstall = ''
+      yarn --offline run install
+    '';
+  };
+  # Sharp need to find a vips library
+  pkgConfig.sharp = {
+    nativeBuildInputs = [
+      pkg-config
+      python3
+      node-gyp
+      nodePackages.semver
+    ];
+    buildInputs = [ vips ];
+    postInstall = ''
+      yarn --offline run install
+    '';
+  };
+
+  # build need a writeable node_modules
+  configurePhase = ''
+    runHook preConfigure
+
+    cp -r $node_modules node_modules
+    chmod -R +w node_modules
+
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    export HOME=$(mktemp -d)
+    yarn --offline build
+    yarn --offline pack --filename gancio.tgz
+    mkdir -p deps/gancio
+    tar -C deps/gancio/ --strip-components=1 -xf gancio.tgz
+    rm gancio.tgz
+
+    runHook postBuild
+  '';
+
+  passthru = {
+    updateScript = ./update.sh;
+    tests = {
+      inherit (nixosTests) gancio;
+    };
+  };
+
+  meta = {
+    description = "Shared agenda for local communities, running on nodejs";
+    homepage = "https://gancio.org/";
+    changelog = "https://framagit.org/les/gancio/-/raw/master/CHANGELOG.md";
+    license = lib.licenses.agpl3Plus;
+    platforms = lib.platforms.linux;
+    mainProgram = "gancio";
+    maintainers = with lib.maintainers; [ jbgi ];
+  };
+}

pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix

@@ -0,0 +1,45 @@
+{
+  mkYarnPackage,
+  nodejs,
+  fetchFromGitLab,
+  fetchYarnDeps,
+  lib,
+}:
+mkYarnPackage rec {
+  inherit nodejs;
+  version = "1.0.4";
+
+  src = fetchFromGitLab {
+    domain = "framagit.org";
+    owner = "bcn.convocala";
+    repo = "gancio-plugin-telegram-bridge";
+    rev = "v${version}";
+    hash = "sha256-Da8PxCX1Z1dKJu9AiwdRDfb1r1P2KiZe8BClYB9Rz48=";
+  };
+
+  offlineCache = fetchYarnDeps {
+    inherit yarnLock;
+    hash = "sha256-BcRVmVA5pnFzpg2gN/nKLzENnoEdwrE0EgulDizq8Ok=";
+  };
+
+  packageJSON = ./package.json;
+
+  # upstream doesn't provide a yarn.lock file
+  yarnLock = ./yarn.lock;
+
+  doDist = false;
+
+  postInstall = ''
+    rmdir $out/bin
+    ln -s $out/libexec/gancio-plugin-telegram/deps/gancio-plugin-telegram/index.js $out/
+    ln -s $out/libexec/gancio-plugin-telegram/node_modules $out/
+  '';
+
+  meta = {
+    description = "Telegram bridge for Gancio, republishes content to Telegram channels or groups";
+    homepage = "https://framagit.org/bcn.convocala/gancio-plugin-telegram-bridge";
+    license = lib.licenses.agpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ jbgi ];
+  };
+}

pkgs/by-name/ga/gancio/plugin-telegram-bridge/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "gancio-plugin-telegram",
+  "version": "1.0.1",
+  "description": "Telegram bridge plugin for Gancio",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "AGPL-3.0-or-later",
+  "dependencies": {
+    "telegraf": "^4.8.5",
+    "dompurify": "^3.0.2",
+    "jsdom": "^21.1.0"
+  }
+}

pkgs/by-name/ga/gancio/plugin-telegram-bridge/yarn.lock

@@ -0,0 +1,452 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@telegraf/types@^6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@telegraf/types/-/types-6.9.1.tgz#ee2d335164f582db55337d77cc440c1faeadd510"
+  integrity sha512-bzqwhicZq401T0e09tu8b1KvGfJObPmzKU/iKCT5V466AsAZZWQrBYQ5edbmD1VZuHLEwopoOVY5wPP4HaLtug==
+
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
+abab@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
+  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
+
+abort-controller@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
+  dependencies:
+    event-target-shim "^5.0.0"
+
+acorn-globals@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3"
+  integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==
+  dependencies:
+    acorn "^8.1.0"
+    acorn-walk "^8.0.2"
+
+acorn-walk@^8.0.2:
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.1.tgz#2f10f5b69329d90ae18c58bf1fa8fccd8b959a43"
+  integrity sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==
+
+acorn@^8.1.0, acorn@^8.8.2:
+  version "8.11.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
+
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
+
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==
+
+combined-stream@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+cssstyle@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-3.0.0.tgz#17ca9c87d26eac764bb8cfd00583cff21ce0277a"
+  integrity sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==
+  dependencies:
+    rrweb-cssom "^0.6.0"
+
+data-urls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-4.0.0.tgz#333a454eca6f9a5b7b0f1013ff89074c3f522dd4"
+  integrity sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==
+  dependencies:
+    abab "^2.0.6"
+    whatwg-mimetype "^3.0.0"
+    whatwg-url "^12.0.0"
+
+debug@4, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+decimal.js@^10.4.3:
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
+  integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
+
+domexception@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
+  integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==
+  dependencies:
+    webidl-conversions "^7.0.0"
+
+dompurify@^3.0.2:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.8.tgz#e0021ab1b09184bc8af7e35c7dd9063f43a8a437"
+  integrity sha512-b7uwreMYL2eZhrSCRC4ahLTeZcPZxSmYfmcQGXGkXiZSNW1X85v+SDM5KsWcpivIiUBH47Ji7NtyUdpLeF5JZQ==
+
+entities@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
+escodegen@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17"
+  integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^5.2.0"
+    esutils "^2.0.2"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+esprima@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+estraverse@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+event-target-shim@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
+
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
+html-encoding-sniffer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
+  integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==
+  dependencies:
+    whatwg-encoding "^2.0.0"
+
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+  dependencies:
+    "@tootallnate/once" "2"
+    agent-base "6"
+    debug "4"
+
+https-proxy-agent@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
+iconv-lite@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
+is-potential-custom-element-name@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
+
+jsdom@^21.1.0:
+  version "21.1.2"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.1.2.tgz#6433f751b8718248d646af1cdf6662dc8a1ca7f9"
+  integrity sha512-sCpFmK2jv+1sjff4u7fzft+pUh2KSUbUrEHYHyfSIbGTIcmnjyp83qg6qLwdJ/I3LpTXx33ACxeRL7Lsyc6lGQ==
+  dependencies:
+    abab "^2.0.6"
+    acorn "^8.8.2"
+    acorn-globals "^7.0.0"
+    cssstyle "^3.0.0"
+    data-urls "^4.0.0"
+    decimal.js "^10.4.3"
+    domexception "^4.0.0"
+    escodegen "^2.0.0"
+    form-data "^4.0.0"
+    html-encoding-sniffer "^3.0.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.1"
+    is-potential-custom-element-name "^1.0.1"
+    nwsapi "^2.2.4"
+    parse5 "^7.1.2"
+    rrweb-cssom "^0.6.0"
+    saxes "^6.0.0"
+    symbol-tree "^3.2.4"
+    tough-cookie "^4.1.2"
+    w3c-xmlserializer "^4.0.0"
+    webidl-conversions "^7.0.0"
+    whatwg-encoding "^2.0.0"
+    whatwg-mimetype "^3.0.0"
+    whatwg-url "^12.0.1"
+    ws "^8.13.0"
+    xml-name-validator "^4.0.0"
+
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
+mime-types@^2.1.12:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
+mri@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
+  integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+node-fetch@^2.6.8:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+nwsapi@^2.2.4:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30"
+  integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==
+
+p-timeout@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-4.1.0.tgz#788253c0452ab0ffecf18a62dff94ff1bd09ca0a"
+  integrity sha512-+/wmHtzJuWii1sXn3HCuH/FTwGhrp4tmJTxSKJbfS+vkipci6osxXM5mY0jUiRzWKMTgUT8l7HFbeSwZAynqHw==
+
+parse5@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
+  integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
+  dependencies:
+    entities "^4.4.0"
+
+psl@^1.1.33:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
+
+punycode@^2.1.1, punycode@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
+
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
+
+rrweb-cssom@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1"
+  integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==
+
+safe-compare@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/safe-compare/-/safe-compare-1.1.4.tgz#5e0128538a82820e2e9250cd78e45da6786ba593"
+  integrity sha512-b9wZ986HHCo/HbKrRpBJb2kqXMK9CEWIE1egeEvZsYn69ay3kdfl9nG3RyOcR+jInTDf7a86WQ1d4VJX7goSSQ==
+  dependencies:
+    buffer-alloc "^1.2.0"
+
+"safer-buffer@>= 2.1.2 < 3.0.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+sandwich-stream@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/sandwich-stream/-/sandwich-stream-2.0.2.tgz#6d1feb6cf7e9fe9fadb41513459a72c2e84000fa"
+  integrity sha512-jLYV0DORrzY3xaz/S9ydJL6Iz7essZeAfnAavsJ+zsJGZ1MOnsS52yRjU3uF3pJa/lla7+wisp//fxOwOH8SKQ==
+
+saxes@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
+  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
+  dependencies:
+    xmlchars "^2.2.0"
+
+source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+symbol-tree@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
+
+telegraf@^4.8.5:
+  version "4.15.3"
+  resolved "https://registry.yarnpkg.com/telegraf/-/telegraf-4.15.3.tgz#72e28e62c3cc7f97b88b5f1b04a0e0700a7df251"
+  integrity sha512-pm2ZQAisd0YlUvnq6xdymDfoQR++8wTalw0nfw7Tjy0va+V/0HaBLzM8kMNid8pbbt7GHTU29lEyA5CAAr8AqA==
+  dependencies:
+    "@telegraf/types" "^6.9.1"
+    abort-controller "^3.0.0"
+    debug "^4.3.4"
+    mri "^1.2.0"
+    node-fetch "^2.6.8"
+    p-timeout "^4.1.0"
+    safe-compare "^1.1.4"
+    sandwich-stream "^2.0.2"
+
+tough-cookie@^4.1.2:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
+  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
+  dependencies:
+    psl "^1.1.33"
+    punycode "^2.1.1"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
+
+tr46@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469"
+  integrity sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==
+  dependencies:
+    punycode "^2.3.0"
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+
+universalify@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
+  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
+
+url-parse@^1.5.3:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
+  dependencies:
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
+
+w3c-xmlserializer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
+  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
+  dependencies:
+    xml-name-validator "^4.0.0"
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
+
+webidl-conversions@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
+  integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
+
+whatwg-encoding@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
+  integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==
+  dependencies:
+    iconv-lite "0.6.3"
+
+whatwg-mimetype@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
+  integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
+
+whatwg-url@^12.0.0, whatwg-url@^12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c"
+  integrity sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==
+  dependencies:
+    tr46 "^4.1.1"
+    webidl-conversions "^7.0.0"
+
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+ws@^8.13.0:
+  version "8.16.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4"
+  integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==
+
+xml-name-validator@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
+  integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
+
+xmlchars@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==

pkgs/by-name/ga/gancio/plugins.nix

@@ -0,0 +1,4 @@
+{ callPackage, nodejs }:
+{
+  telegram-bridge = callPackage ./plugin-telegram-bridge { inherit nodejs; };
+}

pkgs/by-name/ga/gancio/update.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl common-updater-scripts jq nix prefetch-yarn-deps
+
+set -eux -o pipefail
+
+latest_version=$(curl -s https://framagit.org/api/v4/projects/48668/repository/tags | jq --raw-output  '.[0].name' | sed 's/^v//')
+
+nixFile=$(nix-instantiate --eval --strict -A "gancio.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
+nixFolder=$(dirname "$nixFile")
+
+curl -o "$nixFolder/package.json" -s "https://framagit.org/les/gancio/-/raw/v$latest_version/package.json"
+curl -o "$nixFolder/yarn.lock" -s "https://framagit.org/les/gancio/-/raw/v$latest_version/yarn.lock"
+
+old_yarn_hash=$(nix-instantiate --eval --strict -A "gancio.offlineCache.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g')
+new_yarn_hash=$(nix hash to-sri --type sha256 $(prefetch-yarn-deps "$nixFolder/yarn.lock"))
+sed -i "$nixFile" -re "s|\"$old_yarn_hash\"|\"$new_yarn_hash\"|"
+rm "$nixFolder/yarn.lock"
+
+update-source-version gancio "$latest_version"

pkgs/by-name/gh/gh-notify/package.nix

@@ -23,13 +23,13 @@ let
 in
 stdenvNoCC.mkDerivation {
   pname = "gh-notify";
-  version = "0-unstable-2024-04-24";
+  version = "0-unstable-2024-08-01";
 
   src = fetchFromGitHub {
     owner = "meiji163";
     repo = "gh-notify";
-    rev = "5c2db4cffe39f312d25979dc366f2bc219def9a2";
+    rev = "556df2eecdc0f838244a012759da0b76bcfeb2e7";
-    hash = "sha256-AgpNjeRz0RHf8D3ib7x1zixBxh32UUZJleub5W/suuM=";
+    hash = "sha256-WKv/1AW8wtl7kQ3PE7g2N0ELvdHtons7pYb0K8wsfWg=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/gm/gmic/package.nix

@@ -26,7 +26,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gmic";
-  version = "3.4.0";
+  version = "3.4.2";
 
   outputs = [ "out" "lib" "dev" "man" ];
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "GreycLab";
     repo = "gmic";
     rev = "v.${finalAttrs.version}";
-    hash = "sha256-uK/kgzlUvEAxRB8Wc3Inspv4/8vnjXrCilP1g/QMuCs=";
+    hash = "sha256-oyhwdX/eWbb5i7j/Aw7ocJk3KrGdxfKJx+P4Hzemlw8=";
   };
 
   # TODO: build this from source
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   gmic_stdlib = fetchurl {
     name = "gmic_stdlib_community.h";
     url = "https://gmic.eu/gmic_stdlib_community${lib.replaceStrings ["."] [""] finalAttrs.version}.h";
-    hash = "sha256-LoqK8ADwzPpxhy2GvaxVjGyYEHAbhspyoIXuBXCLRtQ=";
+    hash = "sha256-quzQ0g6kmbJFygUOlKdTn9Fe9J7jhlLOiNal1kX3iHY=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/hy/hyprland/info.json

@@ -1,7 +1,7 @@
 {
   "branch": "main",
-  "commit_hash": "9a09eac79b85c846e3a865a9078a3f8ff65a9259",
+  "commit_hash": "0f594732b063a90d44df8c5d402d658f27471dfe",
-  "commit_message": "props: bump version to 0.42.0",
+  "commit_message": "props: bump version to 0.43.0",
-  "date": "2024-08-07",
+  "date": "2024-09-08",
-  "tag": "v0.42.0"
+  "tag": "v0.43.0"
 }

pkgs/by-name/hy/hyprland/package.nix

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   pkg-config,
   makeWrapper,
   cmake,
@@ -11,34 +10,23 @@
   binutils,
   cairo,
   epoll-shim,
-  expat,
-  fribidi,
   git,
-  hwdata,
   hyprcursor,
   hyprlang,
   hyprutils,
   hyprwayland-scanner,
   jq,
   libGL,
-  libdatrie,
-  libdisplay-info,
   libdrm,
   libexecinfo,
   libinput,
-  libliftoff,
-  libselinux,
-  libsepol,
-  libthai,
   libuuid,
   libxkbcommon,
   mesa,
   pango,
   pciutils,
-  pcre2,
   pkgconf,
   python3,
-  seatd,
   systemd,
   tomlplusplus,
   wayland,
@@ -66,26 +54,19 @@ assert lib.assertMsg (!hidpiXWayland)
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprland" + lib.optionalString debug "-debug";
-  version = "0.42.0";
+  version = "0.43.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprland";
     fetchSubmodules = true;
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-deu8zvgseDg2gQEnZiCda4TrbA6pleE9iItoZlsoMtE=";
+    hash = "sha256-+wE97utoDfhQP6AMdZHUmBeL8grbce/Jv2i5M+6AbaE=";
   };
 
   patches = [
-    # Fixes broken OpenGL applications on Apple silicon (Asahi Linux)
+    # forces GCC to use -std=c++26 on CMake < 3.30
-    # Based on commit https://github.com/hyprwm/Hyprland/commit/279ec1c291021479b050c83a0435ac7076c1aee0
+    "${finalAttrs.src}/nix/stdcxx.patch"
-    ./asahi-fix.patch
-
-    # https://github.com/hyprwm/Hyprland/pull/7467
-    (fetchpatch {
-      url = "https://github.com/hyprwm/Hyprland/commit/a437e44a6af8e8f42966ffe3a26c1d562fce6b33.diff";
-      hash = "sha256-Y0P4rY6HyPN8Y5Kowlgyj0PiAHh6nqPRAQ4iFT0l4E8=";
-    })
   ];
 
   postPatch = ''
@@ -131,29 +112,18 @@ stdenv.mkDerivation (finalAttrs: {
     [
       aquamarine
       cairo
-      expat
-      fribidi
       git
-      hwdata
       hyprcursor.dev
       hyprlang
       hyprutils
       libGL
-      libdatrie
-      libdisplay-info
       libdrm
       libinput
-      libliftoff
-      libselinux
-      libsepol
-      libthai
       libuuid
       libxkbcommon
       mesa
       pango
       pciutils
-      pcre2
-      seatd
       tomlplusplus
       wayland
       wayland-protocols
@@ -164,9 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals enableXWayland [
       xorg.libxcb
       xorg.libXdmcp
-      xorg.xcbutil
       xorg.xcbutilerrors
-      xorg.xcbutilrenderutil
       xorg.xcbutilwm
       xwayland
     ]

pkgs/by-name/in/incus/lts.nix

@@ -2,7 +2,12 @@ import ./generic.nix {
   hash = "sha256-8GgzMiXn/78HkMuJ49cQA9BEQVAzPbG7jOxTScByR6Q=";
   version = "6.0.1";
   vendorHash = "sha256-dFg3LSG/ao73ODWcPDq5s9xUjuHabCMOB2AtngNCrlA=";
-  patches = [ ];
+  patches = [
+    # qemu 9.1 compat, remove when added to LTS
+    ./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch
+    ./58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch
+    ./0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch
+  ];
   lts = true;
   updateScriptArgs = "--lts=true --regex '6.0.*'";
 }

pkgs/by-name/ma/matrix-brandy/package.nix

@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "matrix-brandy";
-  version = "1.23.2";
+  version = "1.23.3";
 
   src = fetchFromGitHub {
     owner = "stardot";
     repo = "MatrixBrandy";
     rev = "V${version}";
-    hash = "sha256-alyg4AQ1nSISk3NwniTurRVWeUp1q/SQjK2loek8bfI=";
+    hash = "sha256-jw5SxCQ2flvCjO/JO3BHpnpt31wBsBxDkVH7uwVxTS0=";
   };
 
   buildInputs = [

pkgs/by-name/mu/museum/package.nix

@@ -7,7 +7,7 @@
 
 buildGoModule rec {
 
-  version = "photos-v0.9.30";
+  version = "photos-v0.9.35";
   pname = "museum";
 
   src = fetchFromGitHub {
@@ -15,7 +15,7 @@ buildGoModule rec {
     repo = "ente";
     sparseCheckout = [ "server" ];
     rev = version;
-    hash = "sha256-R85eI8n9jQB55l8V4881X74RGH3k0JhGS+phLBrZHvc=";
+    hash = "sha256-A/M2OhDzzOMGXnaqFFV9Z8bn/3HeZc50p2mIv++Q0uE=";
   };
 
   sourceRoot = "${src.name}/server";

pkgs/by-name/ni/nix-weather/package.nix

@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  pkg-config,
+  openssl,
+  darwin,
+  libiconv,
+  installShellFiles,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "nix-weather";
+  version = "0.0.3";
+
+  # fetch from GitHub and not upstream forgejo because cafkafk doesn't want to
+  # pay for bandwidth
+  src = fetchFromGitHub {
+    owner = "cafkafk";
+    repo = "nix-weather";
+    rev = "v${version}";
+    hash = "sha256-deVgDYYIv5SyKrkPAfPgbmQ/n4hYSrK2dohaiR5O0QE=";
+  };
+
+  cargoHash = "sha256-QJybGxqOJid1D6FTy7lvrakkB/Ss3P3JnXtU1UlGlW0=";
+  cargoExtraArgs = "-p nix-weather";
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs =
+    [
+      openssl
+      installShellFiles
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      libiconv
+      darwin.apple_sdk.frameworks.Security
+      darwin.apple_sdk.frameworks.SystemConfiguration
+    ];
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  # This is where `build.rs` puts manpages
+  MAN_OUT = "./man";
+
+  postInstall = ''
+    cd crates/nix-weather
+    installManPage man/nix-weather.1
+    installShellCompletion \
+      --fish man/nix-weather.fish \
+      --bash man/nix-weather.bash \
+      --zsh  man/_nix-weather
+    mkdir -p $out
+    cd ../..
+  '';
+
+  # We are the only distro that will ever package this, thus ryanbot will not
+  # be able to find updates through repology and we need this.
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "Check Cache Availablility of NixOS Configurations";
+    longDescription = ''
+      Fast rust tool to check availability of your entire system in caches. It
+      so to speak "checks the weather" before going to update. Useful for
+      debugging cache utilization and timing updates and deployments.
+
+      Heavily inspired by guix weather.
+    '';
+    homepage = "https://git.fem.gg/cafkafk/nix-weather";
+    changelog = "https://git.fem.gg/cafkafk/nix-weather/releases/tag/v${version}";
+    license = licenses.eupl12;
+    mainProgram = "nix-weather";
+    maintainers = with maintainers; [
+      cafkafk
+      freyacodes
+    ];
+    platforms = platforms.all;
+  };
+}

pkgs/by-name/op/opensplat/package.nix

@@ -18,7 +18,7 @@
   autoAddDriverRunpath,
 }:
 let
-  version = "1.1.3";
+  version = "1.1.4";
   torch = python3.pkgs.torch.override { inherit cudaSupport; };
   # Using a normal stdenv with cuda torch gives
   # ld: /nix/store/k1l7y96gv0nc685cg7i3g43i4icmddzk-python3.11-torch-2.2.1-lib/lib/libc10.so: undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32'
@@ -32,7 +32,7 @@ stdenv'.mkDerivation {
     owner = "pierotofy";
     repo = "OpenSplat";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2NcKb2SWU/vNsnd2KhdU85J60fJPuc44ZxIle/1UT6g=";
+    hash = "sha256-u2UmD0O3sUWELYb4CjQE19i4HUjLMcaWqOinQH0PPTM=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/pi/picom-pijulius/package.nix

@@ -9,13 +9,13 @@
 }:
 picom.overrideAttrs (previousAttrs: {
   pname = "picom-pijulius";
-  version = "8.2-unstable-2024-08-30";
+  version = "8.2-unstable-2024-09-08";
 
   src = fetchFromGitHub {
     owner = "pijulius";
     repo = "picom";
-    rev = "404652dfca5d6708e3a03e78b7e467550a4f7b62";
+    rev = "c7f7d6ed3858ca507ed8abd057d1039fc889940a";
-    hash = "sha256-VJLMnQpW24OXlCmLoAAkyNMtplzS+NKpUJzLHklkizU=";
+    hash = "sha256-LRUU516bfiN06mqLY7CWtrUmRubQ/ysPtciUNd/qGhA=";
   };
 
   buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ];

pkgs/by-name/ru/rustmission/package.nix

@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rustmission";
-  version = "0.4.3";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "intuis";
     repo = "rustmission";
     rev = "v${version}";
-    hash = "sha256-Vjbz3Yfcn14oVJ5+lRMYO09Zcim3xqpjWepkkRBD454=";
+    hash = "sha256-V9sy3rkoI3mKpeZjXT4D3Bs4NVETJ8h43iwOoDx1MKU=";
   };
 
-  cargoHash = "sha256-KHLf6Ime76NoEQDLRFFaCvhfqpL9T3h37SwqVv/T/5Q=";
+  cargoHash = "sha256-KYg+SVAvlQn77kI1gyzXlzhKgPECYPZKICnmkcEnuh8=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/se/serpl/package.nix

@@ -8,7 +8,7 @@
 }:
 let
   pname = "serpl";
-  version = "0.1.34";
+  version = "0.3.3";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -16,12 +16,12 @@ rustPlatform.buildRustPackage {
     owner = "yassinebridi";
     repo = "serpl";
     rev = version;
-    hash = "sha256-U6fcpFe95rM3GXu7OJhhGkpV1yQNUukqRpGeOtd8UhU=";
+    hash = "sha256-koD5aFqL+XVxc5Iq3reTYIHiPm0z7hAQ4K59IfbY4Hg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
-  cargoHash = "sha256-YAp7r7I/LX/4T93auGusTLPKpuZd3XzZ4HP6gOR0DZ0=";
+  cargoHash = "sha256-8XYEZQfoizVmOuh0hymzMj2UDiXNkSeHqBAWOqaMY84=";
 
   postFixup = ''
     # Serpl needs ripgrep to function properly.

pkgs/by-name/st/steampipe/package.nix

@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "steampipe";
-  version = "0.23.5";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe";
     rev = "refs/tags/v${version}";
-    hash = "sha256-8Ca5PD4BlaNn+2sQOUCU1CcHr4C/L+IdFcbj4eE4Fzc=";
+    hash = "sha256-9IrjxYJz/S3lR03LdFN81VPhIaHJ1USaiETLyS8bMFk=";
   };
 
-  vendorHash = "sha256-XpexUOUG8qw6Gb5galrnNIucheixHxT6astnI/6KIwE=";
+  vendorHash = "sha256-m4cgYDCugI7mCLCpRbVlNe0SeWZf1aVpeggufxw64oI=";
   proxyVendor = true;
 
   postPatch = ''

pkgs/by-name/tr/trealla/package.nix

@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
 ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "trealla";
-  version = "2.55.31";
+  version = "2.55.41";
 
   src = fetchFromGitHub {
     owner = "trealla-prolog";
     repo = "trealla";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-+hWi02CgibbtbuGKLsnLTXimDaoLd15yhQ/XehllsDk=";
+    hash = "sha256-T1FE8CZNOk3FKnykEwgEhScu6aNbcd5BQlXZOaAxjEo=";
   };
 
   postPatch = ''

pkgs/by-name/zo/zoraxy/package.nix

@@ -6,12 +6,12 @@
 
 buildGoModule rec {
   pname = "zoraxy";
-  version = "3.1.0";
+  version = "3.1.1";
   src = fetchFromGitHub {
     owner = "tobychui";
     repo = "zoraxy";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-96puPBMrJ2o6jO41KOr2+NnCgq0TEejLoAKRiXsPbEE=";
+    sha256 = "sha256-ZjsBGtY6M5jIXylzg4k8U4krwqx5d5VuMiVHAeUIbXY=";
   };
 
   sourceRoot = "${src.name}/src";

pkgs/development/libraries/pinocchio/default.nix

@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , casadi
 , cmake
 , boost
@@ -19,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pinocchio";
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "stack-of-tasks";
     repo = "pinocchio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-WgMqb+NHnaxW9/qSZ0UGI4zGxGjh12a5DwtdX9byBiw=";
+    hash = "sha256-8V+n1TwFojXKOVkGG8k9aXVadt2NBFlZKba93L+NRNU=";
   };
 
   # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277
@@ -34,19 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "add_pinocchio_unit_test(force)" ""
   '';
 
-  patches = [
-    # fix urdf & collision support on aarch64-darwin
-    (fetchpatch {
-      name = "static-pointer_cast.patch";
-      url = "https://github.com/stack-of-tasks/pinocchio/pull/2339/commits/ead869e8f3cce757851b9a011c4a2f55fb66582b.patch";
-      hash = "sha256-CkrWQJP/pPNs6B3a1FclfM7JWwkmsPzRumS46KQHv0s=";
-    })
-  ];
-
   postPatch = ''
     # example-robot-data models are used in checks.
     # Upstream provide them as git submodule, but we can use our own version instead.
-    rmdir models/example-robot-data
+    test -d models/example-robot-data && rmdir models/example-robot-data
     ln -s ${example-robot-data.src} models/example-robot-data
 
     # allow package:// uri use in examples
@@ -99,9 +89,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
-  pythonImportsCheck = lib.optionals (!pythonSupport) [
+  # pythonImportsCheck, but in stdenv.mkDerivation
-    "pinocchio"
+  postInstall = lib.optionalString pythonSupport ''
-  ];
+    PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH
+    python -c "import pinocchio"
+  '';
 
   meta = {
     description = "Fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives";

pkgs/development/python-modules/python-manilaclient/default.nix

@@ -10,7 +10,6 @@
   oslo-utils,
   prettytable,
   requests,
-  simplejson,
   setuptools,
   sphinxHook,
   sphinxcontrib-programoutput,
@@ -23,12 +22,12 @@
 
 buildPythonPackage rec {
   pname = "python-manilaclient";
-  version = "4.9.1";
+  version = "5.0.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TebykdG0fkeC+5Vs9eiwuJpXam41gg8gR4F2poYKDhI=";
+    hash = "sha256-Mk/MSEYj/poibXl+h318gN3rTuNC/ebhKYO3/ACA4II=";
   };
 
   build-system = [
@@ -48,7 +47,6 @@ buildPythonPackage rec {
     oslo-utils
     prettytable
     requests
-    simplejson
     babel
     osc-lib
     python-keystoneclient

pkgs/development/tools/build-managers/gradle/default.nix

@@ -161,9 +161,9 @@ rec {
   # https://docs.gradle.org/current/userguide/compatibility.html
 
   gradle_8 = gen {
-    version = "8.8";
+    version = "8.10";
     nativeVersion = "0.22-milestone-26";
-    hash = "sha256-pLQVhgH4Y2ze6rCb12r7ZAAwu1sUSq/iYaXorwJ9xhI=";
+    hash = "sha256-W5xes/n8LJSrrqV9kL14dHyhF927+WyFnTdBGBoSvyo=";
     defaultJava = jdk21;
   };
 

pkgs/misc/drivers/sc-controller/default.nix

@@ -8,13 +8,13 @@
 
 buildPythonApplication rec {
   pname = "sc-controller";
-  version = "0.4.8.18";
+  version = "0.4.8.21";
 
   src = fetchFromGitHub {
-    owner  = "C0rn3j";
+    owner = "C0rn3j";
-    repo   = pname;
+    repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-xSxAzvyBXfU7IzTWOXPPDBX4bTvbZ7RHUTtz3zwi7a8=";
+    hash = "sha256-XakbCuwjIAXYFZxvJsAlDIJEl09pwFPT12h04onXd34=";
   };
 
   nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ];
@@ -47,7 +47,7 @@ buildPythonApplication rec {
   '';
 
   meta = with lib; {
-    homepage    = "https://github.com/Ryochan7/sc-controller";
+    homepage    = "https://github.com/C0rn3j/sc-controller";
     # donations: https://www.patreon.com/kozec
     description = "User-mode driver and GUI for Steam Controller and other controllers";
     license     = licenses.gpl2Only;

pkgs/servers/home-automation/evcc/default.nix

@@ -16,16 +16,16 @@
 
 buildGo123Module rec {
   pname = "evcc";
-  version = "0.130.7";
+  version = "0.130.8";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     rev = version;
-    hash = "sha256-i5a6IKLLNKMDSUM64q8V0wo835mZomiW7ZptH6y+LDU=";
+    hash = "sha256-U6HQyHh9hei2mzCWQnGBFrJL2JRwFSo4AMbqSizJOEI=";
   };
 
-  vendorHash = "sha256-wAcapU6OAhsuceJrCa+caYr+po+nkl0+4Gc0QrFTvVk=";
+  vendorHash = "sha256-UsNx11WgQbBV8q5sREuLysud54MjfvXi5wvMKNJryns=";
 
   npmDeps = fetchNpmDeps {
     inherit src;
@@ -73,26 +73,7 @@ buildGo123Module rec {
     skippedTests = [
       # network access
       "TestOctopusConfigParse"
-      "TestTemplates/ac-elwa-2"
+      "TestTemplates"
-      "TestTemplates/allinpower"
-      "TestTemplates/electricitymaps"
-      "TestTemplates/elering"
-      "TestTemplates/energinet"
-      "TestTemplates/grünstromindex"
-      "TestTemplates/keba-modbus"
-      "TestTemplates/pun"
-      "TestTemplates/entsoe"
-      "TestTemplates/ngeso"
-      "TestTemplates/tibber"
-      "TestTemplates/groupe-e"
-      "TestTemplates/awattar"
-      "TestTemplates/energy-charts-api"
-      "TestTemplates/polestar"
-      "TestTemplates/sma-inverter-speedwire/battery"
-      "TestTemplates/sma-inverter-speedwire/pv"
-      "TestTemplates/smartenergy"
-      "TestTemplates/tibber-pulse/grid"
-
     ];
   in
   [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ];

pkgs/servers/web-apps/changedetection-io/default.nix

@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "changedetection-io";
-  version = "0.45.24";
+  version = "0.46.04";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "dgtlmoon";
     repo = "changedetection.io";
     rev = "refs/tags/${version}";
-    hash = "sha256-VltrcTbX95agV9JGV2KYGeZ6iUlgzrOsjShsUpiGfes=";
+    hash = "sha256-V1nGVURA4nksDX0kXxfPbO/rB0nmECqpfysenpzcfZs=";
   };
 
   postPatch = ''
@@ -30,6 +30,7 @@ python3.pkgs.buildPythonApplication rec {
     apprise
     beautifulsoup4
     brotli
+    babel
     chardet
     cryptography
     dnspython

pkgs/tools/package-management/akku/akku.nix

@@ -1,26 +1,20 @@
-{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, guile, curl, substituteAll }:
+{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, git, guile, curl }:
 stdenv.mkDerivation rec {
   pname = "akku";
-  version = "1.1.0";
+  version = "1.1.0-unstable-2024-03-03";
 
   src = fetchFromGitLab {
     owner = "akkuscm";
     repo = "akku";
-    rev = "v${version}";
+    rev = "cb996572fe0dbe74a42d2abeafadffaea2bf8ae3";
-    sha256 = "1pi18aamg1fd6f9ynfl7zx92052xzf0zwmhi2pwcwjs1kbah19f5";
+    sha256 = "sha256-6xqASnFxzz0yE5oJnh15SOB74PVrVkMVwS3PwKAmgks=";
   };
 
-  patches = [
-    # substitute libcurl path
-    (substituteAll {
-      src = ./hardcode-libcurl.patch;
-      libcurl = "${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary}";
-    })
-  ];
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
-  buildInputs = [ guile ];
+  # akku calls curl commands
+  buildInputs = [ guile curl git ];
 
   # Use a dummy package index to boostrap Akku
   preBuild = ''

pkgs/tools/package-management/akku/akkuDerivation.nix

@@ -18,8 +18,7 @@ stdenv.mkDerivation ({
     # only install the project
     rm -f Akku.lock Akku.manifest
 
-    # build, filter out guile warnings
+    akku install
-    akku install 2>&1 | grep -v "\(guile-user\)" - | cat
 
     # make sure akku metadata is present during testing and onwards
     echo $PWD $CHEZSCHEMELIBDIRS \

pkgs/tools/package-management/akku/overrides.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, akku, curl, git, substituteAll }:
+{ stdenv, lib, akku, curl, git }:
 let
   joinOverrides =
     overrides: pkg: old:
@@ -39,11 +39,14 @@ in
   };
 
   akku = joinOverrides [
+    # uses chez
     (addToBuildInputs [ curl git ])
     (pkg: old: {
-      # hardcode-libcurl
+      # bump akku to 1.1.0-unstable-2024-03-03
-      patches = akku.patches;
+      src = akku.src;
     })
+    # not a tar archive
+    (pkg: old: removeAttrs old [ "unpackPhase" ])
   ];
 
   # circular dependency on wak-trc-testing !?

pkgs/top-level/all-packages.nix

@@ -1621,8 +1621,6 @@ with pkgs;
   inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { }))
     akku akkuPackages;
 
-  albert = qt6Packages.callPackage ../applications/misc/albert { };
-
   alice-lg = callPackage ../servers/alice-lg{ };
 
   alice-tools = callPackage ../tools/games/alice-tools {
@@ -3649,6 +3647,10 @@ with pkgs;
 
   gams = callPackage ../tools/misc/gams (config.gams or {});
 
+  gancioPlugins = recurseIntoAttrs (
+    callPackage ../by-name/ga/gancio/plugins.nix { inherit (gancio) nodejs; }
+  );
+
   gem = callPackage ../applications/audio/pd-plugins/gem { };
 
   github-changelog-generator = callPackage ../development/tools/github-changelog-generator { };
@@ -5337,7 +5339,7 @@ with pkgs;
     cairo = cairo.override { xcbSupport = true; };  };
 
   hyprland = callPackage ../by-name/hy/hyprland/package.nix {
-    libliftoff = libliftoff_0_4;
+    stdenv = gcc14Stdenv;
   };
 
   hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { };
@@ -13068,7 +13070,7 @@ with pkgs;
     extraFonts = true;
   };
 
-  texmaker = libsForQt5.callPackage ../applications/editors/texmaker { };
+  texmaker = qt6Packages.callPackage ../applications/editors/texmaker { };
 
   texstudio = qt6Packages.callPackage ../applications/editors/texstudio { };