Merge staging-next into staging

2024-11-22 23:13:19 +00:00 · 2024-08-29 12:05:39 +00:00 · 2024-08-29 12:05:39 +00:00 · 5a1871826e
commit 5a1871826e
parent 6ea7566978 5702f5278f
53 changed files with 2052 additions and 542 deletions
--- a/maintainers/scripts/haskell/hydra-report.hs
+++ b/maintainers/scripts/haskell/hydra-report.hs
@ -1,6 +1,6 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -p "haskellPackages.ghcWithPackages (p: [p.aeson p.req])"
-#! nix-shell -p hydra-unstable
+#! nix-shell -p hydra
 #! nix-shell -i runhaskell

 {-
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@ -97,7 +97,7 @@ in
        '';
      };

-      package = mkPackageOption pkgs "hydra_unstable" { };
+      package = mkPackageOption pkgs "hydra" { };

      hydraURL = mkOption {
        type = types.str;
@ -466,6 +466,7 @@ in
        requires = [ "hydra-init.service" ];
        after = [ "hydra-init.service" ];
        restartTriggers = [ hydraConf ];
+        path = [ pkgs.zstd ];
        environment = env // {
          PGPASSFILE = "${baseDir}/pgpass-queue-runner";
          HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-notify";
@ -500,10 +501,15 @@ in
    # logs automatically after a step finishes, but this doesn't work
    # if the queue runner is stopped prematurely.
    systemd.services.hydra-compress-logs =
-      { path = [ pkgs.bzip2 ];
+      { path = [ pkgs.bzip2 pkgs.zstd ];
        script =
          ''
-            find /var/lib/hydra/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r bzip2 -v -f
+            set -eou pipefail
+            compression=$(sed -nr 's/compress_build_logs_compression = ()/\1/p' ${baseDir}/hydra.conf)
+            if [[ $compression == zstd ]]; then
+              compression="zstd --rm"
+            fi
+            find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r $compression --force --quiet
          '';
        startAt = "Sun 01:45";
      };
--- a/nixos/modules/services/web-apps/kasmweb/default.nix
+++ b/nixos/modules/services/web-apps/kasmweb/default.nix
@ -124,38 +124,31 @@ in
  };

  config = lib.mkIf cfg.enable {
-
    systemd.services = {
      "init-kasmweb" = {
        wantedBy = [
          "docker-kasm_db.service"
+          "podman-kasm_db.service"
        ];
-        before = [
-          "docker-kasm_db.service"
-          "docker-kasm_redis.service"
-          "docker-kasm_db_init.service"
-          "docker-kasm_api.service"
-          "docker-kasm_agent.service"
-          "docker-kasm_manager.service"
-          "docker-kasm_share.service"
-          "docker-kasm_guac.service"
-          "docker-kasm_proxy.service"
-        ];
+        wants = ["network-online.target"];
+        after = ["network-online.target"];
        serviceConfig = {
          Type = "oneshot";
+          TimeoutStartSec = 300;
          ExecStart = pkgs.substituteAll {
            src = ./initialize_kasmweb.sh;
            isExecutable = true;
-            binPath = lib.makeBinPath [ pkgs.docker pkgs.openssl pkgs.gnused ];
+            binPath = lib.makeBinPath [ pkgs.docker pkgs.openssl pkgs.gnused pkgs.yq-go ];
            runtimeShell = pkgs.runtimeShell;
            kasmweb = pkgs.kasmweb;
-            postgresUser = cfg.postgres.user;
-            postgresPassword = cfg.postgres.password;
+            postgresUser = "postgres";
+            postgresPassword = "postgres";
            inherit (cfg)
              datastorePath
              sslCertificate
              sslCertificateKey
              redisPassword
+              networkSubnet
              defaultUserPassword
              defaultAdminPassword
              defaultManagerToken
@ -167,12 +160,14 @@ in
    };

    virtualisation = {
+      oci-containers.backend = "docker";
      oci-containers.containers = {
        kasm_db = {
-          image = "postgres:12-alpine";
+          image = "postgres:16-alpine";
+          autoStart = true;
          environment = {
-            POSTGRES_PASSWORD = cfg.postgres.password;
-            POSTGRES_USER = cfg.postgres.user;
+            POSTGRES_PASSWORD = "postgres";
+            POSTGRES_USER = "postgres";
            POSTGRES_DB = "kasm";
          };
          volumes = [
@ -185,6 +180,7 @@ in
        kasm_db_init = {
          image = "kasmweb/api:${pkgs.kasmweb.version}";
          user = "root:root";
+          autoStart = true;
          volumes = [
            "${cfg.datastorePath}/:/opt/kasm/current/"
            "kasmweb_api_data:/tmp"
@ -197,6 +193,7 @@ in
        kasm_redis = {
          image = "redis:5-alpine";
          entrypoint = "/bin/sh";
+          autoStart = true;
          cmd = [
            "-c"
            "redis-server --requirepass ${cfg.redisPassword}"
@ -205,6 +202,7 @@ in
        };
        kasm_api = {
          image = "kasmweb/api:${pkgs.kasmweb.version}";
+          autoStart = false;
          user = "root:root";
          volumes = [
            "${cfg.datastorePath}/:/opt/kasm/current/"
@ -215,15 +213,17 @@ in
        };
        kasm_manager = {
          image = "kasmweb/manager:${pkgs.kasmweb.version}";
+          autoStart = false;
          user = "root:root";
          volumes = [
            "${cfg.datastorePath}/:/opt/kasm/current/"
          ];
-          dependsOn = [ "kasm_db" "kasm_api" ];
+          dependsOn = [ "kasm_db_init" "kasm_db" "kasm_api" ];
          extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only"];
        };
        kasm_agent = {
          image = "kasmweb/agent:${pkgs.kasmweb.version}";
+          autoStart = false;
          user = "root:root";
          volumes = [
            "${cfg.datastorePath}/:/opt/kasm/current/"
@ -236,15 +236,17 @@ in
        };
        kasm_share = {
          image = "kasmweb/share:${pkgs.kasmweb.version}";
+          autoStart = false;
          user = "root:root";
          volumes = [
            "${cfg.datastorePath}/:/opt/kasm/current/"
          ];
-          dependsOn = [ "kasm_db" "kasm_redis" ];
+          dependsOn = [ "kasm_db_init" "kasm_db" "kasm_redis" ];
          extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ];
        };
        kasm_guac = {
          image = "kasmweb/kasm-guac:${pkgs.kasmweb.version}";
+          autoStart = false;
          user = "root:root";
          volumes = [
            "${cfg.datastorePath}/:/opt/kasm/current/"
@ -254,6 +256,7 @@ in
        };
        kasm_proxy = {
          image = "kasmweb/nginx:latest";
+          autoStart = false;
          ports = [ "${cfg.listenAddress}:${toString cfg.listenPort}:443" ];
          user = "root:root";
          volumes = [
--- a/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh
+++ b/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh
@ -11,12 +11,39 @@ mkdir -p @datastorePath@/conf/nginx/containers.d
 chmod -R a+rw @datastorePath@/conf
 ln -sf @kasmweb@/www @datastorePath@

+cat >@datastorePath@/init_seeds.sh <<EOF
+#!/bin/bash
+if [ ! -e /opt/kasm/current/.done_initing_data ]; then
+  while true; do
+      sleep 15;
+      /usr/bin/kasm_server.so --initialize-database --cfg \
+        /opt/kasm/current/conf/app/api.app.config.yaml \
+        --seed-file \
+        /opt/kasm/current/conf/database/seed_data/default_properties.yaml \
+        --populate-production \
+        && break
+  done  && /usr/bin/kasm_server.so --cfg \
+    /opt/kasm/current/conf/app/api.app.config.yaml \
+    --populate-production \
+    --seed-file \
+    /opt/kasm/current/conf/database/seed_data/default_agents.yaml \
+  && /usr/bin/kasm_server.so --cfg \
+    /opt/kasm/current/conf/app/api.app.config.yaml \
+    --populate-production \
+    --seed-file \
+    /opt/kasm/current/conf/database/seed_data/default_images_amd64.yaml \
+  && touch /opt/kasm/current/.done_initing_data
+
+  while true; do sleep 10 ; done
+else
+ echo "skipping database init"
+  while true; do sleep 10 ; done
+fi
+EOF

 docker network inspect kasm_default_network >/dev/null || docker network create kasm_default_network --subnet @networkSubnet@
-if docker volume inspect kasmweb_db >/dev/null; then
+if [ -e @datastorePath@/ids.env ]; then
    source @datastorePath@/ids.env
-    echo 'echo "skipping database init"' > @datastorePath@/init_seeds.sh
-    echo 'while true; do sleep 10 ; done' >> @datastorePath@/init_seeds.sh
 else
    API_SERVER_ID=$(cat /proc/sys/kernel/random/uuid)
    MANAGER_ID=$(cat /proc/sys/kernel/random/uuid)
@ -30,43 +57,10 @@ else
    mkdir -p @datastorePath@/certs
    openssl req -x509 -nodes -days 1825 -newkey rsa:2048 -keyout @datastorePath@/certs/kasm_nginx.key -out @datastorePath@/certs/kasm_nginx.crt -subj "/C=US/ST=VA/L=None/O=None/OU=DoFu/CN=$(hostname)/emailAddress=none@none.none" 2> /dev/null

-    docker volume create kasmweb_db
+    mkdir -p @datastorePath@/file_mappings
+
+    docker volume create kasmweb_db || true
    rm @datastorePath@/.done_initing_data
-    cat >@datastorePath@/init_seeds.sh <<EOF
-#!/bin/bash
-if [ ! -e /opt/kasm/current/.done_initing_data ]; then
-  sleep 4
-  /usr/bin/kasm_server.so --initialize-database --cfg \
-    /opt/kasm/current/conf/app/api.app.config.yaml \
-    --populate-production \
-    --seed-file \
-    /opt/kasm/current/conf/database/seed_data/default_properties.yaml \
-    2>&1 | grep -v UserWarning
-  /usr/bin/kasm_server.so --cfg \
-    /opt/kasm/current/conf/app/api.app.config.yaml \
-    --populate-production \
-    --seed-file \
-    /opt/kasm/current/conf/database/seed_data/default_agents.yaml \
-    2>&1 | grep -v UserWarning
-  /usr/bin/kasm_server.so --cfg \
-    /opt/kasm/current/conf/app/api.app.config.yaml \
-    --populate-production \
-    --seed-file \
-    /opt/kasm/current/conf/database/seed_data/default_connection_proxies.yaml \
-    2>&1 | grep -v UserWarning
-  /usr/bin/kasm_server.so --cfg \
-    /opt/kasm/current/conf/app/api.app.config.yaml \
-    --populate-production \
-    --seed-file \
-    /opt/kasm/current/conf/database/seed_data/default_images_amd64.yaml \
-    2>&1 | grep -v UserWarning
-  touch /opt/kasm/current/.done_initing_data
-  while true; do sleep 10 ; done
-else
- echo "skipping database init"
-  while true; do sleep 10 ; done
-fi
-EOF
 fi

 chmod +x @datastorePath@/init_seeds.sh
@ -77,11 +71,14 @@ if [ -e @sslCertificate@ ]; then
    cp @sslCertificateKey@ @datastorePath@/certs/kasm_nginx.key
 fi

+yq -i '.server.zone_name = "'default'"' @datastorePath@/conf/app/api.app.config.yaml
+yq -i '(.zones.[0]) .zone_name = "'default'"' @datastorePath@/conf/database/seed_data/default_properties.yaml
+
 sed -i -e "s/username.*/username: @postgresUser@/g" \
    -e "s/password.*/password: @postgresPassword@/g" \
    -e "s/host.*db/host: kasm_db/g" \
    -e "s/ssl: true/ssl: false/g" \
-    -e "s/redisPassword.*/redisPassword: @redisPassword@/g" \
+    -e "s/redis_password.*/redis_password: @redisPassword@/g" \
    -e "s/server_hostname.*/server_hostname: kasm_api/g" \
    -e "s/server_id.*/server_id: $API_SERVER_ID/g" \
    -e "s/manager_id.*/manager_id: $MANAGER_ID/g" \
@ -93,22 +90,36 @@ sed -i -e "s/ token:.*/ token: \"@defaultManagerToken@\"/g" \
    -e "s/server_id.*/server_id: $SERVER_ID/g" \
    @datastorePath@/conf/app/agent.app.config.yaml

+# Generate a salt and hash for the desired passwords. Update the yaml
+ADMIN_SALT=$(cat /proc/sys/kernel/random/uuid)
+ADMIN_HASH=$(printf @defaultAdminPassword@${ADMIN_SALT} | sha256sum | cut -c-64)
+USER_SALT=$(cat /proc/sys/kernel/random/uuid)
+USER_HASH=$(printf @defaultUserPassword@${USER_SALT} | sha256sum | cut -c-64)

-sed -i -e "s/password: admin.*/password: \"@defaultAdminPassword@\"/g" \
-    -e "s/password: user.*/password: \"@defaultUserPassword@\"/g" \
-    -e "s/default-manager-token/@defaultManagerToken@/g" \
-    -e "s/default-registration-token/@defaultRegistrationToken@/g" \
-    -e "s/upstream_auth_address:.*/upstream_auth_address: 'proxy'/g" \
+yq -i  '(.users.[] | select(.username=="admin@kasm.local") | .salt) = "'${ADMIN_SALT}'"'  @datastorePath@/conf/database/seed_data/default_properties.yaml
+yq -i  '(.users.[] | select(.username=="admin@kasm.local") | .pw_hash) = "'${ADMIN_HASH}'"'  @datastorePath@/conf/database/seed_data/default_properties.yaml
+
+yq -i  '(.users.[] | select(.username=="user@kasm.local") | .salt) = "'${USER_SALT}'"'  @datastorePath@/conf/database/seed_data/default_properties.yaml
+yq -i  '(.users.[] | select(.username=="user@kasm.local") | .pw_hash) = "'${USER_HASH}'"'  @datastorePath@/conf/database/seed_data/default_properties.yaml
+
+yq -i   '(.settings.[] | select(.name=="token") | select(.category == "manager")) .value = "'@defaultManagerToken@'"'   @datastorePath@/conf/database/seed_data/default_properties.yaml
+
+yq -i   '(.settings.[] | select(.name=="registration_token") | select(.category == "auth")) .value = "'@defaultRegistrationToken@'"'   @datastorePath@/conf/database/seed_data/default_properties.yaml
+
+sed -i -e "s/upstream_auth_address:.*/upstream_auth_address: 'proxy'/g" \
    @datastorePath@/conf/database/seed_data/default_properties.yaml

 sed -i -e "s/GUACTOKEN/@defaultGuacToken@/g" \
    -e "s/APIHOSTNAME/proxy/g" \
    @datastorePath@/conf/app/kasmguac.app.config.yaml

-sed -i -e "s/GUACTOKEN/@defaultGuacToken@/g" \
-    -e "s/APIHOSTNAME/proxy/g" \
-    @datastorePath@/conf/database/seed_data/default_connection_proxies.yaml
-
 sed -i "s/00000000-0000-0000-0000-000000000000/$SERVER_ID/g" \
    @datastorePath@/conf/database/seed_data/default_agents.yaml

+
+while [ ! -e @datastorePath@/.done_initing_data ]; do
+    sleep 10;
+done
+
+systemctl restart docker-kasm_proxy.service
+
--- a/nixos/tests/hydra/default.nix
+++ b/nixos/tests/hydra/default.nix
@ -11,7 +11,7 @@ let
  inherit (import ./common.nix { inherit system; }) baseConfig;

  hydraPkgs = {
-    inherit (pkgs) hydra_unstable;
+    inherit (pkgs) hydra;
  };

  makeHydraTest = with pkgs.lib; name: package: makeTest {
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@ -26,13 +26,13 @@
 }:

 let
-  version = "5.12.1";
+  version = "5.13.0";

  docFiles = [
    (fetchurl {
      url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf";
      name = "Tutorial.pdf";
-      hash = "sha256-ETA799peqP9RAjcqPBwVb8egKfQJAuIXNgso+k8o50Q=";
+      hash = "sha256-hoCa/aTy2mmsPHP3Zm0hLZlZKbtUMpjUlc2rFKKChco=";
    })
    (fetchurl {
      url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf";
@ -42,7 +42,7 @@ let
    (fetchurl {
      url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewCatalystGuide-${version}.pdf";
      name = "CatalystGuide.pdf";
-      hash = "sha256-imRW70lGQX7Gy0AavIHQMVhnn9E2FPpiCdCKt7Jje4w=";
+      hash = "sha256-t1lJ1Wiswhdxovt2O4sXTXfFxshDiZZVdnkXt/+BQn8=";
    })
  ];

@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
    owner = "paraview";
    repo = "paraview";
    rev = "v${version}";
-    hash = "sha256-jbqMqj3D7LTwQ+hHIPscCHw4TfY/BR2HuVmMYom2+dA=";
+    hash = "sha256-JRSuvBON2n0UnbrFia4Qmf6eYb1Mc+Z7dIcXSeUhpIc=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@ -50,8 +50,8 @@ in rec {
  thunderbird = thunderbird-128;

  thunderbird-115 = common {
-    version = "115.13.0";
-    sha512 = "98ee23f684aa7a166878459a6a217bf3bcc4ddd8fa8ebbd0a1d2d66392ec1ebff67dbad55d145cdd0771539f127d91c4137211cf4efc80e450e6a34c95e8529c";
+    version = "115.14.0";
+    sha512 = "b12e1302d6be94dd88bee6dd069d3fec944bfce95e1afc1d72c14cc188d952fd5a85f0e70575317250701ac89498d876f3384b022957689fabcef61ad7d78c29";

    updateScript = callPackage ./update.nix {
      attrPath = "thunderbirdPackages.thunderbird-115";
--- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
@ -46,14 +46,14 @@
 stdenv.mkDerivation (finalAttrs: {
  # LAMMPS has weird versioning convention. Updates should go smoothly with:
  # nix-update --commit lammps --version-regex 'stable_(.*)'
-  version = "2Aug2023_update3";
+  version = "2Aug2023_update4";
  pname = "lammps";

  src = fetchFromGitHub {
    owner = "lammps";
    repo = "lammps";
    rev = "stable_${finalAttrs.version}";
-    hash = "sha256-jx0hkiYxQlnE2sa4WTvluEgphF//sNbK91VGAQJMwjw=";
+    hash = "sha256-4y41kRO1iKFoCDVe6Dap4njcFa3z+9acKomoxOL7ipI=";
  };
  preConfigure = ''
    cd cmake
--- a/pkgs/by-name/ba/basedpyright/package.nix
+++ b/pkgs/by-name/ba/basedpyright/package.nix
@ -11,13 +11,13 @@
 }:

 let
-  version = "1.17.0";
+  version = "1.17.1";

  src = fetchFromGitHub {
    owner = "detachhead";
    repo = "basedpyright";
    rev = "refs/tags/v${version}";
-    hash = "sha256-GVdUxuUgnM4yr0gW+NDKYFk0Roc/U4eG/OFK8QR/vvw=";
+    hash = "sha256-mFY0GvVGiozxd04ktSoqcezBwXkOAeIWTgNnv1zB74A=";
  };

  patchedPackageJSON = runCommand "package.json" { } ''
@ -47,7 +47,7 @@ let
    pname = "pyright-internal";
    inherit version src;
    sourceRoot = "${src.name}/packages/pyright-internal";
-    npmDepsHash = "sha256-ODN7FRAw9pd/CnVQrnnl/hNng+byDr1Rb3EFCOT0EQI=";
+    npmDepsHash = "sha256-IJMK/YhTldOr3Gh4ewlVLUSt3PlhIjilxB7QBJpdu80=";
    dontNpmBuild = true;
    # Uncomment this flag when using unreleased peer dependencies
    # npmFlags = [ "--legacy-peer-deps" ];
@ -94,7 +94,7 @@ buildNpmPackage rec {
  inherit version src;

  sourceRoot = "${src.name}/packages/pyright";
-  npmDepsHash = "sha256-YdqbfA5Bb7s1iT8TzSc1fpy6QCtXfazjTQmUGsC9j2Y=";
+  npmDepsHash = "sha256-TmJrh/Pya7jXhMQyCz6wwCCP0gzTTKFNUKF+vBq22U0=";

  postPatch = ''
    chmod +w ../../
--- a/pkgs/development/tools/misc/hydra/unstable.nix
+++ b/pkgs/development/tools/misc/hydra/unstable.nix
@ -1,6 +1,5 @@
 { stdenv
 , lib
-, fetchpatch2
 , nix
 , perlPackages
 , buildEnv
@ -124,27 +123,15 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "hydra";
-  version = "2024-08-20";
+  version = "0-unstable-2024-08-27";

  src = fetchFromGitHub {
    owner = "NixOS";
    repo = "hydra";
-    rev = "4bb2f08be14ff86d57b94b520a6cd2181efaee36";
-    hash = "sha256-NzsqjLSobba4BJ5FS3vccC9rAH0OE9XI97geGj0KHts=";
+    rev = "2d79b0a4da9e2a8ff97c1173aa56fe92e1f4629b";
+    hash = "sha256-ZU8/LzdZ0nbUxVxTsRZyMpTGEtps9oG0Yx2cpS9J8I4=";
  };

-  patches = [
-    (fetchpatch2 {
-      url = "https://github.com/NixOS/hydra/commit/916531dc9ccee52e6dab256232933fcf6d198158.patch";
-      hash = "sha256-JOtlYr+K934UIqHvfLMd/jfRRU+Tci0kvtyhOvlwxEs=";
-    })
-    (fetchpatch2 {
-      name = "CVE-2024-45049.patch";
-      url = "https://github.com/NixOS/hydra/commit/f73043378907c2c7e44f633ad764c8bdd1c947d5.patch";
-      hash = "sha256-IS6GCuRLW+ULDD7udpGX2tO85bV2gGOX6DLLw3NTkJU=";
-    })
-  ];
-
  buildInputs = [
    unzip
    libpqxx
@ -243,7 +230,7 @@ stdenv.mkDerivation (finalAttrs: {

  passthru = {
    inherit nix perlDeps;
-    tests.basic = nixosTests.hydra.hydra_unstable;
+    tests.basic = nixosTests.hydra.hydra;
  };

  meta = with lib; {
--- a/pkgs/by-name/ij/ijq/package.nix
+++ b/pkgs/by-name/ij/ijq/package.nix
@ -6,17 +6,18 @@
  installShellFiles,
  makeBinaryWrapper,
  scdoc,
+  nix-update-script,
 }:

 buildGoModule rec {
  pname = "ijq";
-  version = "1.1.1";
+  version = "1.1.2";

  src = fetchFromSourcehut {
    owner = "~gpanders";
    repo = "ijq";
    rev = "v${version}";
-    hash = "sha256-rnSpXMadZW6I+7tIYqr1Cb4z00gdREsqin/r6OXaDMA=";
+    hash = "sha256-7vG9T+gC6HeSGwFDf3m7nM0hBz32n6ATiM30AKNC1Og=";
  };

  vendorHash = "sha256-zRa8MPWFvcoVm+LstbSAl1VY3oWMujZPjWS/ti1VXjE=";
@ -43,6 +44,8 @@ buildGoModule rec {
      --prefix PATH : "${lib.makeBinPath [ jq ]}"
  '';

+  passthru.updateScript = nix-update-script { };
+
  meta = with lib; {
    description = "Interactive wrapper for jq";
    mainProgram = "ijq";
--- a/pkgs/by-name/ko/komac/package.nix
+++ b/pkgs/by-name/ko/komac/package.nix
@ -7,15 +7,17 @@
 , darwin
 , testers
 , komac
+, dbus
+, zstd
 }:

 let
-  version = "2.2.1";
+  version = "2.5.0";
  src = fetchFromGitHub {
    owner = "russellbanks";
    repo = "Komac";
    rev = "v${version}";
-    hash = "sha256-dPX8/JUQ+vugd+M/jIjBf4/sNbac0FVQ0obhyAAGI84=";
+    hash = "sha256-X+LZ6D7MTt/0k4hLvk7TVKiL174QDdxwPKu01MyREYw=";
  };
 in
 rustPlatform.buildRustPackage {
@ -23,16 +25,25 @@ rustPlatform.buildRustPackage {

  pname = "komac";

-  cargoHash = "sha256-CDPN90X3m/9FRLolAVCIcAuajZbB5OAgLcFXq2ICS8g=";
+  cargoHash = "sha256-VBfXD1IF6D1z28dzXfKRz3/Hh2KRxcsYRRDV8e/Akww=";

-  nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
+  nativeBuildInputs = [ pkg-config ];

-  buildInputs = lib.optionals stdenv.isLinux [
+  buildInputs = [
+    dbus
    openssl
+    zstd
  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
    darwin.apple_sdk.frameworks.SystemConfiguration
  ];

+  env = {
+    OPENSSL_NO_VENDOR = true;
+    YRX_REGENERATE_MODULES_RS = "no";
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+  };
+
  passthru.tests.version = testers.testVersion {
    inherit version;

@ -45,7 +56,7 @@ rustPlatform.buildRustPackage {
    homepage = "https://github.com/russellbanks/Komac";
    changelog = "https://github.com/russellbanks/Komac/releases/tag/${src.rev}";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ kachick ];
+    maintainers = with maintainers; [ kachick HeitorAugustoLN ];
    mainProgram = "komac";
  };
 }
--- a/pkgs/by-name/li/libeufin/deps.json
+++ b/pkgs/by-name/li/libeufin/deps.json
--- a/pkgs/by-name/li/libeufin/package.nix
+++ b/pkgs/by-name/li/libeufin/package.nix
@ -0,0 +1,129 @@
+{
+  lib,
+  stdenv,
+  fetchgit,
+  python3,
+  jdk17_headless,
+  gradle,
+  makeWrapper,
+  postgresql,
+  postgresqlTestHook,
+}:
+let
+  customPython = python3.withPackages (p: [ p.setuptools ]);
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libeufin";
+  version = "0.11.3";
+
+  src = fetchgit {
+    url = "https://git.taler.net/libeufin.git/";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-6bMYcpxwL1UJXt0AX6R97C0Orwqb7E+TZO2Sz1qode8=";
+    fetchSubmodules = true;
+    leaveDotGit = true; # required for correct submodule fetching
+    # Delete .git folder for reproducibility (otherwise, the hash changes unexpectedly after fetching submodules)
+    # Save the HEAD short commit hash in a file so it can be retrieved later for versioning.
+    postFetch = ''
+      pushd $out
+      git rev-parse --short HEAD > ./common/src/main/resources/HEAD.txt
+      rm -rf .git
+      popd
+    '';
+  };
+
+  patchPhase = ''
+    runHook prePatch
+
+    # The .git folder had to be deleted. Read hash from file instead of using the git command.
+    substituteInPlace build.gradle \
+      --replace-fail "commandLine 'git', 'rev-parse', '--short', 'HEAD'" 'commandLine "cat", "$projectDir/common/src/main/resources/HEAD.txt"'
+
+    # Gradle projects provide a .module metadata file as artifact. This artifact is used by gradle
+    # to download dependencies to the cache when needed, but do not provide the jar for the
+    # offline installation for our build phase. Since we make an offline Maven repo, we have to
+    # substitute the gradle deps for their maven counterpart to retrieve the .jar artifacts.
+    for dir in common bank nexus testbench; do
+      substituteInPlace $dir/build.gradle \
+        --replace-fail ':$ktor_version' '-jvm:$ktor_version' \
+        --replace-fail ':$clikt_version' '-jvm:$clikt_version'
+    done
+
+    runHook postPatch
+  '';
+
+  preConfigure = ''
+    cp build-system/taler-build-scripts/configure ./configure
+  '';
+
+  mitmCache = gradle.fetchDeps {
+    inherit (finalAttrs) pname;
+    data = ./deps.json;
+  };
+
+  # this is required for using mitm-cache on Darwin
+  __darwinAllowLocalNetworking = true;
+
+  gradleFlags = [ "-Dorg.gradle.java.home=${jdk17_headless}" ];
+  gradleBuildTask = [
+    "bank:installShadowDist"
+    "nexus:installShadowDist"
+  ];
+
+  nativeBuildInputs = [
+    customPython
+    jdk17_headless
+    gradle
+    makeWrapper
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    make install-nobuild
+
+    for exe in libeufin-nexus libeufin-bank ; do
+      wrapProgram $out/bin/$exe \
+        --set JAVA_HOME ${jdk17_headless.home} \
+        --prefix PATH : $out/bin \
+        --prefix PATH : ${lib.makeBinPath [ jdk17_headless ]} \
+
+    done
+
+    runHook postInstall
+  '';
+
+  # Tests need a database to run
+  nativeCheckInputs = [
+    postgresql
+    postgresqlTestHook
+  ];
+
+  env = {
+    PGUSER = "nixbld";
+    PGDATABASE = "libeufincheck";
+    postgresqlTestUserOptions = "LOGIN SUPERUSER";
+  };
+
+  gradleCheckTask = [
+    "common:test"
+    "bank:test"
+    "nexus:test"
+    "testbench:test"
+  ];
+
+  # TODO: tests are currently failing
+  doCheck = false;
+
+  meta = {
+    homepage = "https://git.taler.net/libeufin.git/";
+    description = "Integration and sandbox testing for FinTech APIs and data formats";
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ atemu ];
+    mainProgram = "libeufin-bank";
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode # mitm cache
+    ];
+  };
+})
--- a/pkgs/by-name/mo/mongodb-ce/package.nix
+++ b/pkgs/by-name/mo/mongodb-ce/package.nix
@ -15,24 +15,24 @@
 }:

 let
-  version = "7.0.12";
+  version = "7.0.14";

  srcs = version: {
    "x86_64-linux" = {
      url = "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2204-${version}.tgz";
-      hash = "sha256-Kgq66rOBKgNIVw6bvzNrpnGRxyoBCP0AWnfzs9ReVVk=";
+      hash = "sha256-tM+MquEIeFE17Mi4atjtbfXW77hLm5WlDsui/CRs4IQ=";
    };
    "aarch64-linux" = {
      url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2204-${version}.tgz";
-      hash = "sha256-OLxPpAYFicWrqRJo3cNIG5Y0S6MIMd2vW8bluQkqnyk=";
+      hash = "sha256-4XiHv6JKopZ/3xrXwT+nvQ2OsbkhL79uwBCnOOMaNlc=";
    };
    "x86_64-darwin" = {
      url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${version}.tgz";
-      hash = "sha256-sKfg1EpRQ7L2rgJArRHQLrawU8bh42liih5GR2/3jok=";
+      hash = "sha256-mw9w/qz3xBVC7n0JBeL4CQsJ1bhBPwyQeUBsCa/XosA=";
    };
    "aarch64-darwin" = {
      url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${version}.tgz";
-      hash = "sha256-XkFSuKKxgSRoyzzrPYamE/44FV8ol125nqDOB9EnSMM=";
+      hash = "sha256-iAX4szgBzQe5ARjCXlB7DeIcatQms3X75J6Jb/xXXQ4=";
    };
  };
 in
@ -49,10 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
  dontStrip = true;

  buildInputs = [
-    # This is to avoid the following error:
-    # ./result/bin/mongod: /nix/store/y6w7agm3aw5p96q7vsgzivba0dqq3rd0-curl-8.8.0/lib/libcurl.so.4: no version information available (required by ./result/bin/mongod)
-    # When running `mongod --version`
-    # See https://discourse.nixos.org/t/patchelf-and-libcurl-no-version-information-available/24453
+    # Remove this after https://github.com/NixOS/nixpkgs/pull/336712
+    # has landed in `nixpkgs-unstable`
    (curl.overrideAttrs (old: {
      configureFlags = old.configureFlags ++ [ "--enable-versioned-symbols" ];
    })).dev
@ -90,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
              NEW_VERSION=$(curl -s "https://api.github.com/repos/mongodb/mongo/tags?per_page=1000" | jq -r 'first(.[] | .name | select(startswith("r7.0")) | select(contains("rc") | not) | .[1:])')

              # Check if the new version is available for download, if not, exit
-              AVAILABLE=$(curl -s https://www.mongodb.com/try/download/community-edition/releases | pup 'h3:not([id]) text{}' | grep "$NEW_VERSION")
+              curl -s https://www.mongodb.com/try/download/community-edition/releases | pup 'h3:not([id]) text{}' | grep "$NEW_VERSION"

              if [[ "${version}" = "$NEW_VERSION" ]]; then
                  echo "The new version same as the old version."
--- a/pkgs/by-name/na/naja/package.nix
+++ b/pkgs/by-name/na/naja/package.nix
@ -15,20 +15,20 @@
 }:
 stdenv.mkDerivation {
  pname = "naja";
-  version = "0-unstable-2024-07-21";
+  version = "0-unstable-2024-08-27";

  src = fetchFromGitHub {
    owner = "najaeda";
    repo = "naja";
-    rev = "8c068f3bd1bbd57b851547f191a58a375fd35cda";
-    hash = "sha256-aUYPJGr4D5n92fp0namPT6I/gMRZoF7YHnB7GoRzwYI=";
+    rev = "ca7a544d16abb31d6992e702ccbd97be3a644c08";
+    hash = "sha256-lmgXv2nmmjKph0Tf9ZvV3kQBtbiGXYA7jrE77cgM+KU=";
    fetchSubmodules = true;
  };

  outputs = [
-    "dev"
-    "lib"
    "out"
+    "lib"
+    "dev"
  ];

  strictDeps = true;
@ -51,10 +51,14 @@ stdenv.mkDerivation {
    tbb_2021_11
  ];

-  cmakeFlags = [
-    (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_LIBDWARF" true)
-    (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_ZSTD" true)
-  ];
+  cmakeFlags =
+    [
+      (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_LIBDWARF" true)
+      (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_ZSTD" true)
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      (lib.cmakeFeature "CMAKE_OSX_DEPLOYMENT_TARGET" "10.14") # For aligned allocation
+    ];

  doCheck = true;

@ -67,7 +71,5 @@ stdenv.mkDerivation {
    ];
    mainProgram = "naja_edit";
    platforms = lib.platforms.all;
-    # "aligned deallocation function of type [...] is only available on macOS 10.13 or newer" even with 11.0 SDK
-    broken = stdenv.hostPlatform.isDarwin;
  };
 }
--- a/pkgs/by-name/no/novops/package.nix
+++ b/pkgs/by-name/no/novops/package.nix
@ -4,6 +4,7 @@
 , pkg-config
 , openssl
 , stdenv
+, installShellFiles
 , libiconv
 , darwin
 }:
@ -29,6 +30,7 @@ rustPlatform.buildRustPackage rec {
  ];

  nativeBuildInputs = [
+    installShellFiles
    pkg-config # required for openssl-sys
  ];

@ -38,6 +40,13 @@ rustPlatform.buildRustPackage rec {
      "--lib"
  ];

+  postInstall = ''
+    installShellCompletion --cmd novops \
+      --bash <($out/bin/novops completion bash) \
+      --fish <($out/bin/novops completion fish) \
+      --zsh <($out/bin/novops completion zsh)
+  '';
+
  meta = with lib; {
    description = "Cross-platform secret & config manager for development and CI environments";
    homepage = "https://github.com/PierreBeucher/novops";
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@ -7,19 +7,19 @@
 }:
 let
  pname = "open-webui";
-  version = "0.3.15";
+  version = "0.3.16";

  src = fetchFromGitHub {
    owner = "open-webui";
    repo = "open-webui";
    rev = "v${version}";
-    hash = "sha256-e326Dxuu9cdpPV/T4arDSBqT1agnXdV5ysrIRyhF8ws=";
+    hash = "sha256-AxD7WHL5fGM0CBKi7zc/gmoSJQBohDh0HgIDU1/BQ7w=";
  };

  frontend = buildNpmPackage {
    inherit pname version src;

-    npmDepsHash = "sha256-exkFrKBwTtN18pPNcFG1fYBoWASHsnCHYYVWkCFd0z0=";
+    npmDepsHash = "sha256-Ik+wXymso3jdKXQgLydnhhWvpHl0d82pwYSmUR0yfPE=";

    # Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
    # Until this is solved, running python packages from the browser will not work.
@ -91,6 +91,7 @@ python3.pkgs.buildPythonApplication rec {
    langchain-community
    langfuse
    markdown
+    nltk
    openai
    opencv4
    openpyxl
--- a/pkgs/by-name/py/pyright/package.nix
+++ b/pkgs/by-name/py/pyright/package.nix
@ -1,13 +1,13 @@
 { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }:

 let
-  version = "1.1.377";
+  version = "1.1.378";

  src = fetchFromGitHub {
    owner = "Microsoft";
    repo = "pyright";
    rev = "${version}";
-    hash = "sha256-OvdA3IFUdeBEU97+F9C86k6PDGOYggExj+ZoIt77PuI=";
+    hash = "sha256-GFrVnMGYR57IKUybAuVyriwgOLfPBwf7H9NjJNvsTNE=";
  };

  patchedPackageJSON = runCommand "package.json" { } ''
@ -37,7 +37,7 @@ let
    pname = "pyright-internal";
    inherit version src;
    sourceRoot = "${src.name}/packages/pyright-internal";
-    npmDepsHash = "sha256-nvqg0145zW+4uvgoATWqzexQVmUBmateowxd6E14Tl8=";
+    npmDepsHash = "sha256-Osz5c0HeJG1CgGiLuNUfIc5jvpY35a+y496JMt3FD+I=";
    dontNpmBuild = true;
    installPhase = ''
      runHook preInstall
@ -51,7 +51,7 @@ buildNpmPackage rec {
  inherit version src;

  sourceRoot = "${src.name}/packages/pyright";
-  npmDepsHash = "sha256-aTBk8O6yEwOt1N/WaFOOfPZvfILZ5x7E2vm9N7+qth4=";
+  npmDepsHash = "sha256-XvswAKYGRoydha+areiXfGN6nXQObQmOWKp49Rhmbv0=";

  postPatch = ''
    chmod +w ../../
--- a/pkgs/by-name/ra/rabbit/package.nix
+++ b/pkgs/by-name/ra/rabbit/package.nix
@ -5,19 +5,21 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "rabbit";
-  version = "2.1.0";
+  version = "2.2.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "natarajan-chidambaram";
    repo = "RABBIT";
    rev = "refs/tags/${version}";
-    hash = "sha256-l5k5wPEd6/x7xHc+GlnoyTry7GRTnzNiTLxrLAZFVzQ=";
+    hash = "sha256-diy94QhgLHLvkb1kKhGDxiHAyQ43BNJUXjHFYahEDpw=";
  };

  pythonRelaxDeps = [
    "numpy"
+    "scikit-learn"
    "scipy"
+    "tqdm"
  ];

  build-system = [
@ -26,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
  ];

  dependencies = with python3.pkgs; [
+    joblib
    numpy
    pandas
    python-dateutil
@ -34,7 +37,6 @@ python3.pkgs.buildPythonApplication rec {
    scipy
    tqdm
    urllib3
-    xgboost
  ];

  pythonImportsCheck = [ "rabbit" ];
--- a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock
+++ b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock
@ -123,7 +123,7 @@ checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
 [[package]]
 name = "android-wakelock"
 version = "0.1.0"
-source = "git+https://github.com/21pages/android-wakelock#d0292e5a367e627c4fa6f1ca6bdfad005dca7d90"
+source = "git+https://github.com/rustdesk-org/android-wakelock#d0292e5a367e627c4fa6f1ca6bdfad005dca7d90"
 dependencies = [
 "jni 0.21.1",
 "log",
@ -224,7 +224,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 [[package]]
 name = "arboard"
 version = "3.4.0"
-source = "git+https://github.com/rustdesk-org/arboard#27b4e503caa70ec6306e5270461429f2cf907ad6"
+source = "git+https://github.com/rustdesk-org/arboard#a04bdb1b368a99691822c33bf0f7ed497d6a7a35"
 dependencies = [
 "clipboard-win",
 "core-graphics 0.23.2",
@ -234,24 +234,13 @@ dependencies = [
 "objc2-app-kit",
 "objc2-foundation",
 "parking_lot",
- "resvg",
+ "serde 1.0.203",
+ "serde_derive",
 "windows-sys 0.48.0",
 "wl-clipboard-rs",
 "x11rb 0.13.1",
 ]

-[[package]]
-name = "arrayref"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
 [[package]]
 name = "async-broadcast"
 version = "0.5.1"
@ -987,11 +976,14 @@ dependencies = [
 [[package]]
 name = "clipboard-master"
 version = "4.0.0-beta.6"
-source = "git+https://github.com/rustdesk-org/clipboard-master#5268c7b3d7728699566ad863da0911f249706f8c"
+source = "git+https://github.com/rustdesk-org/clipboard-master#4fb62e5b62fb6350d82b571ec7ba94b3cd466695"
 dependencies = [
 "objc",
 "objc-foundation",
 "objc_id",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
 "windows-win",
 "wl-clipboard-rs",
 "x11-clipboard 0.9.2",
@ -1000,9 +992,9 @@ dependencies = [

 [[package]]
 name = "clipboard-win"
-version = "5.3.1"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad"
+checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
 dependencies = [
 "error-code",
 ]
@ -1166,17 +1158,25 @@ name = "core-foundation"
 version = "0.9.3"
 source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd"
 dependencies = [
- "core-foundation-sys 0.8.6 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)",
+ "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc",
 ]

 [[package]]
 name = "core-foundation-sys"
 version = "0.8.6"
-source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd"
-dependencies = [
- "objc2-encode 2.0.0-pre.2",
-]
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"

 [[package]]
 name = "core-graphics"
@ -1204,6 +1204,19 @@ dependencies = [
 "objc2-encode 2.0.0-pre.2",
 ]

+[[package]]
+name = "core-graphics"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation 0.9.4",
+ "core-graphics-types 0.1.3",
+ "foreign-types 0.5.0",
+ "libc",
+]
+
 [[package]]
 name = "core-graphics-types"
 version = "0.1.2"
@ -1215,6 +1228,17 @@ dependencies = [
 "objc2-encode 2.0.0-pre.2",
 ]

+[[package]]
+name = "core-graphics-types"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation 0.9.4",
+ "libc",
+]
+
 [[package]]
 name = "coreaudio-rs"
 version = "0.11.3"
@ -1486,12 +1510,6 @@ dependencies = [
 "dasp_sample",
 ]

-[[package]]
-name = "data-url"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
-
 [[package]]
 name = "dbus"
 version = "0.9.7"
@ -1651,7 +1669,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.7.4",
+ "libloading 0.8.4",
 ]

 [[package]]
@ -2041,12 +2059,6 @@ dependencies = [
 "thiserror",
 ]

-[[package]]
-name = "float-cmp"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
-
 [[package]]
 name = "flume"
 version = "0.11.0"
@ -2103,29 +2115,6 @@ dependencies = [
 "libm",
 ]

-[[package]]
-name = "fontconfig-parser"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d"
-dependencies = [
- "roxmltree 0.19.0",
-]
-
-[[package]]
-name = "fontdb"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770"
-dependencies = [
- "fontconfig-parser",
- "log",
- "memmap2",
- "slotmap",
- "tinyvec",
- "ttf-parser",
-]
-
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@ -3047,8 +3036,8 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"

 [[package]]
 name = "hwcodec"
-version = "0.6.0"
-source = "git+https://github.com/21pages/hwcodec#89879f2f02c6f74e88a4a43744a1153aec5b7e7f"
+version = "0.7.0"
+source = "git+https://github.com/rustdesk-org/hwcodec#6abd1898f3a03481ed0c038507b5218d6ea94267"
 dependencies = [
 "bindgen 0.59.2",
 "cc",
@ -3173,16 +3162,10 @@ dependencies = [
 "tiff",
 ]

-[[package]]
-name = "imagesize"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284"
-
 [[package]]
 name = "impersonate_system"
 version = "0.1.0"
-source = "git+https://github.com/21pages/impersonate-system#2f429010a5a10b1fe5eceb553c6672fd53d20167"
+source = "git+https://github.com/rustdesk-org/impersonate-system#2f429010a5a10b1fe5eceb553c6672fd53d20167"
 dependencies = [
 "cc",
 ]
@ -3422,16 +3405,6 @@ dependencies = [
 "unicode-segmentation",
 ]

-[[package]]
-name = "kurbo"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e5aa9f0f96a938266bdb12928a67169e8d22c6a786fda8ed984b85e6ba93c3c"
-dependencies = [
- "arrayvec",
- "smallvec",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@ -3518,7 +3491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
 dependencies = [
 "cfg-if 1.0.0",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
 ]

 [[package]]
@ -3693,7 +3666,7 @@ dependencies = [
 [[package]]
 name = "machine-uid"
 version = "0.3.0"
-source = "git+https://github.com/21pages/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542"
+source = "git+https://github.com/rustdesk-org/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542"
 dependencies = [
 "bindgen 0.59.2",
 "cc",
@ -3737,15 +3710,6 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"

-[[package]]
-name = "memmap2"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "memoffset"
 version = "0.6.5"
@ -3807,14 +3771,6 @@ dependencies = [
 "windows-sys 0.48.0",
 ]

-[[package]]
-name = "mouce"
-version = "0.2.1"
-source = "git+https://github.com/rustdesk-org/mouce.git#177625a395cd8fa73964714d0039535cb9b47893"
-dependencies = [
- "glob",
-]
-
 [[package]]
 name = "muda"
 version = "0.13.5"
@ -4692,15 +4648,9 @@ version = "0.7.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
 dependencies = [
- "siphasher 0.2.3",
+ "siphasher",
 ]

-[[package]]
-name = "pico-args"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
-
 [[package]]
 name = "pin-project"
 version = "1.1.5"
@ -5025,6 +4975,15 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "quick-xml"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quote"
 version = "0.6.13"
@ -5374,31 +5333,6 @@ dependencies = [
 "winreg 0.50.0",
 ]

-[[package]]
-name = "resvg"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "944d052815156ac8fa77eaac055220e95ba0b01fa8887108ca710c03805d9051"
-dependencies = [
- "gif",
- "jpeg-decoder",
- "log",
- "pico-args",
- "rgb",
- "svgtypes",
- "tiny-skia",
- "usvg",
-]
-
-[[package]]
-name = "rgb"
-version = "0.8.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741"
-dependencies = [
- "bytemuck",
-]
-
 [[package]]
 name = "ring"
 version = "0.17.8"
@ -5423,18 +5357,6 @@ dependencies = [
 "crossbeam-utils",
 ]

-[[package]]
-name = "roxmltree"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
-
-[[package]]
-name = "roxmltree"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
-
 [[package]]
 name = "rpassword"
 version = "2.1.0"
@ -5532,7 +5454,7 @@ dependencies = [

 [[package]]
 name = "rustdesk"
-version = "1.2.7"
+version = "1.3.0"
 dependencies = [
 "android-wakelock",
 "android_logger",
@ -5578,7 +5500,6 @@ dependencies = [
 "libpulse-simple-binding",
 "mac_address",
 "magnum-opus",
- "mouce",
 "num_cpus",
 "objc",
 "objc_id",
@ -5630,7 +5551,7 @@ dependencies = [

 [[package]]
 name = "rustdesk-portable-packer"
-version = "1.2.7"
+version = "1.3.0"
 dependencies = [
 "brotli",
 "dirs 5.0.1",
@ -5813,22 +5734,6 @@ version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"

-[[package]]
-name = "rustybuzz"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c"
-dependencies = [
- "bitflags 2.6.0",
- "bytemuck",
- "smallvec",
- "ttf-parser",
- "unicode-bidi-mirroring",
- "unicode-ccc",
- "unicode-properties",
- "unicode-script",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.18"
@ -5865,7 +5770,7 @@ dependencies = [
 [[package]]
 name = "sciter-rs"
 version = "0.5.57"
-source = "git+https://github.com/open-trade/rust-sciter?branch=dyn#fab913b7c2e779b05c249b0c5de5a08759b2c15d"
+source = "git+https://github.com/open-trade/rust-sciter?branch=dyn#5322f3a755a0e6bf999fbc60d1efc35246c0f821"
 dependencies = [
 "lazy_static",
 "libc",
@ -6119,27 +6024,12 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"

-[[package]]
-name = "simplecss"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d"
-dependencies = [
- "log",
-]
-
 [[package]]
 name = "siphasher"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"

-[[package]]
-name = "siphasher"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
-
 [[package]]
 name = "slab"
 version = "0.4.9"
@ -6149,15 +6039,6 @@ dependencies = [
 "autocfg 1.3.0",
 ]

-[[package]]
-name = "slotmap"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
-dependencies = [
- "version_check",
-]
-
 [[package]]
 name = "smallvec"
 version = "1.13.2"
@ -6228,15 +6109,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82"

-[[package]]
-name = "strict-num"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
-dependencies = [
- "float-cmp",
-]
-
 [[package]]
 name = "strsim"
 version = "0.8.0"
@ -6298,16 +6170,6 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"

-[[package]]
-name = "svgtypes"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fae3064df9b89391c9a76a0425a69d124aee9c5c28455204709e72c39868a43c"
-dependencies = [
- "kurbo",
- "siphasher 1.0.1",
-]
-
 [[package]]
 name = "syn"
 version = "0.15.44"
@ -6359,7 +6221,7 @@ dependencies = [
 [[package]]
 name = "sysinfo"
 version = "0.29.10"
-source = "git+https://github.com/rustdesk-org/sysinfo#f45dcc6510d48c3a1401c5a33eedccc8899f67b2"
+source = "git+https://github.com/rustdesk-org/sysinfo?branch=rlim_max#90b1705d909a4902dbbbdea37ee64db17841077d"
 dependencies = [
 "cfg-if 1.0.0",
 "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -6553,11 +6415,11 @@ dependencies = [

 [[package]]
 name = "tfc"
-version = "0.6.1"
-source = "git+https://github.com/rustdesk-org/The-Fat-Controller#9dd86151525fd010dc93f6bc9b6aedd1a75cc342"
+version = "0.7.0"
+source = "git+https://github.com/rustdesk-org/The-Fat-Controller?branch=history/rebase_upstream_20240722#de9c8ba480f166a9fc90aaa47bb0e84b443ea9c6"
 dependencies = [
 "anyhow",
- "core-graphics 0.22.3",
+ "core-graphics 0.23.2",
 "unicode-segmentation",
 "winapi 0.3.9",
 "x11 2.19.0",
@ -6647,32 +6509,6 @@ dependencies = [
 "time-core",
 ]

-[[package]]
-name = "tiny-skia"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"
-dependencies = [
- "arrayref",
- "arrayvec",
- "bytemuck",
- "cfg-if 1.0.0",
- "log",
- "png",
- "tiny-skia-path",
-]
-
-[[package]]
-name = "tiny-skia-path"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
-dependencies = [
- "arrayref",
- "bytemuck",
- "strict-num",
-]
-
 [[package]]
 name = "tinyvec"
 version = "1.6.1"
@ -6964,12 +6800,6 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"

-[[package]]
-name = "ttf-parser"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
-
 [[package]]
 name = "typenum"
 version = "1.17.0"
@ -7042,18 +6872,6 @@ version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"

-[[package]]
-name = "unicode-bidi-mirroring"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86"
-
-[[package]]
-name = "unicode-ccc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
@ -7069,30 +6887,12 @@ dependencies = [
 "tinyvec",
 ]

-[[package]]
-name = "unicode-properties"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
-
-[[package]]
-name = "unicode-script"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd"
-
 [[package]]
 name = "unicode-segmentation"
 version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"

-[[package]]
-name = "unicode-vo"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
-
 [[package]]
 name = "unicode-width"
 version = "0.1.13"
@ -7155,33 +6955,6 @@ dependencies = [
 "log",
 ]

-[[package]]
-name = "usvg"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84ea542ae85c715f07b082438a4231c3760539d902e11d093847a0b22963032"
-dependencies = [
- "base64 0.22.1",
- "data-url",
- "flate2",
- "fontdb",
- "imagesize",
- "kurbo",
- "log",
- "pico-args",
- "roxmltree 0.20.0",
- "rustybuzz",
- "simplecss",
- "siphasher 1.0.1",
- "strict-num",
- "svgtypes",
- "tiny-skia-path",
- "unicode-bidi",
- "unicode-script",
- "unicode-vo",
- "xmlwriter",
-]
-
 [[package]]
 name = "utf16string"
 version = "0.2.0"
@ -7269,7 +7042,7 @@ dependencies = [
 [[package]]
 name = "wallpaper"
 version = "3.2.0"
-source = "git+https://github.com/21pages/wallpaper.rs#ce4a0cd3f58327c7cc44d15a63706fb0c022bacf"
+source = "git+https://github.com/rustdesk-org/wallpaper.rs#ce4a0cd3f58327c7cc44d15a63706fb0c022bacf"
 dependencies = [
 "dirs 5.0.1",
 "enquote",
@ -7374,9 +7147,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"

 [[package]]
 name = "wayland-backend"
-version = "0.3.4"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07"
+checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993"
 dependencies = [
 "cc",
 "downcast-rs",
@ -7388,9 +7161,9 @@ dependencies = [

 [[package]]
 name = "wayland-client"
-version = "0.31.3"
+version = "0.31.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133"
+checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943"
 dependencies = [
 "bitflags 2.6.0",
 "rustix 0.38.34",
@ -7400,9 +7173,9 @@ dependencies = [

 [[package]]
 name = "wayland-protocols"
-version = "0.32.1"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c"
+checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa"
 dependencies = [
 "bitflags 2.6.0",
 "wayland-backend",
@ -7412,9 +7185,9 @@ dependencies = [

 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24"
+checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953"
 dependencies = [
 "bitflags 2.6.0",
 "wayland-backend",
@ -7425,20 +7198,20 @@ dependencies = [

 [[package]]
 name = "wayland-scanner"
-version = "0.31.2"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565"
+checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6"
 dependencies = [
 "proc-macro2 1.0.86",
- "quick-xml 0.31.0",
+ "quick-xml 0.34.0",
 "quote 1.0.36",
 ]

 [[package]]
 name = "wayland-sys"
-version = "0.31.2"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12"
+checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148"
 dependencies = [
 "dlib",
 "log",
@ -7458,7 +7231,7 @@ dependencies = [
 [[package]]
 name = "webm"
 version = "1.1.0"
-source = "git+https://github.com/21pages/rust-webm#d2c4d3ac133c7b0e4c0f656da710b48391981e64"
+source = "git+https://github.com/rustdesk-org/rust-webm#d2c4d3ac133c7b0e4c0f656da710b48391981e64"
 dependencies = [
 "webm-sys",
 ]
@ -7466,7 +7239,7 @@ dependencies = [
 [[package]]
 name = "webm-sys"
 version = "1.0.4"
-source = "git+https://github.com/21pages/rust-webm#d2c4d3ac133c7b0e4c0f656da710b48391981e64"
+source = "git+https://github.com/rustdesk-org/rust-webm#d2c4d3ac133c7b0e4c0f656da710b48391981e64"
 dependencies = [
 "cc",
 ]
@ -8180,12 +7953,6 @@ dependencies = [
 "windows-sys 0.52.0",
 ]

-[[package]]
-name = "xmlwriter"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
-
 [[package]]
 name = "zbus"
 version = "3.15.2"
--- a/pkgs/by-name/ru/rustdesk-flutter/make-build-reproducible.patch
+++ b/pkgs/by-name/ru/rustdesk-flutter/make-build-reproducible.patch
@ -0,0 +1,13 @@
+diff --git a/libs/hbb_common/src/lib.rs b/libs/hbb_common/src/lib.rs
+index 15ef310..f3ac940 100644
+--- a/libs/hbb_common/src/lib.rs
+++ b/libs/hbb_common/src/lib.rs
+@@ -218,7 +218,7 @@ pub fn gen_version() {
+         }
+     }
+     // generate build date
+-    let build_date = format!("{}", chrono::Local::now().format("%Y-%m-%d %H:%M"));
+    let build_date = "1970-01-01 00:00";
+     file.write_all(
+         format!("#[allow(dead_code)]\npub const BUILD_DATE: &str = \"{build_date}\";\n").as_bytes(),
+     )
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@ -4,6 +4,7 @@
 , copyDesktopItems
 , fetchFromGitHub
 , flutter316
+, ffmpeg
 , gst_all_1
 , fuse3
 , libXtst
@ -25,7 +26,7 @@

  flutterRustBridge = rustPlatform.buildRustPackage rec {
    pname = "flutter_rust_bridge_codegen";
-    version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.2.7/.github/workflows/bridge.yml#L10
+    version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.0/.github/workflows/bridge.yml#L10

    src = fetchFromGitHub {
      owner = "fzyzcjy";
@ -43,19 +44,20 @@

 in flutter316.buildFlutterApplication rec {
  pname = "rustdesk";
-  version = "1.2.7";
+  version = "1.3.0";
  src = fetchFromGitHub {
    owner = "rustdesk";
    repo = "rustdesk";
    rev = version;
-    hash = "sha256-o4YFixxKTCtL0umIkO64Etn3JnXIro3RYWcyV0RBJyg=";
+    hash = "sha256-pDGURsF0eft2BkuXOzaMtNCHp9VFgZZh4bbNRa5NDII=";
  };

  strictDeps = true;
+  env.VCPKG_ROOT = "/homeless-shelter"; # idk man, makes the build go since https://github.com/21pages/hwcodec/commit/1873c34e3da070a462540f61c0b782b7ab15dc84

  # Configure the Flutter/Dart build
  sourceRoot = "${src.name}/flutter";
-  # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.2.7/flutter/pubspec.lock | yq > pubspec.lock.json
+  # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.0/flutter/pubspec.lock | yq > pubspec.lock.json
  pubspecLock = lib.importJSON ./pubspec.lock.json;
  gitHashes = {
    dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow=";
@ -75,28 +77,27 @@ in flutter316.buildFlutterApplication rec {
    lockFile = ./Cargo.lock;
    outputHashes = {
    "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4=";
-    "arboard-3.4.0" = "sha256-bFpxyJ9Ykx2Y8iFr/JG9DFbf3FL9RzcM+vUfZ4mQ+1o=";
+    "arboard-3.4.0" = "sha256-lZIG5z115ExR6DcUut1rk9MrYFzSyCYH9kNGIikOPJM=";
    "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM=";
-    "clipboard-master-4.0.0-beta.6" = "sha256-FddUlvOuG2ClcDDAaVcVXZQlQ1CACeCHuudULUC0F00=";
+    "clipboard-master-4.0.0-beta.6" = "sha256-GZyzGMQOZ0iwGNZa/ZzFp8gU2tQVWZBpAbim8yb6yZA=";
    "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU=";
    "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g=";
    "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0=";
-    "hwcodec-0.6.0" = "sha256-pnpowWQRjeoS6RapTXsqU6ybKA2N+xzleTl82gh+u0s=";
+    "hwcodec-0.7.0" = "sha256-pfzcaD7h/U5ou+P7qRLR56iXOkm043rF74y+Q0FsVLo=";
    "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI=";
    "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4=";
    "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE=";
    "magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg=";
-    "mouce-0.2.1" = "sha256-0+k5dQeM4CCeYcvG8PzJ3YVjMZresmUPmVaPYvTV4gY=";
    "pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE=";
    "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo=";
    "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY=";
    "rdev-0.5.0-2" = "sha256-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw=";
    "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc=";
    "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM=";
-    "sciter-rs-0.5.57" = "sha256-NQPDlMQ0sGY8c9lBMlplT82sNjbgJy2m/+REnF3fz8M=";
-    "sysinfo-0.29.10" = "sha256-O2zJGQdtXNiIwatmyIB6bu5eVyv1JS/IHkv//BDCpcY=";
+    "sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E=";
+    "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4=";
    "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk=";
-    "tfc-0.6.1" = "sha256-ukxJl7Z+pUXCjvTsG5Q0RiXocPERWGsnAyh3SIWm0HU=";
+    "tfc-0.7.0" = "sha256-4plK8ttbHsBPat3/rS+4RhGzirq2Ked2wrU8cQEU1zo=";
    "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI=";
    "tray-icon-0.14.3" = "sha256-dSX7LucZaLplRrh6zLwmFzyZN4ZtwIXzAEdZzlu3gQg=";
    "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q=";
@ -126,6 +127,7 @@ in flutter316.buildFlutterApplication rec {
  ];

  buildInputs = [
+    ffmpeg
    fuse3
    gst_all_1.gst-plugins-base
    gst_all_1.gstreamer
@ -147,6 +149,8 @@ in flutter316.buildFlutterApplication rec {
  '';
  patchFlags = [ "-p1" "-d" ".." ];

+  patches = [ ./make-build-reproducible.patch ];
+
  postPatch = ''
    substituteInPlace ../Cargo.toml --replace-fail ", \"staticlib\", \"rlib\"" ""
    # The supplied Cargo.lock doesn't work with our fetcher so copy over the fixed version
@ -155,6 +159,9 @@ in flutter316.buildFlutterApplication rec {
  '';

  preBuild = ''
+    # Disable static linking of ffmpeg since https://github.com/21pages/hwcodec/commit/1873c34e3da070a462540f61c0b782b7ab15dc84¶
+    sed -i 's/static=//g' /build/cargo-vendor-dir/hwcodec-*/build.rs
+
    # Build the Flutter/Rust bridge bindings
    cat <<EOF > bridge.yml
    rust_input:
--- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
+++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
@ -416,7 +416,7 @@
      "description": {
        "path": ".",
        "ref": "HEAD",
-        "resolved-ref": "336308d86ec8b9640504a371b50ba500eb779363",
+        "resolved-ref": "80b063b9d4e015f62e17f42a5aa0b3d20a365926",
        "url": "https://github.com/rustdesk-org/rustdesk_desktop_multi_window"
      },
      "source": "git",
@ -468,7 +468,7 @@
        "path": ".",
        "ref": "24cb88413fa5181d949ddacbb30a65d5c459e7d9",
        "resolved-ref": "24cb88413fa5181d949ddacbb30a65d5c459e7d9",
-        "url": "https://github.com/21pages/dynamic_layouts.git"
+        "url": "https://github.com/rustdesk-org/dynamic_layouts.git"
      },
      "source": "git",
      "version": "0.0.1+1"
@ -635,7 +635,7 @@
        "path": ".",
        "ref": "38951317afe79d953ab25733667bd96e172a80d3",
        "resolved-ref": "38951317afe79d953ab25733667bd96e172a80d3",
-        "url": "https://github.com/21pages/flutter_gpu_texture_renderer"
+        "url": "https://github.com/rustdesk-org/flutter_gpu_texture_renderer"
      },
      "source": "git",
      "version": "0.0.1"
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@ -0,0 +1,110 @@
+{
+  lib,
+  stdenv,
+  esbuild,
+  buildGoModule,
+  fetchFromGitHub,
+  fetchgit,
+  srcOnly,
+  removeReferencesTo,
+  nodejs,
+  pnpm,
+  python3,
+  git,
+  jq,
+  zip,
+}:
+let
+  nodeSources = srcOnly nodejs;
+  esbuild' = esbuild.override {
+    buildGoModule =
+      args:
+      buildGoModule (
+        args
+        // rec {
+          version = "0.19.9";
+          src = fetchFromGitHub {
+            owner = "evanw";
+            repo = "esbuild";
+            rev = "v${version}";
+            hash = "sha256-GiQTB/P+7uVGZfUaeM7S/5lGvfHlTl/cFt7XbNfE0qw=";
+          };
+          vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+        }
+      );
+  };
+  customPython = python3.withPackages (p: [ p.setuptools ]);
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "taler-wallet-core";
+  version = "0.12.12";
+
+  src = fetchgit {
+    url = "https://git.taler.net/wallet-core.git";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-36P74gRFSdDzyas/OFyjdwnoIT3sjVmSs/N4ozld7sE=";
+  };
+
+  nativeBuildInputs = [
+    customPython
+    nodejs
+    pnpm.configHook
+    git
+    jq
+    zip
+  ];
+
+  pnpmDeps = pnpm.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-7az1wJ6BK9nPKirtW/fmXo3013JCPf+TNk/aG/mGTfo=";
+  };
+
+  buildInputs = [ nodejs ];
+
+  # Make a fake git repo with a commit.
+  # Without this, the package does not build.
+  postUnpack = ''
+    git init -b master
+    git config user.email "root@localhost"
+    git config user.name "root"
+    git commit --allow-empty -m "Initial commit"
+  '';
+
+  postPatch = ''
+    patchShebangs packages/*/*.mjs
+    substituteInPlace pnpm-lock.yaml \
+      --replace-fail "esbuild: 0.12.29" "esbuild: ${esbuild'.version}"
+  '';
+
+  preConfigure = ''
+    ./bootstrap
+  '';
+
+  # After the pnpm configure, we need to build the binaries of all instances
+  # of better-sqlite3. It has a native part that it wants to build using a
+  # script which is disallowed.
+  # Adapted from mkYarnModules.
+  preBuild = ''
+    for f in $(find -path '*/node_modules/better-sqlite3' -type d); do
+      (cd "$f" && (
+      npm run build-release --offline --nodedir="${nodeSources}"
+      find build -type f -exec \
+        ${lib.getExe removeReferencesTo} \
+        -t "${nodeSources}" {} \;
+      ))
+    done
+  '';
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  meta = {
+    homepage = "https://git.taler.net/wallet-core.git/";
+    description = "CLI wallet for GNU Taler written in TypeScript and Anastasis Web UI";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [
+      # maintained by the team working on NGI-supported software, no group for this yet
+    ];
+    platforms = lib.platforms.linux;
+    mainProgram = "taler-wallet-cli";
+  };
+})
--- a/pkgs/by-name/ya/yara-x/package.nix
+++ b/pkgs/by-name/ya/yara-x/package.nix
@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "yara-x";
-  version = "0.6.0";
+  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "VirusTotal";
    repo = "yara-x";
    rev = "refs/tags/v${version}";
-    hash = "sha256-KcUBaEn28hNpy1d+uqGQZUlZKCnaLcrB8th9KXHXnuQ=";
+    hash = "sha256-nzTksznwyLncQO2c2+ZI0Bn9kNXl6GthFCrkz3ihS3w=";
  };

-  cargoHash = "sha256-9W68Lm1Jc1GZ7wcS0FROZYGZkrzKn9wVBKdqlBjVOxk=";
+  cargoHash = "sha256-+0aroLCmi2HPILCxLBFzjtHPpe6f6AMkoPdH5CjoyEo=";

  nativeBuildInputs = [ cmake installShellFiles ];

--- a/pkgs/by-name/ze/zed-editor/Cargo.lock
+++ b/pkgs/by-name/ze/zed-editor/Cargo.lock
@ -13839,7 +13839,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.149.6"
+version = "0.150.4"
 dependencies = [
 "activity_indicator",
 "anyhow",
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@ -35,13 +35,13 @@ assert withGLES -> stdenv.isLinux;

 rustPlatform.buildRustPackage rec {
  pname = "zed";
-  version = "0.149.6";
+  version = "0.150.4";

  src = fetchFromGitHub {
    owner = "zed-industries";
    repo = "zed";
    rev = "refs/tags/v${version}";
-    hash = "sha256-YWXK5heCCw6eXhc1Fh7eIC0tzszC86FP3ovzkCYkdtc=";
+    hash = "sha256-dMhsKaqEWyjPjxaSYrz6zAvOzDbWrsPh6oKRu+D57cM=";
    fetchSubmodules = true;
  };

--- a/pkgs/development/guile-modules/guile-git/default.nix
+++ b/pkgs/development/guile-modules/guile-git/default.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "guile-git";
-  version = "0.7.0";
+  version = "0.8.0";

  src = fetchFromGitLab {
    owner = "guile-git";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-7xKs5Biq9HHOJbNILLU1oX8oPuEbti0uLMiobKz//bU=";
+    hash = "sha256-EZ2uGyk1K2YCl/U7EzTKri6CEe8CGDRy4pNRVjp7ZZY=";
  };

  strictDeps = true;
@ -48,4 +48,3 @@ stdenv.mkDerivation rec {
    platforms = guile.meta.platforms;
  };
 }
-
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@ -8,6 +8,7 @@
 , libva
 , wayland
 , wayland-protocols
+, wayland-scanner
 , libdrm
 , udev
 , xorg
@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
    pkg-config
    python3
    bzip2
-    wayland
+    wayland-scanner
  ] ++ lib.optionals enableDocumentation [
    hotdoc
  ];
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@ -1,18 +1,18 @@
-{ lib, fetchurl }:
+{ lib, fetchFromGitLab }:
 # When updating this package, please verify at least these build (assuming x86_64-linux):
 # nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa
 # Ideally also verify:
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
  pname = "mesa";
-  version = "24.1.6";
+  version = "24.2.1";

-  src = fetchurl {
-    urls = [
-      "https://archive.mesa3d.org/mesa-${version}.tar.xz"
-      "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-    ];
-    hash = "sha256-2pTAkI1WYkZzabae2CNtoeFXcUGm59JRcam/Vjg7NOg=";
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "mesa";
+    repo = "mesa";
+    rev = "mesa-${version}";
+    hash = "sha256-1aOK5M4Xe1FnmouOIoyafrvnxyoGpNK8wLVDC8yO4p0=";
  };

  meta = {
--- a/pkgs/development/libraries/mesa/darwin-build-fix.patch
+++ b/pkgs/development/libraries/mesa/darwin-build-fix.patch
@ -0,0 +1,13 @@
+diff --git a/src/glx/glxext.c b/src/glx/glxext.c
+index eee9f040151..289691db26b 100644
+--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
+@@ -800,7 +800,7 @@ AllocAndFetchScreenConfigs(Display * dpy, struct glx_display * priv, Bool zink,
+ 
+ #if defined(GLX_USE_APPLE)
+       if (psc == NULL && priv->driswDisplay) {
+-         psc = priv->driswDisplay->createScreen(i, priv);
+         psc = priv->driswDisplay->createScreen(i, priv, driver_name_is_inferred);
+       }
+ #endif
+ 
--- a/pkgs/development/libraries/mesa/darwin.nix
+++ b/pkgs/development/libraries/mesa/darwin.nix
@ -2,9 +2,11 @@
 {
  lib,
  stdenv,
-  fetchurl,
+  fetchFromGitLab,
  bison,
  flex,
+  libxml2,
+  llvmPackages,
  meson,
  ninja,
  pkg-config,
@ -14,10 +16,14 @@
  zlib,
 }:
 let
-  common = import ./common.nix { inherit lib fetchurl; };
+  common = import ./common.nix { inherit lib fetchFromGitLab; };
 in stdenv.mkDerivation {
  inherit (common) pname version src meta;

+  patches = [
+    ./darwin-build-fix.patch
+  ];
+
  outputs = [ "out" "dev" ];

  nativeBuildInputs = [
@ -29,9 +35,12 @@ in stdenv.mkDerivation {
    python3Packages.packaging
    python3Packages.python
    python3Packages.mako
+    python3Packages.pyyaml
  ];

  buildInputs = [
+    libxml2  # should be propagated from libllvm
+    llvmPackages.libllvm
    Xplugin
    xorg.libX11
    xorg.libXext
@ -46,6 +55,7 @@ in stdenv.mkDerivation {
    "--datadir=${placeholder "out"}/share"
    (lib.mesonEnable "glvnd" false)
    (lib.mesonEnable "shared-glapi" true)
+    (lib.mesonEnable "llvm" true)
  ];

  # Don't need this on Darwin.
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@ -5,8 +5,7 @@
 , elfutils
 , expat
 , fetchCrate
-, fetchurl
-, fetchpatch
+, fetchFromGitLab
 , file
 , flex
 , glslang
@ -41,16 +40,17 @@
 , xorg
 , zstd
 , enablePatentEncumberedCodecs ? true
+, enableValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light

 , galliumDrivers ? [
    "d3d12" # WSL emulated GPU (aka Dozen)
    "iris" # new Intel (Broadwell+)
-    "kmsro" # special "render only" driver for GPUs without a display controller
+    "llvmpipe" # software renderer
    "nouveau" # Nvidia
-    "radeonsi" # new AMD (GCN+)
    "r300" # very old AMD
    "r600" # less old AMD
-    "swrast" # software renderer (aka LLVMPipe)
+    "radeonsi" # new AMD (GCN+)
+    "softpipe" # older software renderer
    "svga" # VMWare virtualized GPU
    "virgl" # QEMU virtualized GPU (aka VirGL)
    "zink" # generic OpenGL over Vulkan, experimental
@ -104,8 +104,8 @@ let
    }
    {
      pname = "proc-macro2";
-      version = "1.0.70";
-      hash = "sha256-e4ZgyZUTu5nAtaH5QVkLelqJQX/XPj/rWkzf/g2c+1g=";
+      version = "1.0.86";
+      hash = "sha256-9fYAlWRGVIwPp8OKX7Id84Kjt8OoN2cANJ/D9ZOUUZE=";
    }
    {
      pname = "quote";
@ -114,8 +114,8 @@ let
    }
    {
      pname = "syn";
-      version = "2.0.39";
-      hash = "sha256-Mjen2L/omhVbhU/+Ao65mogs3BP3fY+Bodab3uU63EI=";
+      version = "2.0.68";
+      hash = "sha256-nGLBbxR0DFBpsXMngXdegTm/o13FBS6QsM7TwxHXbgQ=";
    }
    {
      pname = "unicode-ident";
@ -133,7 +133,7 @@ let

  needNativeCLC = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;

-  common = import ./common.nix { inherit lib fetchurl; };
+  common = import ./common.nix { inherit lib fetchFromGitLab; };
 in stdenv.mkDerivation {
  inherit (common) pname version src meta;

@ -215,6 +215,7 @@ in stdenv.mkDerivation {
    # meson auto_features enables this, but we do not want it
    (lib.mesonEnable "android-libbacktrace" false)
    (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12)
+    (lib.mesonEnable "valgrind" enableValgrind)
  ] ++ lib.optionals enablePatentEncumberedCodecs [
    (lib.mesonOption "video-codecs" "all")
  ] ++ lib.optionals needNativeCLC [
@ -248,13 +249,14 @@ in stdenv.mkDerivation {
    python3Packages.python # for shebang
    spirv-llvm-translator
    udev
-    valgrind-light
    vulkan-loader
    wayland
    wayland-protocols
    xcbutilkeysyms
    xorgproto
    zstd
+  ] ++ lib.optionals enableValgrind [
+    valgrind-light
  ];

  depsBuildBuild = [
@ -275,6 +277,7 @@ in stdenv.mkDerivation {
    python3Packages.pycparser
    python3Packages.mako
    python3Packages.ply
+    python3Packages.pyyaml
    jdupes
    # Use bin output from glslang to not propagate the dev output at
    # the build time with the host glslang.
@ -368,7 +371,7 @@ in stdenv.mkDerivation {
    done

    # add RPATH here so Zink can find libvulkan.so
-    patchelf --add-rpath ${vulkan-loader}/lib $drivers/lib/dri/zink_dri.so
+    patchelf --add-rpath ${vulkan-loader}/lib $out/lib/libgallium*.so
  '';

  env.NIX_CFLAGS_COMPILE = toString ([
--- a/pkgs/development/libraries/protobuf/28.nix
+++ b/pkgs/development/libraries/protobuf/28.nix
@ -0,0 +1,9 @@
+{ callPackage, ... }@args:
+
+callPackage ./generic.nix (
+  {
+    version = "28.0";
+    hash = "sha256-dAyXtBPeZAhmAOWbG1Phh57fqMmkH2AbDUr+8A+irJQ=";
+  }
+  // args
+)
--- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
@ -2,6 +2,7 @@
 , qtbase
 , qtdeclarative
 , wayland
+, wayland-scanner
 , pkg-config
 , libdrm
 , fetchpatch
@ -9,8 +10,11 @@

 qtModule {
  pname = "qtwayland";
-  propagatedBuildInputs = [ qtbase qtdeclarative ];
-  propagatedNativeBuildInputs = [ wayland ];
+  # wayland-scanner needs to be propagated as both build
+  # (for the wayland-scanner binary) and host (for the
+  # actual wayland.xml protocol definition)
+  propagatedBuildInputs = [ qtbase qtdeclarative wayland-scanner ];
+  propagatedNativeBuildInputs = [ wayland wayland-scanner ];
  buildInputs = [ wayland libdrm ];
  nativeBuildInputs = [ pkg-config ];

@ -35,5 +39,11 @@ qtModule {
      url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/632127d7f1d86cba4dd17361f24f9fd70a0ae44c.diff";
      sha256 = "sha256-1EIcMj6+yIpqXAGZB3ZbrwRkl4n1o7TVP2SC1Nu1t78=";
    })
+
+    # Update wayland.xml to version 1.23.0
+    (fetchpatch {
+      url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/c2f61bc47baacf2e6a44c6c3c4e4cbf0abfa4095.diff";
+      sha256 = "sha256-ZcK/LT65oFvTzCukZB8aDYWH5L6RK5MOPs8VtpYQpq0=";
+    })
  ];
 }
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@ -2469,14 +2469,14 @@ buildLuarocksPackage {
 lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
  pname = "lz.n";
-  version = "2.2.0-1";
+  version = "2.5.2-1";
  knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/lz.n-2.2.0-1.rockspec";
-    sha256 = "0ybdmsv7lxgmv5g8dmgsw8qa20lxxj8736814iw9hwynndwl7gck";
+    url    = "mirror://luarocks/lz.n-2.5.2-1.rockspec";
+    sha256 = "1sr6yhkq5bwp8bkqx206cr8ignz5z82a6j1dw4qgwdlvzs5kr0vs";
  }).outPath;
  src = fetchzip {
-    url    = "https://github.com/nvim-neorocks/lz.n/archive/v2.2.0.zip";
-    sha256 = "16z7q6jp53gjmj2vn5vy2bv5x8p18hlxs28apsw59nk0wwz1s9s4";
+    url    = "https://github.com/nvim-neorocks/lz.n/archive/v2.5.2.zip";
+    sha256 = "0pkw6wrrkzv6vl9jxx7qlr8yjghnkr1s7jy66dsw5yzfb8gz8kpd";
  };

  disabled = luaOlder "5.1";
--- a/pkgs/development/python-modules/asana/default.nix
+++ b/pkgs/development/python-modules/asana/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "asana";
-  version = "5.0.9";
+  version = "5.0.10";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "asana";
    repo = "python-asana";
    rev = "refs/tags/v${version}";
-    hash = "sha256-7qJdPIk2xSF909chvjwT9zdSQ6NA6cgwefJGaBw1BQY=";
+    hash = "sha256-nuBvRqrs00OIY3UzN7bF5dB15TZqeE43o1BIpBaJZcQ=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@ -19,7 +19,7 @@

 buildPythonPackage rec {
  pname = "cyclopts";
-  version = "2.9.8";
+  version = "2.9.9";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -28,7 +28,7 @@ buildPythonPackage rec {
    owner = "BrianPugh";
    repo = "cyclopts";
    rev = "refs/tags/v${version}";
-    hash = "sha256-smrx8YSVp3Jr+BAM9ZOfOVS9HOwPveBLHFmcs5ZhQ1M=";
+    hash = "sha256-gU/oqFrOzA6PQTwwGS9si19F+LIondO3MozNDwPDtgs=";
  };

  build-system = [
--- a/pkgs/development/python-modules/osc/default.nix
+++ b/pkgs/development/python-modules/osc/default.nix
@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "osc";
-  version = "1.8.3";
+  version = "1.9.1";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "openSUSE";
    repo = "osc";
    rev = version;
-    hash = "sha256-SREq0rZuCiILBG4RdvtxkTOGKJuYBS3GypLZnSdBvVI=";
+    hash = "sha256-03EDarU7rmsiE96IYHXFuPtD8nWur0qwj8NDzSj8OX0=";
  };

  buildInputs = [ bashInteractive ]; # needed for bash-completion helper
--- a/pkgs/development/python-modules/python-heatclient/default.nix
+++ b/pkgs/development/python-modules/python-heatclient/default.nix
@ -25,14 +25,14 @@

 buildPythonPackage rec {
  pname = "python-heatclient";
-  version = "3.5.0";
+  version = "4.0.0";
  pyproject = true;

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-B1F40HYHFF91mkxwySR/kqCvlwLLtBgqwUvw2byOc9g=";
+    hash = "sha256-ozpv4yyu8lmWmKg2iGMMN8IJ29zr87Gj73dn5QMgifI=";
  };

  build-system = [
--- a/pkgs/development/python-modules/python-ironicclient/default.nix
+++ b/pkgs/development/python-modules/python-ironicclient/default.nix
@ -25,12 +25,12 @@

 buildPythonPackage rec {
  pname = "python-ironicclient";
-  version = "5.7.0";
+  version = "5.8.0";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-Blx0pr73uZA8eHd2iZ9WY+aozBFWsQhWpxoQKtjtJSk=";
+    hash = "sha256-hv7cI1hIZijKhoJxfrxp7hApcfEX2jUmudPilVLslC4=";
  };

  build-system = [
--- a/pkgs/development/python-modules/tesla-fleet-api/default.nix
+++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "tesla-fleet-api";
-  version = "0.7.3";
+  version = "0.7.4";
  pyproject = true;

  disabled = pythonOlder "3.10";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "Teslemetry";
    repo = "python-tesla-fleet-api";
    rev = "refs/tags/v${version}";
-    hash = "sha256-P5cU5TZ2zWVIkFp4USjofA6mOshG9IdjhYLXnY2z9fY=";
+    hash = "sha256-lZuluzOiqqeDFf+DrX0/KNbsUKanUn2xglp3HW0ITso=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/tools/kdash/default.nix
+++ b/pkgs/development/tools/kdash/default.nix
@ -12,13 +12,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "kdash";
-  version = "0.6.0";
+  version = "0.6.1";

  src = fetchFromGitHub {
    owner = "kdash-rs";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-XY6aBqLHbif3RsytNm7JnDXspICJuhS7SJ+ApwTeqX4=";
+    sha256 = "sha256-IpF5uXRxHBmfWkBBJjNvDsyQG5nzFjKbCmmGpG3howo=";
  };

  nativeBuildInputs = [ perl python3 pkg-config ];
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
  buildInputs = [ openssl xorg.xcbutil ]
    ++ lib.optional stdenv.isDarwin AppKit;

-  cargoHash = "sha256-ODQf+Fvil+oBJcM38h1HdrcgtJw0b65f5auLuZtUgik=";
+  cargoHash = "sha256-jm0UCKDy6TrogMPavB86lvk8yKZXubTGGbApk+oP2RQ=";

  meta = with lib; {
    description = "Simple and fast dashboard for Kubernetes";
--- a/pkgs/servers/home-assistant/custom-components/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/default.nix
@ -58,6 +58,8 @@

  smartthinq-sensors = callPackage ./smartthinq-sensors {};

+  solis-sensor = callPackage ./solis-sensor {};
+
  somweb = callPackage ./somweb {};

  spook = callPackage ./spook {};
--- a/pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix
@ -0,0 +1,28 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildHomeAssistantComponent,
+  aiofiles,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "hultenvp";
+  domain = "solis";
+  version = "3.6.0";
+
+  src = fetchFromGitHub {
+    owner = "hultenvp";
+    repo = "solis-sensor";
+    rev = "v${version}";
+    sha256 = "sha256-DIUhUN1UfyXptaldJBsQEsImEnQqi4zFFKp70yXxDSk=";
+  };
+
+  dependencies = [ aiofiles ];
+
+  meta = with lib; {
+    description = "Home Assistant integration for the SolisCloud PV Monitoring portal via SolisCloud API";
+    homepage = "https://github.com/hultenvp/solis-sensor";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jnsgruk ];
+  };
+}
--- a/pkgs/servers/nosql/ferretdb/default.nix
+++ b/pkgs/servers/nosql/ferretdb/default.nix
@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "ferretdb";
-  version = "1.23.1";
+  version = "1.24.0";

  src = fetchFromGitHub {
    owner = "FerretDB";
    repo = "FerretDB";
    rev = "v${version}";
-    hash = "sha256-Y4mMh/3I2ajXnHCR9PQXvuUA/BVIfgNrnAIU0/o7QFw=";
+    hash = "sha256-WMejspnk2PvJhvNGi4h+DF+fzipuOMcS1QWim5DnAhQ=";
  };

  postPatch = ''
@ -20,7 +20,7 @@ buildGoModule rec {
    echo nixpkgs     > build/version/package.txt
  '';

-  vendorHash = "sha256-qBEaL0+sBcT8PTet4Znm4OPHFy+UcIuvwI2ywyv4nDc=";
+  vendorHash = "sha256-GT6e9yd6LF6GFlGBWVAmcM6ysB/6cIGLbnM0hxfX5TE=";

  CGO_ENABLED = 0;

--- a/pkgs/servers/web-apps/kasmweb/default.nix
+++ b/pkgs/servers/web-apps/kasmweb/default.nix
@ -5,12 +5,12 @@

 stdenv.mkDerivation rec {
  pname = "kasmweb";
-  version = "1.12.0";
-  build = "d4fd8a";
+  version = "1.15.0";
+  build = "06fdc8";

  src = fetchzip {
    url = "https://kasm-static-content.s3.amazonaws.com/kasm_release_${version}.${build}.tar.gz";
-    sha256 = "sha256-dCjWmI8gYtoMiMHVNgTg2ZROHXvT4ulynNvnKfMxURo=";
+    sha256 = "sha256-7z5lc4QEpQQdVGMEMc04wXlJTK5VXJ4rufZmDEflJLw=";
  };

  dontConfigure = true;
--- a/pkgs/tools/admin/qovery-cli/default.nix
+++ b/pkgs/tools/admin/qovery-cli/default.nix
@ -9,13 +9,13 @@

 buildGoModule rec {
  pname = "qovery-cli";
-  version = "1.2.4";
+  version = "1.2.5";

  src = fetchFromGitHub {
    owner = "Qovery";
    repo = "qovery-cli";
    rev = "refs/tags/v${version}";
-    hash = "sha256-bTlbrL2pP6KB2g3bMsvyT24/7Sc4I707KL3hJktsWpA=";
+    hash = "sha256-RoHQXlfdVJVumgr/Ruph0O79vSf162fwj8R+MrRnmXY=";
  };

  vendorHash = "sha256-z7O0IAXGCXV63WjaRG+7c7q/rlqkV12XWNLhsduvk6s=";
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@ -21,14 +21,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
  pname = "esphome";
-  version = "2024.8.0";
+  version = "2024.8.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-OI4WjuHSnOIKDIM/8LC1E8TwJRgrhGMjmyzyTFgrIM0=";
+    hash = "sha256-wjvbnqlhg4AHJLQvjWysDXBjECc1sV5ilx1jk8IzILw=";
  };

  nativeBuildInputs = with python.pkgs; [
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -651,7 +651,7 @@ mapAliases ({
  hip-nvidia = throw "'hip-nvidia' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08
  hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21
  ht-rust = xh; # Added 2021-02-13
-  hydra-unstable = hydra_unstable; # added 2022-05-10
+  hydra_unstable = hydra; # Added 2024-08-22
  hydron = throw "hydron has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability";

  hyper-haskell = throw "'hyper-haskell' has been removed. reason: has been broken for a long time and depends on an insecure electron version"; # Added 2024-03-14
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -20758,7 +20758,7 @@ with pkgs;

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

-  hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_22; };
+  hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_22; };

  hydra-cli = callPackage ../development/tools/misc/hydra-cli { };

@ -23168,6 +23168,7 @@ with pkgs;

  inherit
    ({
+      protobuf_28 = callPackage ../development/libraries/protobuf/28.nix { };
      protobuf_27 = callPackage ../development/libraries/protobuf/27.nix { };
      protobuf_26 = callPackage ../development/libraries/protobuf/26.nix { };
      protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { };
@ -23182,6 +23183,7 @@ with pkgs;
        abseil-cpp = abseil-cpp_202103;
      };
    })
+    protobuf_28
    protobuf_27
    protobuf_26
    protobuf_25
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@ -4,7 +4,7 @@
  https://hydra.nixos.org/jobset/nixpkgs/haskell-updates.

  To debug this expression you can use `hydra-eval-jobs` from
-  `pkgs.hydra_unstable` which prints the jobset description
+  `pkgs.hydra` which prints the jobset description
  to `stdout`:

  $ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix