Merge master into staging-next

2025-06-09 19:13:26 +03:00 · 2025-05-09 00:16:24 +00:00 · 2025-05-09 00:16:24 +00:00 · 116f782c56
commit 116f782c56
parent 7b793f256a d53a0ca3e8
103 changed files with 776 additions and 817 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -13079,6 +13079,11 @@
    githubId = 361496;
    name = "Nikola Knežević";
  };
+  koffydrop = {
+    github = "koffydrop";
+    githubId = 67888720;
+    name = "Kira";
+  };
  kolaente = {
    email = "k@knt.li";
    github = "kolaente";
--- a/nixos/modules/programs/regreet.nix
+++ b/nixos/modules/programs/regreet.nix
@ -7,6 +7,7 @@
 let
  cfg = config.programs.regreet;
  settingsFormat = pkgs.formats.toml { };
+  user = config.services.greetd.settings.default_session.user;
 in
 {
  options.programs.regreet = {
@ -25,7 +26,10 @@ in
      '';
    };

-    package = lib.mkPackageOption pkgs [ "greetd" "regreet" ] { };
+    package = lib.mkPackageOption pkgs [
+      "greetd"
+      "regreet"
+    ] { };

    settings = lib.mkOption {
      type = settingsFormat.type;
@ -157,14 +161,19 @@ in
      "greetd/regreet.css" =
        if lib.isPath cfg.extraCss then { source = cfg.extraCss; } else { text = cfg.extraCss; };

-      "greetd/regreet.toml".source = settingsFormat.generate "regreet.toml" cfg.settings;
+      "greetd/regreet.toml".source =
+        if lib.isPath cfg.settings then
+          cfg.settings
+        else
+          settingsFormat.generate "regreet.toml" cfg.settings;
    };

    systemd.tmpfiles.settings."10-regreet" =
      let
        defaultConfig = {
-          user = "greeter";
-          group = config.users.users.${config.services.greetd.settings.default_session.user}.group;
+          inherit user;
+          group =
+            if config.users.users.${user}.group != "" then config.users.users.${user}.group else "greeter";
          mode = "0755";
        };
        dataDir =
@ -177,5 +186,12 @@ in
        "/var/log/regreet".d = defaultConfig;
      }
      // dataDir;
+
+    assertions = [
+      {
+        assertion = (config.users.users.${user} or { }) != { };
+        message = "regreet: user ${user} does not exist. Please create it before referencing it.";
+      }
+    ];
  };
 }
--- a/nixos/modules/services/misc/homepage-dashboard.nix
+++ b/nixos/modules/services/misc/homepage-dashboard.nix
@ -232,12 +232,50 @@ in

      serviceConfig = {
        Type = "simple";
-        DynamicUser = true;
        EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
        StateDirectory = "homepage-dashboard";
        CacheDirectory = "homepage-dashboard";
        ExecStart = lib.getExe cfg.package;
        Restart = "on-failure";
+
+        # hardening
+        DynamicUser = true;
+        DevicePolicy = "closed";
+        CapabilityBoundingSet = "";
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+          "AF_UNIX"
+          "AF_NETLINK"
+        ];
+        DeviceAllow = "";
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateMounts = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectSystem = "strict";
+        LockPersonality = true;
+        RemoveIPC = true;
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "~@resources"
+        ];
+        ProtectProc = "invisible";
+        ProtectHostname = true;
+        UMask = "0077";
+        # cpu widget requires access to /proc
+        ProcSubset = if lib.any (widget: widget.resources.cpu or false) cfg.widgets then "all" else "pid";
      };

      enableStrictShellChecks = true;
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@ -1220,12 +1220,6 @@ in
              type = types.bool;
            };

-            editors_can_admin = mkOption {
-              description = "Editors can administrate dashboards, folders and teams they create.";
-              default = false;
-              type = types.bool;
-            };
-
            user_invite_max_lifetime_duration = mkOption {
              description = ''
                The duration in time a user invitation remains valid before expiring.
@ -1968,6 +1962,12 @@ in
    environment.systemPackages = [ cfg.package ];

    assertions = [
+      {
+        assertion = !(cfg.settings.users ? editors_can_admin);
+        message = ''
+          Option `services.grafana.settings.users.editors_can_admin` has been removed in Grafana 12.
+        '';
+      }
      {
        assertion = cfg.provision.datasources.settings == null || cfg.provision.datasources.path == null;
        message = "Cannot set both datasources settings and datasources path";
--- a/nixos/tests/grafana/provision/default.nix
+++ b/nixos/tests/grafana/provision/default.nix
@ -212,37 +212,37 @@ import ../../make-test-python.nix (
              machine.wait_for_open_port(3000, addr="::1")

          with subtest(f"Successful datasource provision with {description}"):
-              machine.succeed(
+              machine.wait_until_succeeds(
                  "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/datasources/uid/test_datasource | grep Test\ Datasource"
              )

          with subtest(f"Successful dashboard provision with {description}"):
-              machine.succeed(
+              machine.wait_until_succeeds(
                  "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/dashboards/uid/test_dashboard | grep Test\ Dashboard"
              )

          with subtest(f"Successful rule provision with {description}"):
-              machine.succeed(
+              machine.wait_until_succeeds(
                  "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/v1/provisioning/alert-rules/test_rule | grep Test\ Rule"
              )

          with subtest(f"Successful contact point provision with {description}"):
-              machine.succeed(
+              machine.wait_until_succeeds(
                  "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/v1/provisioning/contact-points | grep Test\ Contact\ Point"
              )

          with subtest(f"Successful policy provision with {description}"):
-              machine.succeed(
+              machine.wait_until_succeeds(
                  "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/v1/provisioning/policies | grep Test\ Contact\ Point"
              )

          with subtest(f"Successful template provision with {description}"):
-              machine.succeed(
+              machine.wait_until_succeeds(
                  "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/v1/provisioning/templates | grep Test\ Template"
              )

          with subtest("Successful mute timings provision with {description}"):
-              machine.succeed(
+              machine.wait_until_succeeds(
                  "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/v1/provisioning/mute-timings | grep Test\ Mute\ Timing"
              )
    '';
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@ -32,6 +32,8 @@
  libpng,
  liblqr1Support ? true,
  liblqr1,
+  libraqmSupport ? true,
+  libraqm,
  librawSupport ? true,
  libraw,
  librsvgSupport ? !stdenv.hostPlatform.isMinGW,
@ -134,6 +136,7 @@ stdenv.mkDerivation (finalAttrs: {
    ++ lib.optional ghostscriptSupport ghostscript
    ++ lib.optional liblqr1Support liblqr1
    ++ lib.optional libpngSupport libpng
+    ++ lib.optional libraqmSupport libraqm
    ++ lib.optional librawSupport libraw
    ++ lib.optional libtiffSupport libtiff
    ++ lib.optional libxml2Support libxml2
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -117,13 +117,13 @@
    "vendorHash": null
  },
  "aws": {
-    "hash": "sha256-4vRXU7FtSMrh/Zou3+agXqXXARFdZ0h6hxglKlY9+YU=",
+    "hash": "sha256-wTig0NyANYdITXus9FB7WGQ6BQED7jaVhBYgDzZaU5g=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
    "owner": "hashicorp",
    "repo": "terraform-provider-aws",
-    "rev": "v5.90.0",
+    "rev": "v5.97.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-zjb8SQ6ALQryN7wE4MKn3nhhqEvoeq8CyZd8PlkZJt4="
+    "vendorHash": "sha256-iYVzLsyX17GYd05CTqCMpEy1oDCiNi5F4Xiu0Lp9nTg="
  },
  "azuread": {
    "hash": "sha256-64afLKTgJ58O9GUv3GRTJKw7xgg0cglIv3EvARsxnn0=",
@ -252,13 +252,13 @@
    "vendorHash": "sha256-f6sqKzoQAUpCDrpQdMuK1SuLTKrd2PUn/J6VuKxXGZI="
  },
  "cloudflare": {
-    "hash": "sha256-FPZBU93x82+szFCC8djO88WFedbsVRFlVxZfTf4uAxI=",
+    "hash": "sha256-LghaF/2lc8EqTDL0s7pGnF4C/4Vx3GjGzOyg9Fl2LbE=",
    "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
    "owner": "cloudflare",
    "repo": "terraform-provider-cloudflare",
-    "rev": "v5.3.0",
+    "rev": "v5.4.0",
    "spdx": "Apache-2.0",
-    "vendorHash": "sha256-4iDZXMz3GN7vSAXyDtvGL77ChAjJ/2H7PD/AvYi4BMA="
+    "vendorHash": "sha256-C8KtuuNa2N0u1hTfYFhD/H/MwXS8iIx0gXwEo9BLI+Q="
  },
  "cloudfoundry": {
    "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",
@ -994,11 +994,11 @@
    "vendorHash": null
  },
  "ovh": {
-    "hash": "sha256-kbKoirah2EA8Wa2/d8TFPMUZmnewPPJ/Sgx2tTLeYrM=",
+    "hash": "sha256-KNA/4m7zom8+19JgfwgjIkD3rA9Co8AHI6nviyQOntU=",
    "homepage": "https://registry.terraform.io/providers/ovh/ovh",
    "owner": "ovh",
    "repo": "terraform-provider-ovh",
-    "rev": "v2.1.0",
+    "rev": "v2.2.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -1057,13 +1057,13 @@
    "vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg="
  },
  "proxmox": {
-    "hash": "sha256-dQvJVAxSR0eMeJseDR80MqXX4v7ry794bIr+ilpKBoQ=",
+    "hash": "sha256-agupFUy/4D0gJ12AhJDNt0FPnSWM1laBban13z04pPA=",
    "homepage": "https://registry.terraform.io/providers/Telmate/proxmox",
    "owner": "Telmate",
    "repo": "terraform-provider-proxmox",
-    "rev": "v3.0.1-rc6",
+    "rev": "v3.0.1-rc8",
    "spdx": "MIT",
-    "vendorHash": "sha256-rD4+m0txQhzw2VmQ56/ZXjtQ9QOufseZGg8TrisgAJo="
+    "vendorHash": "sha256-LZ3g/UuI+u4ULaM2taso9GgSsmxJICjKhrSaWIL6nCw="
  },
  "rabbitmq": {
    "hash": "sha256-ArteHTNNUxgiBJamnR1bJFDrvNnqjbJ6D3mj1XlpVUA=",
@ -1147,13 +1147,13 @@
    "vendorHash": null
  },
  "selectel": {
-    "hash": "sha256-Raq7Yaa4yHqpR4JhvITN9Pf0mVvRSwWkpVsYXcHGCvo=",
+    "hash": "sha256-NhU+FB7gZgeBJuFSsioQJlrN0yk/T9hwYhN3fqe+eoA=",
    "homepage": "https://registry.terraform.io/providers/selectel/selectel",
    "owner": "selectel",
    "repo": "terraform-provider-selectel",
-    "rev": "v6.4.0",
+    "rev": "v6.4.1",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-kCVJEIR+3DAOoDzqv1Dd2JUPmEpO3sGHcjbEbMZT4BM="
+    "vendorHash": "sha256-ESoNG3a0JblNnQJHMlnvbNAYWirSqfPabtkZnDMeMp0="
  },
  "sentry": {
    "hash": "sha256-/rulw49DcAi5tk4j6XpvlG0X6HJgcMI+zotKsFU2MmI=",
--- a/pkgs/applications/networking/cluster/terraform-providers/update-provider
+++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider
@ -8,6 +8,7 @@
 #
 set -euo pipefail
 shopt -s inherit_errexit
+set -x

 show_usage() {
  cat <<DOC
@ -97,6 +98,10 @@ echo_provider() {
  echo "== terraform-providers.${provider}: $* =="
 }

+is_stable_version() {
+  [[ $1 =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]
+}
+
 pushd "$(dirname "$0")" >/dev/null

 if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then
@ -112,10 +117,19 @@ fi

 homepage="$(read_attr homepage)"

-registry_response=$(curl -s "${homepage//providers/v1/providers}")
-
 old_rev="$(read_attr rev)"
-rev="$(jq -r '.tag' <<<"${registry_response}")"
+registry_response_unstable=$(curl -s "${homepage//providers/v1/providers}")
+
+if is_stable_version "${old_rev}"; then
+  version_stable=$(jq -r '.versions | map(select(test("^[0-9]+\\.[0-9]+\\.[0-9]+$"))) | last' <<<${registry_response_unstable})
+  registry_response_stable=$(curl -s "${homepage//providers/v1/providers}/${version_stable}")
+  rev="$(jq -r '.tag' <<<${registry_response_stable})"
+  registry_response=$registry_response_stable
+else
+  rev="$(jq -r '.tag' <<<${registry_response_unstable})"
+  registry_response=$registry_response_unstable
+fi
+
 if [[ ${force} != 1 ]]; then
  if [[ ${old_rev} == "${rev}" ]]; then
    echo_provider "already at version ${rev}"
--- a/pkgs/by-name/bi/bicep/package.nix
+++ b/pkgs/by-name/bi/bicep/package.nix
@ -56,7 +56,7 @@ buildDotnetModule rec {
    homepage = "https://github.com/Azure/bicep/";
    changelog = "https://github.com/Azure/bicep/releases/tag/v${version}";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ khaneliman ];
+    maintainers = [ ];
    teams = [ lib.teams.stridtech ];
    mainProgram = "bicep";
  };
--- a/pkgs/by-name/br/brickstore/package.nix
+++ b/pkgs/by-name/br/brickstore/package.nix
@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "brickstore";
-  version = "2024.5.2";
+  version = "2024.12.3";

  src = fetchFromGitHub {
    owner = "rgriebl";
    repo = "brickstore";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-Bu9oNbZm3lx/CfYAReHyWe/kW+kaefDWeBtWLHOCORU=";
+    hash = "sha256-4sxPplZ1t8sSfwTCeeBtfU4U0gcE9FROt6dKvkfyO6Q=";
    fetchSubmodules = true;
  };

@ -45,16 +45,14 @@ stdenv.mkDerivation (finalAttrs: {
    tbb
  ];

-  preConfigure = ''
-    sed -i '/^)$/d' cmake/BuildQCoro.cmake
+  patches = [
+    ./qcoro-cmake.patch # Don't have CMake fetch qcoro from github, get it from nixpkgs
+    ./qjsonvalue-include.patch # Add a required '#include <QtCore/QJsonValue>'
+  ];

+  # Since we get qcoro from nixpkgs instead, change the CMake file to reflect the right directory
+  preConfigure = ''
    substituteInPlace cmake/BuildQCoro.cmake \
-      --replace-fail 'FetchContent_Declare(' ' ' \
-      --replace-fail '    qcoro' ' ' \
-      --replace-fail '    GIT_REPOSITORY https://github.com/danvratil/qcoro.git' ' ' \
-      --replace-fail '    GIT_TAG        v''${QCORO_VERSION}' ' ' \
-      --replace-fail 'FetchContent_GetProperties(qcoro)' ' ' \
-      --replace-fail 'FetchContent_Populate(qcoro)' ' ' \
      --replace-fail \
        'add_subdirectory(''${qcoro_SOURCE_DIR} ''${qcoro_BINARY_DIR} EXCLUDE_FROM_ALL)' \
        'add_subdirectory(${qcoro.src} ${qcoro}bin/qcoro)'
--- a/pkgs/by-name/br/brickstore/qcoro-cmake.patch
+++ b/pkgs/by-name/br/brickstore/qcoro-cmake.patch
@ -0,0 +1,20 @@
+diff --git a/cmake/BuildQCoro.cmake b/cmake/BuildQCoro.cmake
+index 941e813..41c88c6 100644
+--- a/cmake/BuildQCoro.cmake
+++ b/cmake/BuildQCoro.cmake
+@@ -14,14 +14,6 @@ if (BACKEND_ONLY)
+     set(QCORO_WITH_QML OFF)
+ endif()
+ 
+-FetchContent_Declare(
+-    qcoro
+-    GIT_REPOSITORY https://github.com/danvratil/qcoro.git
+-    GIT_TAG        v${QCORO_VERSION}
+-    SOURCE_SUBDIR  "NeedManualAddSubDir" # make it possible to add_subdirectory below
+-)
+-
+-FetchContent_MakeAvailable(qcoro)
+ 
+ set(mll ${CMAKE_MESSAGE_LOG_LEVEL})
+ if (NOT VERBOSE_FETCH)
+
--- a/pkgs/by-name/br/brickstore/qjsonvalue-include.patch
+++ b/pkgs/by-name/br/brickstore/qjsonvalue-include.patch
@ -0,0 +1,12 @@
+diff --git a/src/bricklink/order.cpp b/src/bricklink/order.cpp
+index 14426e5b..59856f0c 100755
+--- a/src/bricklink/order.cpp
+++ b/src/bricklink/order.cpp
+@@ -16,6 +16,7 @@
+ #include <QtSql/QSqlError>
+ #include <QtSql/QSqlQueryModel>
+ #include <QtCore/QLoggingCategory>
+#include <QtCore/QJsonValue>
+ 
+ #include "bricklink/core.h"
+ #include "bricklink/io.h"
--- a/pkgs/by-name/ca/cargo-shuttle/package.nix
+++ b/pkgs/by-name/ca/cargo-shuttle/package.nix
@ -9,17 +9,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-shuttle";
-  version = "0.53.0";
+  version = "0.54.0";

  src = fetchFromGitHub {
    owner = "shuttle-hq";
    repo = "shuttle";
    rev = "v${version}";
-    hash = "sha256-RXt9qcLepJJA+MMFm26UMLuwgh8V13DoBueY1Z+W63w=";
+    hash = "sha256-37HQDiIgwxbMcFo7kM/SZ7dJzZc5CzL03xQNiMkG8l8=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-zaI/W92XyuAXs+wF1KOBEiCRqHiTTMGPiq2wrAbCDH4=";
+  cargoHash = "sha256-CYpAsNzQyIPigZSY/PwzGhYHU0316odwkwvxdcVisYk=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/by-name/ch/chatmcp/package.nix
+++ b/pkgs/by-name/ch/chatmcp/package.nix
@ -14,13 +14,13 @@

 flutter329.buildFlutterApplication rec {
  pname = "chatmcp";
-  version = "0.0.28-alpha";
+  version = "0.0.45";

  src = fetchFromGitHub {
    owner = "daodao97";
    repo = "chatmcp";
    tag = "v${version}";
-    hash = "sha256-QKTZ4gtGEXLGYzQdo1Ej6vFVLpmozywtSWy/fqgQOmI=";
+    hash = "sha256-UeQ0J30d/8jOWgpJRH0E5fyq5mPJpMyihEYmKYj/Hmg=";
  };

  pubspecLock = lib.importJSON ./pubspec.lock.json;
--- a/pkgs/by-name/ch/chatmcp/pubspec.lock.json
+++ b/pkgs/by-name/ch/chatmcp/pubspec.lock.json
@ -4,47 +4,41 @@
      "dependency": "transitive",
      "description": {
        "name": "_fe_analyzer_shared",
-        "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
+        "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "76.0.0"
-    },
-    "_macros": {
-      "dependency": "transitive",
-      "description": "dart",
-      "source": "sdk",
-      "version": "0.3.3"
+      "version": "82.0.0"
    },
    "analyzer": {
      "dependency": "transitive",
      "description": {
        "name": "analyzer",
-        "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
+        "sha256": "13c1e6c6fd460522ea840abec3f677cc226f5fec7872c04ad7b425517ccf54f7",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.11.0"
+      "version": "7.4.4"
    },
    "archive": {
      "dependency": "transitive",
      "description": {
        "name": "archive",
-        "sha256": "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.0.2"
+      "version": "4.0.7"
    },
    "args": {
      "dependency": "transitive",
      "description": {
        "name": "args",
-        "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.6.0"
+      "version": "2.7.0"
    },
    "async": {
      "dependency": "transitive",
@ -90,31 +84,31 @@
      "dependency": "transitive",
      "description": {
        "name": "build_daemon",
-        "sha256": "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948",
+        "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.0.3"
+      "version": "4.0.4"
    },
    "build_resolvers": {
      "dependency": "transitive",
      "description": {
        "name": "build_resolvers",
-        "sha256": "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e",
+        "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.3"
+      "version": "2.4.4"
    },
    "build_runner": {
      "dependency": "direct dev",
      "description": {
        "name": "build_runner",
-        "sha256": "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573",
+        "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.14"
+      "version": "2.4.15"
    },
    "build_runner_core": {
      "dependency": "transitive",
@ -140,11 +134,11 @@
      "dependency": "transitive",
      "description": {
        "name": "built_value",
-        "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2",
+        "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "8.9.3"
+      "version": "8.9.5"
    },
    "cached_network_image": {
      "dependency": "direct main",
@ -196,6 +190,16 @@
      "source": "hosted",
      "version": "2.0.3"
    },
+    "cli_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_config",
+        "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
    "cli_util": {
      "dependency": "transitive",
      "description": {
@ -250,11 +254,11 @@
      "dependency": "transitive",
      "description": {
        "name": "coverage",
-        "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43",
+        "sha256": "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.11.1"
+      "version": "1.13.1"
    },
    "cross_file": {
      "dependency": "transitive",
@ -306,16 +310,6 @@
      "source": "hosted",
      "version": "3.0.1"
    },
-    "dotenv": {
-      "dependency": "direct main",
-      "description": {
-        "name": "dotenv",
-        "sha256": "379e64b6fc82d3df29461d349a1796ecd2c436c480d4653f3af6872eccbc90e1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.2.0"
-    },
    "event_bus": {
      "dependency": "direct main",
      "description": {
@ -326,6 +320,16 @@
      "source": "hosted",
      "version": "2.0.1"
    },
+    "eventflux": {
+      "dependency": "direct main",
+      "description": {
+        "name": "eventflux",
+        "sha256": "f6da4534c84b11531ae84546fbd0202b743ca7ef6bc92c84c0f50d7a1c487a12",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.1"
+    },
    "fake_async": {
      "dependency": "transitive",
      "description": {
@ -340,11 +344,11 @@
      "dependency": "transitive",
      "description": {
        "name": "ffi",
-        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
    },
    "file": {
      "dependency": "transitive",
@ -360,11 +364,11 @@
      "dependency": "direct main",
      "description": {
        "name": "file_picker",
-        "sha256": "cacfdc5abe93e64d418caa9256eef663499ad791bb688d9fd12c85a311968fba",
+        "sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "8.3.2"
+      "version": "8.3.7"
    },
    "fixnum": {
      "dependency": "transitive",
@ -392,15 +396,15 @@
      "source": "hosted",
      "version": "3.4.1"
    },
-    "flutter_dotenv": {
+    "flutter_client_sse": {
      "dependency": "direct main",
      "description": {
-        "name": "flutter_dotenv",
-        "sha256": "b7c7be5cd9f6ef7a78429cabd2774d3c4af50e79cb2b7593e3d5d763ef95c61b",
+        "name": "flutter_client_sse",
+        "sha256": "4ce0297206473dfc064b255fe086713240002e149f52519bd48c21423e4aa5d2",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "5.2.1"
+      "version": "2.0.3"
    },
    "flutter_form_builder": {
      "dependency": "direct main",
@ -422,16 +426,6 @@
      "source": "hosted",
      "version": "0.7.0"
    },
-    "flutter_highlighter": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_highlighter",
-        "sha256": "93173afd47a9ada53f3176371755e7ea4a1065362763976d06d6adfb4d946e10",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.1"
-    },
    "flutter_inappwebview": {
      "dependency": "direct main",
      "description": {
@ -598,26 +592,6 @@
      "source": "sdk",
      "version": "0.0.0"
    },
-    "flutter_markdown": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_markdown",
-        "sha256": "b3ff1ef5fb3924ee02b4d38b974ffae3969d50603e68787684ee9dd45f6f144a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.6+1"
-    },
-    "flutter_markdown_latex": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_markdown_latex",
-        "sha256": "839e76a84abb3632ffcebbd450cf93c7e9894af65622527d23f0084cee1bfd04",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.4"
-    },
    "flutter_math_fork": {
      "dependency": "direct main",
      "description": {
@ -632,11 +606,11 @@
      "dependency": "transitive",
      "description": {
        "name": "flutter_plugin_android_lifecycle",
-        "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e",
+        "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.24"
+      "version": "2.0.28"
    },
    "flutter_popup": {
      "dependency": "direct main",
@ -648,25 +622,15 @@
      "source": "hosted",
      "version": "3.3.4"
    },
-    "flutter_statusbarcolor_ns": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_statusbarcolor_ns",
-        "sha256": "a971b00344dff1bff95c95e1c5d4cd38923a27d0d6fac684ebaf220b1d1abbdc",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.6.0"
-    },
    "flutter_svg": {
      "dependency": "direct main",
      "description": {
        "name": "flutter_svg",
-        "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b",
+        "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.17"
+      "version": "2.1.0"
    },
    "flutter_switch": {
      "dependency": "direct main",
@ -690,16 +654,6 @@
      "source": "sdk",
      "version": "0.0.0"
    },
-    "form_builder_validators": {
-      "dependency": "direct main",
-      "description": {
-        "name": "form_builder_validators",
-        "sha256": "cd617fa346250293ff3e2709961d0faf7b80e6e4f0ff7b500126b28d7422dd67",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "11.1.2"
-    },
    "frontend_server_client": {
      "dependency": "transitive",
      "description": {
@ -731,7 +685,7 @@
      "version": "2.3.2"
    },
    "highlight": {
-      "dependency": "direct main",
+      "dependency": "transitive",
      "description": {
        "name": "highlight",
        "sha256": "5353a83ffe3e3eca7df0abfb72dcf3fa66cc56b953728e7113ad4ad88497cf21",
@ -740,25 +694,15 @@
      "source": "hosted",
      "version": "0.7.0"
    },
-    "highlighter": {
-      "dependency": "direct main",
-      "description": {
-        "name": "highlighter",
-        "sha256": "92180c72b9da8758e1acf39a45aa305a97dcfe2fdc8f3d1d2947c23f2772bfbc",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.1"
-    },
    "html": {
      "dependency": "transitive",
      "description": {
        "name": "html",
-        "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec",
+        "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.15.5"
+      "version": "0.15.6"
    },
    "html2md": {
      "dependency": "direct main",
@ -804,11 +748,11 @@
      "dependency": "transitive",
      "description": {
        "name": "image",
-        "sha256": "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6",
+        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.5.2"
+      "version": "4.5.4"
    },
    "intl": {
      "dependency": "direct main",
@ -834,11 +778,11 @@
      "dependency": "transitive",
      "description": {
        "name": "js",
-        "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf",
+        "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.7.1"
+      "version": "0.7.2"
    },
    "json_annotation": {
      "dependency": "transitive",
@ -920,16 +864,6 @@
      "source": "hosted",
      "version": "1.3.0"
    },
-    "macros": {
-      "dependency": "transitive",
-      "description": {
-        "name": "macros",
-        "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3-main.0"
-    },
    "markdown": {
      "dependency": "direct main",
      "description": {
@ -944,11 +878,11 @@
      "dependency": "direct main",
      "description": {
        "name": "markdown_widget",
-        "sha256": "216dced98962d7699a265344624bc280489d739654585ee881c95563a3252fac",
+        "sha256": "b52c13d3ee4d0e60c812e15b0593f142a3b8a2003cde1babb271d001a1dbdc1c",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.3.2+6"
+      "version": "2.3.2+8"
    },
    "matcher": {
      "dependency": "transitive",
@ -994,11 +928,11 @@
      "dependency": "direct dev",
      "description": {
        "name": "mockito",
-        "sha256": "f99d8d072e249f719a5531735d146d8cf04c580d93920b04de75bef6dfb2daf6",
+        "sha256": "4546eac99e8967ea91bae633d2ca7698181d008e95fa4627330cf903d573277a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "5.4.5"
+      "version": "5.4.6"
    },
    "nested": {
      "dependency": "transitive",
@ -1034,11 +968,31 @@
      "dependency": "transitive",
      "description": {
        "name": "package_config",
-        "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.2.0"
+    },
+    "package_info_plus": {
+      "dependency": "direct main",
+      "description": {
+        "name": "package_info_plus",
+        "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "8.3.0"
+    },
+    "package_info_plus_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "package_info_plus_platform_interface",
+        "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.0"
    },
    "path": {
      "dependency": "direct main",
@ -1074,11 +1028,11 @@
      "dependency": "transitive",
      "description": {
        "name": "path_provider_android",
-        "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2",
+        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.2.15"
+      "version": "2.2.17"
    },
    "path_provider_foundation": {
      "dependency": "transitive",
@ -1120,75 +1074,15 @@
      "source": "hosted",
      "version": "2.3.0"
    },
-    "permission_handler": {
-      "dependency": "direct main",
-      "description": {
-        "name": "permission_handler",
-        "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "11.3.1"
-    },
-    "permission_handler_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_android",
-        "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "12.0.13"
-    },
-    "permission_handler_apple": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_apple",
-        "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "9.4.5"
-    },
-    "permission_handler_html": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_html",
-        "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3+5"
-    },
-    "permission_handler_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_platform_interface",
-        "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.2.3"
-    },
-    "permission_handler_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_windows",
-        "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.1"
-    },
    "petitparser": {
      "dependency": "transitive",
      "description": {
        "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.1.0"
    },
    "platform": {
      "dependency": "transitive",
@ -1224,31 +1118,31 @@
      "dependency": "transitive",
      "description": {
        "name": "posix",
-        "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a",
+        "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.0.1"
+      "version": "6.0.2"
    },
    "provider": {
      "dependency": "direct main",
      "description": {
        "name": "provider",
-        "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c",
+        "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.1.2"
+      "version": "6.1.5"
    },
    "pub_semver": {
      "dependency": "transitive",
      "description": {
        "name": "pub_semver",
-        "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.2.0"
    },
    "pubspec_parse": {
      "dependency": "transitive",
@ -1344,41 +1238,41 @@
      "dependency": "direct main",
      "description": {
        "name": "share_plus",
-        "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da",
+        "sha256": "b2961506569e28948d75ec346c28775bb111986bb69dc6a20754a457e3d97fa0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "10.1.4"
+      "version": "11.0.0"
    },
    "share_plus_platform_interface": {
      "dependency": "transitive",
      "description": {
        "name": "share_plus_platform_interface",
-        "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b",
+        "sha256": "1032d392bc5d2095a77447a805aa3f804d2ae6a4d5eef5e6ebb3bd94c1bc19ef",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "5.0.2"
+      "version": "6.0.0"
    },
    "shared_preferences": {
      "dependency": "direct main",
      "description": {
        "name": "shared_preferences",
-        "sha256": "688ee90fbfb6989c980254a56cb26ebe9bb30a3a2dff439a78894211f73de67a",
+        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.5.1"
+      "version": "2.5.3"
    },
    "shared_preferences_android": {
      "dependency": "transitive",
      "description": {
        "name": "shared_preferences_android",
-        "sha256": "650584dcc0a39856f369782874e562efd002a9c94aec032412c9eb81419cce1f",
+        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.4"
+      "version": "2.4.10"
    },
    "shared_preferences_foundation": {
      "dependency": "transitive",
@ -1414,11 +1308,11 @@
      "dependency": "transitive",
      "description": {
        "name": "shared_preferences_web",
-        "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
+        "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
    },
    "shared_preferences_windows": {
      "dependency": "transitive",
@ -1464,11 +1358,11 @@
      "dependency": "transitive",
      "description": {
        "name": "shelf_web_socket",
-        "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
+        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.1"
+      "version": "3.0.0"
    },
    "sky_engine": {
      "dependency": "transitive",
@ -1530,51 +1424,51 @@
      "dependency": "direct main",
      "description": {
        "name": "sqflite",
-        "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb",
+        "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
    },
    "sqflite_android": {
      "dependency": "transitive",
      "description": {
        "name": "sqflite_android",
-        "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3",
+        "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.1"
    },
    "sqflite_common": {
      "dependency": "transitive",
      "description": {
        "name": "sqflite_common",
-        "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709",
+        "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.5.4+6"
+      "version": "2.5.5"
    },
    "sqflite_common_ffi": {
      "dependency": "direct main",
      "description": {
        "name": "sqflite_common_ffi",
-        "sha256": "883dd810b2b49e6e8c3b980df1829ef550a94e3f87deab5d864917d27ca6bf36",
+        "sha256": "1f3ef3888d3bfbb47785cc1dda0dc7dd7ebd8c1955d32a9e8e9dae1e38d1c4c1",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.3.4+4"
+      "version": "2.3.5"
    },
    "sqflite_darwin": {
      "dependency": "transitive",
      "description": {
        "name": "sqflite_darwin",
-        "sha256": "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c",
+        "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.1+1"
+      "version": "2.4.2"
    },
    "sqflite_platform_interface": {
      "dependency": "transitive",
@ -1587,14 +1481,14 @@
      "version": "2.4.0"
    },
    "sqlite3": {
-      "dependency": "direct main",
+      "dependency": "transitive",
      "description": {
        "name": "sqlite3",
-        "sha256": "35d3726fe18ab1463403a5cc8d97dbc81f2a0b08082e8173851363fcc97b6627",
+        "sha256": "310af39c40dd0bb2058538333c9d9840a2725ae0b9f77e4fd09ad6696aa8f66e",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.7.2"
+      "version": "2.7.5"
    },
    "stack_trace": {
      "dependency": "transitive",
@ -1640,11 +1534,11 @@
      "dependency": "direct main",
      "description": {
        "name": "synchronized",
-        "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225",
+        "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.3.0+3"
+      "version": "3.3.1"
    },
    "term_glyph": {
      "dependency": "transitive",
@ -1730,21 +1624,21 @@
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_android",
-        "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
+        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.3.14"
+      "version": "6.3.16"
    },
    "url_launcher_ios": {
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_ios",
-        "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
+        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.3.2"
+      "version": "6.3.3"
    },
    "url_launcher_linux": {
      "dependency": "transitive",
@ -1780,11 +1674,11 @@
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_web",
-        "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.1"
    },
    "url_launcher_windows": {
      "dependency": "transitive",
@ -1880,31 +1774,31 @@
      "dependency": "transitive",
      "description": {
        "name": "web",
-        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
    },
    "web_socket": {
      "dependency": "transitive",
      "description": {
        "name": "web_socket",
-        "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+        "sha256": "bfe6f435f6ec49cb6c01da1e275ae4228719e59a6b067048c51e72d9d63bcc4b",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.1.6"
+      "version": "1.0.0"
    },
    "web_socket_channel": {
      "dependency": "transitive",
      "description": {
        "name": "web_socket_channel",
-        "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.0.2"
+      "version": "3.0.3"
    },
    "webkit_inspection_protocol": {
      "dependency": "transitive",
@ -1916,25 +1810,15 @@
      "source": "hosted",
      "version": "1.2.1"
    },
-    "widgets_to_image": {
-      "dependency": "direct main",
-      "description": {
-        "name": "widgets_to_image",
-        "sha256": "9a251b95d3a9f10d72420dde9b7e3b0da5eddd47fb19cad066bc68c60b0d1dfb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
    "win32": {
      "dependency": "transitive",
      "description": {
        "name": "win32",
-        "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e",
+        "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "5.10.1"
+      "version": "5.12.0"
    },
    "window_manager": {
      "dependency": "direct main",
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@ -5,13 +5,13 @@
  "packages": {
    "": {
      "dependencies": {
-        "@anthropic-ai/claude-code": "^0.2.101"
+        "@anthropic-ai/claude-code": "^0.2.105"
      }
    },
    "node_modules/@anthropic-ai/claude-code": {
-      "version": "0.2.101",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.101.tgz",
-      "integrity": "sha512-WFfJ4LFize/YOBruAu8/4kX9AWnCWMUSvvaISvJQYxFZwUUVsPGAgtVf4VsWJMYLOSO99gU8unyyGRfRYfretg==",
+      "version": "0.2.105",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.105.tgz",
+      "integrity": "sha512-GR4fOK6WTTgMzM66eHBZsaOA2fKZULgfeZoi87v6Fv6hXGy8SPbrdAH8ULKAPlBqxGlPkUo1KcfyXD5VE28Olw==",
      "hasInstallScript": true,
      "license": "SEE LICENSE IN README.md",
      "dependencies": {
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@ -7,16 +7,16 @@

 buildNpmPackage rec {
  pname = "claude-code";
-  version = "0.2.101";
+  version = "0.2.105";

  nodejs = nodejs_20;

  src = fetchzip {
    url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-rz5SNDj0amXZ32pCuCSHkG08fhi9j8H7JKOl4RYFIrM=";
+    hash = "sha256-es1FjTbD4xtSzziAQL2uW129+sfq0gKN3u/9DARtqPY=";
  };

-  npmDepsHash = "sha256-bOVgp7GljkOrs0gH8cKnjbW7oINm4Pl5TXRAzug+UF0=";
+  npmDepsHash = "sha256-GewrAlGEDdqfYJgdeCyc/i8KmLruwJYo9FlZN1dNa/g=";

  postPatch = ''
    cp ${./package-lock.json} package-lock.json
--- a/pkgs/by-name/cn/cnquery/package.nix
+++ b/pkgs/by-name/cn/cnquery/package.nix
@ -6,18 +6,18 @@

 buildGoModule rec {
  pname = "cnquery";
-  version = "11.52.0";
+  version = "11.53.2";

  src = fetchFromGitHub {
    owner = "mondoohq";
    repo = "cnquery";
    tag = "v${version}";
-    hash = "sha256-Agc8as9PwN9IDeV0tBOPFL2tXYXYaJsa1sd+XXQ7p0k=";
+    hash = "sha256-nqzlwBGsqGFh6yeqEWXE6MJyyiHwFh8ehaJjDbl+yd0=";
  };

  subPackages = [ "apps/cnquery" ];

-  vendorHash = "sha256-gvRsEIYEj5D+P8gFlGdfHC/3Pho5YYZxKm6Mkq8lwQw=";
+  vendorHash = "sha256-CNbpMNT9OX7lAbLugS4vUcOHhtqEQcYFYaTe+HjewdA=";

  ldflags = [
    "-w"
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@ -42,6 +42,7 @@

  # linux installation
  rsync,
+  commandLineArgs ? "",

  # darwin build
  undmg,
@ -162,7 +163,8 @@ stdenvNoCC.mkDerivation {

      wrapProgram $out/bin/cursor \
        --add-flags "--update=false" \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=x11 --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update"
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=x11 --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update" \
+        --add-flags ${lib.escapeShellArg commandLineArgs}
    ''}

    ${lib.optionalString hostPlatform.isDarwin ''
--- a/pkgs/by-name/co/corectrl/Always-locate-polkit-with-pkg-config.diff
+++ b/pkgs/by-name/co/corectrl/Always-locate-polkit-with-pkg-config.diff
@ -0,0 +1,14 @@
+diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
+index 38deb12..7bbaa81 100644
+--- a/src/helper/CMakeLists.txt
+++ b/src/helper/CMakeLists.txt
+@@ -27,8 +27,8 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1")
+ option(POLKIT_POLICY_INSTALL_DIR "Polkit policy files installation directory" OFF)
+ 
+ # Find polkit
+pkg_check_modules(POLKIT REQUIRED polkit-gobject-1)
+ if(NOT POLKIT_POLICY_INSTALL_DIR)
+-  pkg_check_modules(POLKIT REQUIRED polkit-gobject-1)
+   execute_process(
+     COMMAND pkg-config --variable=policydir polkit-gobject-1
+     RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT
--- a/pkgs/by-name/co/corectrl/package.nix
+++ b/pkgs/by-name/co/corectrl/package.nix
@ -1,11 +1,12 @@
 {
  botan3,
-  extra-cmake-modules,
  fetchFromGitLab,
+  cmake,
+  pkg-config,
  hwdata,
  lib,
  libdrm,
-  libsForQt5,
+  kdePackages,
  mesa-demos,
  polkit,
  procps,
@ -18,32 +19,32 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "corectrl";
-  version = "1.4.3";
+  version = "1.5.1";

  src = fetchFromGitLab {
    owner = "corectrl";
    repo = "corectrl";
-    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-rQibIjLmSnkA8jk6GOo68JIeb4wZq0wxXpLs3zsB7GI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-NwGrvDqImiyPc3AsL7rMwNG9na+AzZS6NvXQOc6VWHg=";
  };

  nativeBuildInputs = [
-    extra-cmake-modules
-    libsForQt5.wrapQtAppsHook
+    cmake
+    pkg-config
+    kdePackages.extra-cmake-modules
+    kdePackages.wrapQtAppsHook
  ];

  buildInputs = [
    botan3
    libdrm # TODO: report upstream that libdrm is not detected at configure time
-    libsForQt5.karchive
-    libsForQt5.kauth
-    libsForQt5.qtbase
-    libsForQt5.qtcharts
-    libsForQt5.qtquickcontrols2
-    libsForQt5.qtsvg
-    libsForQt5.qttools
-    libsForQt5.qtxmlpatterns
-    libsForQt5.quazip
+    kdePackages.karchive
+    kdePackages.kauth
+    kdePackages.qtbase
+    kdePackages.qtcharts
+    kdePackages.qtsvg
+    kdePackages.qttools
+    kdePackages.quazip
    mesa-demos
    polkit
    procps
@ -54,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  patches = [
-    ./polkit-dir.patch
+    ./Always-locate-polkit-with-pkg-config.diff
  ];

  cmakeFlags = [
--- a/pkgs/by-name/co/corectrl/polkit-dir.patch
+++ b/pkgs/by-name/co/corectrl/polkit-dir.patch
@ -1,21 +0,0 @@
-diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
-index 3fe2ace..2542ea1 100644
--- a/src/helper/CMakeLists.txt
-+++ b/src/helper/CMakeLists.txt
-@@ -22,15 +22,7 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1")
- 
- # Find polkit
- pkg_check_modules(POLKIT REQUIRED polkit-gobject-1)
-execute_process(
-  COMMAND pkg-config --variable=policydir polkit-gobject-1
-  RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT
-  OUTPUT_VARIABLE POLKIT_POLICY_INSTALL_DIR
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-if(NOT POLKIT_POLICY_INSTALL_DIR_RESULT EQUAL "0")
-  message(FATAL_ERROR "Failed to retrieve Polkit `policydir` variable using pkg-config")
-endif()
-+option(POLKIT_POLICY_INSTALL_DIR "Polkit policy directory")
- 
- list(APPEND HELPER_COMPILE_DEFINITIONS
-   ELPP_THREAD_SAFE
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@ -11,7 +11,7 @@
 }:
 let
  pname = "dependabot-cli";
-  version = "1.62.2";
+  version = "1.63.0";

  # vv Also update this vv
  tag = "nixpkgs-dependabot-cli-${version}";
@ -45,10 +45,10 @@ buildGoModule {
    owner = "dependabot";
    repo = "cli";
    rev = "v${version}";
-    hash = "sha256-LtmCh3RmfKP+9x5pJX7hWLR3EWaWWQ2Vn7Th9fUHsWY=";
+    hash = "sha256-lk0AEFQYemr4wP7JXx5mPzzo2VzSJvygPP5vtUvPaxs=";
  };

-  vendorHash = "sha256-0Q2+UK8giWL4cYJwfZ8gAAAEIYSqjadnUWJghVeIPjQ=";
+  vendorHash = "sha256-pnB1SkuEGm0KfkDfjnoff5fZRsAgD5w2H4UwsD3Jlbo=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/ep/epson-201401w/fixbuild.patch
+++ b/pkgs/by-name/ep/epson-201401w/fixbuild.patch
@ -1,101 +0,0 @@
-diff --git a/src/pagemanager/pagemanager.c b/src/pagemanager/pagemanager.c
-index 029e6d3..3c1f450 100644
--- a/src/pagemanager/pagemanager.c
-+++ b/src/pagemanager/pagemanager.c
-@@ -22,7 +22,7 @@
- #include "epcgdef.h"
- #include "debuglog.h"
- #include "memory.h"
-#include "raster.h"
-+#include "raster-helper.h"
- #include "pagemanager.h"
-
- extern int JobCanceled;
-@@ -45,7 +45,7 @@ fetchRaster(EpsPageManager *pageManager)
- 	int error = 0;
- 	int did_fetch = 0;
- 	int read_bytes = 0;
-	int nraster;
-+	size_t nraster;
-
- 	while (error == 0 && did_fetch == 0 && JobCanceled == 0) {
- 		eps_raster_fetch(privateData->raster_h, NULL, 0, 0, &status);
-@@ -212,7 +212,7 @@ int pageManagerGetPageRegion(EpsPageManager *pageManager, EpsPageRegion *pageReg
- 	return EPS_OK;
- }
-
-int pageManagerGetRaster(EpsPageManager *pageManager, char *buf, int bufSize)
-+size_t pageManagerGetRaster(EpsPageManager *pageManager, char *buf, int bufSize)
- {
- 	PageManagerPrivateData  *privateData = NULL;
- 	int error = EPS_OK;
-diff --git a/src/pagemanager/pagemanager.h b/src/pagemanager/pagemanager.h
-index 87fbbd5..c9743fb 100644
--- a/src/pagemanager/pagemanager.h
-+++ b/src/pagemanager/pagemanager.h
-@@ -31,7 +31,7 @@ extern "C"
- #define	EPS_ERROR	-1
- #define	EPS_OK		0
-
-typedef int (*EpsRasterSource)(char *buf, int bufSize);
-+typedef size_t (*EpsRasterSource)(char *buf, int bufSize);
-
- typedef struct {
- 	EpsRasterSource		rasterSource;
-@@ -47,7 +47,7 @@ typedef struct {
- EpsPageManager* pageManagerCreate(EpsPageRegion pageRegion, EpsFilterPrintOption filterPrintOption, EpsRasterSource rasterSource);
- void pageManagerDestroy(EpsPageManager *pageManager);
- int pageManagerGetPageRegion(EpsPageManager *pageManager, EpsPageRegion *pageRegion);
-int pageManagerGetRaster(EpsPageManager *pageManager, char *buf, int bufSize);
-+size_t pageManagerGetRaster(EpsPageManager *pageManager, char *buf, int bufSize);
- int pageManagerIsNextPage(EpsPageManager *pageManager);
-
- #ifdef __cplusplus
-diff --git a/src/raster/raster.c b/src/raster/raster.c
-index 7e4946b..dd5aef6 100644
--- a/src/raster/raster.c
-+++ b/src/raster/raster.c
-@@ -218,7 +218,7 @@ eps_raster_init (RASTER * handle, EpsRasterOpt * data, EpsRasterPipeline * pipel
-
- /* if raster_p equals NULL means that it is need to flush a page. */
- int
-eps_raster_print (RASTER handle, char * raster_p, int raster_bytes, int pixel_num, int * outraster)
-+eps_raster_print (RASTER handle, char * raster_p, int raster_bytes, int pixel_num, size_t * outraster)
- {
- 	EpsRaster * raster = (EpsRaster *) handle;
- 	EpsRasterPipeline * pipeline = NULL;
-diff --git a/src/raster/raster.h b/src/raster/raster.h
-index 9be0977..cc5054d 100644
--- a/src/raster/raster.h
-+++ b/src/raster/raster.h
-@@ -143,7 +143,7 @@ typedef enum {
- } EpsRasterFetchStatus;
-
- int eps_raster_init (RASTER *, EpsRasterOpt *, EpsRasterPipeline *);
-int eps_raster_print (RASTER, char *, int, int, int *);
-+int eps_raster_print (RASTER, char *, int, int, size_t *);
- int eps_raster_fetch (RASTER, char *, int, int, EpsRasterFetchStatus *);
- int eps_raster_free (RASTER);
-
-diff --git a/src/raster_to_epson.c b/src/raster_to_epson.c
-index 6e621c8..a0811d6 100644
--- a/src/raster_to_epson.c
-+++ b/src/raster_to_epson.c
-@@ -33,7 +33,7 @@
- #include <cups/ppd.h>
- #include <cups/raster.h>
-
-#include "raster.h"
-+#include "raster-helper.h"
- #include "memory.h"
- #include "raster_to_epson.h"
- #include "pagemanager.h"
-@@ -75,7 +75,7 @@ static int page_no = 0;
- static int pageHeight = 0;
- #endif
-
-int rasterSource(char *buf, int bufSize)
-+size_t rasterSource(char *buf, int bufSize)
- {
- 	int readBytes = 0;
- 	if (JobCanceled == 0) {
--- a/pkgs/by-name/ep/epson-201401w/package.nix
+++ b/pkgs/by-name/ep/epson-201401w/package.nix
@ -25,7 +25,6 @@ stdenv.mkDerivation {
    ];
    sha256 = "0c60m1sd59s4sda38dc5nniwa7dh1b0kv1maajr0x9d38gqlyk3x";
  };
-  patches = [ ./fixbuild.patch ];

  nativeBuildInputs = [
    rpmextract
--- a/pkgs/by-name/fa/fanficfare/package.nix
+++ b/pkgs/by-name/fa/fanficfare/package.nix
@ -6,12 +6,12 @@

 python3Packages.buildPythonApplication rec {
  pname = "fanficfare";
-  version = "4.44.0";
+  version = "4.45.0";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-3+2T3qUk9tbQD+GxM2S+iDWNlKE+f3GplBoYIJGAJKE=";
+    hash = "sha256-KCKuPaXH9EqcqrRucJcvDrIEqKE4sx/evkIfoqVcZ4g=";
  };

  nativeBuildInputs = with python3Packages; [
--- a/pkgs/by-name/fr/freewheeling/package.nix
+++ b/pkgs/by-name/fr/freewheeling/package.nix
@ -3,8 +3,6 @@
  stdenv,
  fetchFromGitHub,
  pkg-config,
-  autoreconfHook,
-  gnutls,
  freetype,
  fluidsynth,
  SDL,
@ -18,28 +16,23 @@
  libSM,
  libsndfile,
  libogg,
-  libtool,
+  libX11,
+  nettle,
 }:
-let
-  makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL");
-in

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "freewheeling";
  version = "0.6.6";

  src = fetchFromGitHub {
    owner = "free-wheeling";
    repo = "freewheeling";
-    rev = "v${version}";
-    sha256 = "1xff5whr02cixihgd257dc70hnyf22j3zamvhsvg4lp7zq9l2in4";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-xEZBE/7nUvK2hruqP6QQzlsIDmuniPZg7JEJkCEvzvU=";
  };

-  nativeBuildInputs = [
-    pkg-config
-    autoreconfHook
-    libtool
-  ];
+  nativeBuildInputs = [ pkg-config ];
+
  buildInputs = [
    freetype
    fluidsynth
@ -54,20 +47,11 @@ stdenv.mkDerivation rec {
    libsndfile
    libogg
    libSM
-    (gnutls.overrideAttrs (oldAttrs: {
-      configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ];
-    }))
+    libX11
+    nettle
  ];
-  env.NIX_CFLAGS_COMPILE = toString (
-    makeSDLFlags [
-      SDL
-      SDL_ttf
-      SDL_gfx
-    ]
-    ++ [ "-I${libxml2.dev}/include/libxml2" ]
-  );

-  hardeningDisable = [ "format" ];
+  env.NIX_CFLAGS_COMPILE = "-I${lib.getDev libxml2}/include/libxml2";

  meta = {
    description = "Live looping instrument with JACK and MIDI support";
@ -89,4 +73,4 @@ stdenv.mkDerivation rec {
    platforms = lib.platforms.linux;
    mainProgram = "fweelin";
  };
-}
+})
--- a/pkgs/by-name/fy/fyne/package.nix
+++ b/pkgs/by-name/fy/fyne/package.nix
@ -15,13 +15,13 @@

 buildGoModule rec {
  pname = "fyne";
-  version = "2.6.0";
+  version = "2.6.1";

  src = fetchFromGitHub {
    owner = "fyne-io";
    repo = "fyne";
    tag = "v${version}";
-    hash = "sha256-e3UHOAtafOn1Nxfnjut04uKK3S/gv/08qAiGEW8r5Tc=";
+    hash = "sha256-ONtZd+WlgDUS4XwSvIDkCazPsmiTIXdaQua6fnq5NKQ=";
  };

  vendorHash = "sha256-3lXDkiQoq+rDUN8Am9Bd/DJ5CKQqfQucbHKQrkS4wIg=";
--- a/pkgs/by-name/ga/garnet/package.nix
+++ b/pkgs/by-name/ga/garnet/package.nix
@ -8,13 +8,13 @@

 buildDotnetModule rec {
  pname = "garnet";
-  version = "1.0.63";
+  version = "1.0.64";

  src = fetchFromGitHub {
    owner = "microsoft";
    repo = "garnet";
    tag = "v${version}";
-    hash = "sha256-pOAeWQcZTkvnJGAP8H4dOABcHSEfGI4xTC/eS/3QoTM=";
+    hash = "sha256-0poitBKuCfUtkGWXomQAictt7ts7Qdgq1TvEMSqvdJ4=";
  };

  projectFile = "main/GarnetServer/GarnetServer.csproj";
--- a/pkgs/by-name/gb/gbar/package.nix
+++ b/pkgs/by-name/gb/gbar/package.nix
@ -8,7 +8,7 @@
  pkg-config,
  libdbusmenu-gtk3,
  gtk-layer-shell,
-  stb,
+  libsass,
  wayland-protocols,
  wayland-scanner,
  bluez,
@ -19,13 +19,13 @@

 stdenv.mkDerivation {
  pname = "gbar";
-  version = "unstable-2023-09-21";
+  version = "unstable-2024-12-17";

  src = fetchFromGitHub {
    owner = "scorpion-26";
    repo = "gBar";
-    rev = "96485f408efe411f281fa27dceb6d86399ec7804";
-    hash = "sha256-4zPvo0JBQOV1qn2X2iI8/JWYEQjFf9sDEICIWSCeaWk=";
+    rev = "03bedc7471add061fb15e0ca1c9d2f729b8c5d7b";
+    hash = "sha256-4OfcG1DcqemLrK5D75S1x25g9K0k2+eEUQUXgYEYBf8=";
    fetchSubmodules = true;
  };

@ -44,7 +44,7 @@ stdenv.mkDerivation {
    gtk3
    gtk-layer-shell
    libpulseaudio
-    stb
+    libsass
    libdbusmenu-gtk3
  ];

--- a/pkgs/by-name/go/go-jsonnet/package.nix
+++ b/pkgs/by-name/go/go-jsonnet/package.nix
@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "go-jsonnet";
-  version = "0.20.0";
+  version = "0.21.0";

  src = fetchFromGitHub {
    owner = "google";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-P69tguBrFF/CSCOfHjCfBT5710oJdhZDh3kMCbc32eE=";
+    hash = "sha256-J92xNDpCidbiSsN6NveS6BX6Tx+qDQqkgm6pjk1wBTQ=";
  };

-  vendorHash = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI=";
+  vendorHash = "sha256-Uh2rAXdye9QmmZuEqx1qeokE9Z9domyHsSFlU7YZsZw=";

  subPackages = [ "cmd/jsonnet*" ];

--- a/pkgs/by-name/go/goverter/package.nix
+++ b/pkgs/by-name/go/goverter/package.nix
@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
  pname = "goverter";
-  version = "1.7.0";
+  version = "1.8.2";

  src = fetchFromGitHub {
    owner = "jmattheis";
    repo = "goverter";
    tag = "v${version}";
-    hash = "sha256-VgwmnB6FP7hlUrZpKun38T4K2YSDl9yYuMjdzsEhCF4=";
+    hash = "sha256-f+rTEbr4Cr5PjXZg+E2235opxbakoYkJqEGRtyWrngE=";
  };

-  vendorHash = "sha256-uQ1qKZLRwsgXKqSAERSqf+1cYKp6MTeVbfGs+qcdakE=";
+  vendorHash = "sha256-YOtcidMhtQqw/KxY1R3L3XnrhayGQBvHkRdbvYyCQFM=";

  subPackages = [ "cmd/goverter" ];

--- a/pkgs/by-name/gt/gtree/package.nix
+++ b/pkgs/by-name/gt/gtree/package.nix
@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "gtree";
-  version = "1.11.5";
+  version = "1.11.6";

  src = fetchFromGitHub {
    owner = "ddddddO";
    repo = "gtree";
    rev = "v${version}";
-    hash = "sha256-AEzquSbDFy5vXyIjRvVxMp6ArDiPqy0XfPiPVPisobw=";
+    hash = "sha256-wXMIcDgdAnmmZVUHmNivh8MQ/mxxJ5+OZsdJlr4yjYk=";
  };

-  vendorHash = "sha256-N+w8UreFq/SYjZgFh6QNcC/YsCDze/v2jvD0D19dDUs=";
+  vendorHash = "sha256-1yDa3jfqVmijjm+VWdssJWy0aMfMjSfCXzv6P4GyZvg=";

  subPackages = [
    "cmd/gtree"
--- a/pkgs/by-name/gv/gvproxy/package.nix
+++ b/pkgs/by-name/gv/gvproxy/package.nix
@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "gvproxy";
-  version = "0.8.5";
+  version = "0.8.6";

  src = fetchFromGitHub {
    owner = "containers";
    repo = "gvisor-tap-vsock";
    rev = "v${version}";
-    hash = "sha256-rWZYwQ/wWYAbM0RRNcNboWzKUuNNPDigIFFbFdXDNuo=";
+    hash = "sha256-a/Gd1QUxZ+47sQtndbehx86UjC1DezhqwS5d5VTIjRc=";
  };

  vendorHash = null;
--- a/pkgs/by-name/he/hellwal/package.nix
+++ b/pkgs/by-name/he/hellwal/package.nix
@ -6,12 +6,12 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "hellwal";
-  version = "1.0.3";
+  version = "1.0.4";
  src = fetchFromGitHub {
    owner = "danihek";
    repo = "hellwal";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ei612uqAdEDwodsVDkmI4CGASMzCC/q0+CuNS54B53U=";
+    hash = "sha256-M+b49KhbzvwpMvnfiNe4yy50aUjrGXEajLMmiXEOCgE=";
  };
  nativeBuildInputs = [ makeWrapper ];
  installPhase = ''
--- a/pkgs/by-name/ho/homebank/package.nix
+++ b/pkgs/by-name/ho/homebank/package.nix
@ -13,10 +13,10 @@

 stdenv.mkDerivation rec {
  pname = "homebank";
-  version = "5.8.6";
+  version = "5.9.1";
  src = fetchurl {
    url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz";
-    hash = "sha256-rxOKe/LNeVwTOMXj2emZCe5rM9kgxhjcNcZHf9gm3fU=";
+    hash = "sha256-s1Dtw6bjIUFObCb4VQ4rLBMNwftFlmlVa2H/1+jy44A=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/hy/hydralauncher/package.nix
+++ b/pkgs/by-name/hy/hydralauncher/package.nix
@ -6,10 +6,10 @@
 }:
 let
  pname = "hydralauncher";
-  version = "3.4.5";
+  version = "3.4.7";
  src = fetchurl {
    url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
-    hash = "sha256-vr++NPDTqLSVVN/6YWj1eoGcoBfiinfCMbAryV1yHZA=";
+    hash = "sha256-EZk3nXmq5IohOhTcWBahUqJ8yp3Uqb0E9ybQ4uPtacA=";
  };

  appimageContents = appimageTools.extractType2 { inherit pname src version; };
--- a/pkgs/by-name/io/iotop-c/package.nix
+++ b/pkgs/by-name/io/iotop-c/package.nix
@ -8,26 +8,26 @@

 stdenv.mkDerivation rec {
  pname = "iotop-c";
-  version = "1.27";
+  version = "1.28";

  src = fetchFromGitHub {
    owner = "Tomas-M";
    repo = "iotop";
    rev = "v${version}";
-    sha256 = "sha256-o8OJnZjrDbzzhwfzRWmyCmhBWxMVKRDeDWWBCXy3C90=";
+    sha256 = "sha256-Cauy6q587M/VhMsr1vFlNaEJfteDJmNTjE81m0u+OBc=";
  };

  nativeBuildInputs = [ pkg-config ];
+
  buildInputs = [ ncurses ];
+
  makeFlags = [
-    "DESTDIR=$(out)"
-    "TARGET=iotop-c"
+    "PREFIX=${placeholder "out"}"
+    "BINDIR=${placeholder "out"}/bin"
  ];

  postInstall = ''
-    mv $out/usr/share/man/man8/{iotop,iotop-c}.8
-    ln -s $out/usr/sbin $out/bin
-    ln -s $out/usr/share $out/share
+    mv $out/share/man/man8/{iotop,iotop-c}.8
  '';

  meta = with lib; {
--- a/pkgs/by-name/jd/jd-diff-patch/package.nix
+++ b/pkgs/by-name/jd/jd-diff-patch/package.nix
@ -6,13 +6,13 @@

 buildGoModule (finalAttrs: {
  pname = "jd-diff-patch";
-  version = "2.2.2";
+  version = "2.2.3";

  src = fetchFromGitHub {
    owner = "josephburnett";
    repo = "jd";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-sA3NzCl9dR6cZnZNFa7Sqb1KUPSWA1h8ReZqR+SRjgk";
+    hash = "sha256-ucSJfzkcOpLfI2IcsnKvjpR/hwHNne+liE1b/L/H96g=";
  };

  sourceRoot = "${finalAttrs.src.name}/v2";
--- a/pkgs/by-name/je/jellyfin-rpc/package.nix
+++ b/pkgs/by-name/je/jellyfin-rpc/package.nix
@ -8,17 +8,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "jellyfin-rpc";
-  version = "1.3.2";
+  version = "1.3.3";

  src = fetchFromGitHub {
    owner = "Radiicall";
    repo = "jellyfin-rpc";
    tag = version;
-    hash = "sha256-RZ4G8/gMD2HsNdCJyr1PTKySGcv45a57KAEqAvLBtjQ=";
+    hash = "sha256-zKqP6Wt38ckqCPDS1oncmx92lZJm2oeb3bfpwVc6fUc=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-olg36uXAXVe3BuAqMAlLyokoeDm9wVLfE45tKuGlWF8=";
+  cargoHash = "sha256-k9dGz+1HGcQoDMyqmJ1hEYklfYHibo1PI5jHEe0mr+w=";

  # TODO: Re-enable when upstream bumps the version number internally
  # nativeInstallCheckInputs = [
--- a/pkgs/by-name/ki/kickoff/package.nix
+++ b/pkgs/by-name/ki/kickoff/package.nix
@ -11,17 +11,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "kickoff";
-  version = "0.7.4";
+  version = "0.7.5";

  src = fetchFromGitHub {
    owner = "j0ru";
    repo = "kickoff";
    rev = "v${version}";
-    hash = "sha256-q/+Ik8L58LxOllpEosYyvD38RJb+NIQHslYpgGSwjKc=";
+    hash = "sha256-V4MkVjg5Q8eAJ80V/4SvEIwjVy35/HVewaR1caYLguw=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-iTTwclBbmOALjMnT89w6k8Ix8HKTbBOxKHVgePbbXkA=";
+  cargoHash = "sha256-bkum6NOQL0LVsLvOmKljFHE86ZU3lLDR8+I3wL0Efmk=";

  libPath = lib.makeLibraryPath [
    wayland
--- a/pkgs/by-name/li/libhdhomerun/package.nix
+++ b/pkgs/by-name/li/libhdhomerun/package.nix
@ -10,11 +10,11 @@

 stdenv.mkDerivation rec {
  pname = "libhdhomerun";
-  version = "20231214";
+  version = "20250506";

  src = fetchurl {
    url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz";
-    hash = "sha256-VSoQLoqiq8xBYJDewvb4DaWfl/kfV5aOnp17PcAF268=";
+    hash = "sha256-h5sbxHbJuT537igKhPwRV+fMR9Q+2cg5jYiorF81wDQ=";
  };

  patches = [
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@ -72,13 +72,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
  pname = "llama-cpp";
-  version = "5186";
+  version = "5311";

  src = fetchFromGitHub {
    owner = "ggml-org";
    repo = "llama.cpp";
    tag = "b${finalAttrs.version}";
-    hash = "sha256-f07FvHgRobUbei06kcKHJ1ulLCYARAvo64oWsDBwHO0=";
+    hash = "sha256-xjWr3pdnH1OlLlk5OMgleJus3fBpOoOUlyeCC5IRh+E=";
    leaveDotGit = true;
    postFetch = ''
      git -C "$out" rev-parse --short HEAD > $out/COMMIT
--- a/pkgs/by-name/me/mediamtx/package.nix
+++ b/pkgs/by-name/me/mediamtx/package.nix
@ -1,8 +1,8 @@
 {
  lib,
+  buildGoModule,
  fetchFromGitHub,
  fetchurl,
-  buildGoModule,
  nixosTests,
 }:

@ -12,32 +12,32 @@ let
    hash = "sha256-0BbBIwSW7lnz9bAcFszkzAG1odPTV63sIAyQixMevkk=";
  };
 in
-buildGoModule rec {
+buildGoModule (finalAttrs: {
  pname = "mediamtx";
  # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
-  version = "1.11.3";
+  version = "1.12.2";

  src = fetchFromGitHub {
    owner = "bluenviron";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-LPyyPHTdV9cUDRKSlP+XaMyb+yhSj4Jq0tnT7AnTRqw=";
+    repo = "mediamtx";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-O3Iu9gvCiAVuoJw77MWPyCfuJVcw0E8YWcJBiJq+/Ms=";
  };

-  vendorHash = "sha256-lR2GH/oEdzdnel7wUAVDUQIpKuI4WUsa75Nn44SWloY=";
+  vendorHash = "sha256-0927IeFIC2rhApPVs5ZIvS3yoDN8Km3tHgrRXnP/wBc=";

  postPatch = ''
    cp ${hlsJs} internal/servers/hls/hls.min.js
-    echo "v${version}" > internal/core/VERSION
+    echo "v${finalAttrs.version}" > internal/core/VERSION

    # disable binary-only rpi camera support
    substituteInPlace internal/staticsources/rpicamera/camera_disabled.go \
      --replace-fail '!linux || (!arm && !arm64)' 'linux || !linux'
-    substituteInPlace internal/staticsources/rpicamera/{component,camera,params_serialize,pipe}.go \
+    substituteInPlace internal/staticsources/rpicamera/{camera,params_serialize,pipe}.go \
      --replace-fail '(linux && arm) || (linux && arm64)' 'linux && !linux'
-    substituteInPlace internal/staticsources/rpicamera/component_32.go \
+    substituteInPlace internal/staticsources/rpicamera/camera_32.go \
      --replace-fail 'linux && arm' 'linux && !linux'
-    substituteInPlace internal/staticsources/rpicamera/component_64.go \
+    substituteInPlace internal/staticsources/rpicamera/camera_64.go \
      --replace-fail 'linux && arm64' 'linux && !linux'
  '';

@ -50,11 +50,11 @@ buildGoModule rec {
    inherit (nixosTests) mediamtx;
  };

-  meta = with lib; {
+  meta = {
    description = "SRT, WebRTC, RTSP, RTMP, LL-HLS media server and media proxy";
-    inherit (src.meta) homepage;
-    license = licenses.mit;
+    inherit (finalAttrs.src.meta) homepage;
+    license = lib.licenses.mit;
    mainProgram = "mediamtx";
-    maintainers = with maintainers; [ fpletz ];
+    maintainers = with lib.maintainers; [ fpletz ];
  };
-}
+})
--- a/pkgs/by-name/ml/mlib/package.nix
+++ b/pkgs/by-name/ml/mlib/package.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "mlib";
-  version = "0.7.3";
+  version = "0.7.4";

  src = fetchFromGitHub {
    owner = "P-p-H-d";
    repo = "mlib";
    rev = "V${version}";
-    hash = "sha256-r8ol923tNkZ13QXWjWpMrN6rBjjjg5XoBCho4OKdyvY=";
+    hash = "sha256-yP0oTlUJPllhmSLz0i3t3tIZhSnzwPJD6kzoFnEtrLM=";
  };

  makeFlags = [
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@ -22,21 +22,21 @@ in

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "modrinth-app-unwrapped";
-  version = "0.9.3";
+  version = "0.9.5";

  src = fetchFromGitHub {
    owner = "modrinth";
    repo = "code";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-h+zj4Hm7v8SU6Zy0rIWbOknXVdSDf8b1d4q6M12J5Lc=";
+    hash = "sha256-1+Fmc8qyU3hCZmRNgp90nuvFgaB/GOH6SNc9AyWZYn0=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-RrXSBgVh4UZFHcgUWhUjE7rEm/RZFDSDCpXS22gVjZ0=";
+  cargoHash = "sha256-6hEnXzaL6PnME9s+T+MtmoTQmaux/0m/6xaQ99lwM2I=";

  pnpmDeps = pnpm.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-nFuPFgwJw38XVxhW0QXmU31o+hqJKGJysnPg2YSg2D0=";
+    hash = "sha256-Q6e942R+3+511qFe4oehxdquw1TgaWMyOGOmP3me54o=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/mo/mold/package.nix
+++ b/pkgs/by-name/mo/mold/package.nix
@ -7,7 +7,7 @@
  cmake,
  mimalloc,
  ninja,
-  tbb,
+  tbb_2022_0,
  zlib,
  zstd,

@ -20,17 +20,19 @@
  runCommandCC,
  testers,
  useMoldLinker,
+
+  versionCheckHook,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "mold";
-  version = "2.38.0";
+  version = "2.39.0";

  src = fetchFromGitHub {
    owner = "rui314";
    repo = "mold";
-    rev = "v${version}";
-    hash = "sha256-qtSnzCgWcx1YEcN0LlQ0SNBvciu2Rj1bmekBhcB/la4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-DT8xU1JN3zeJe7o7YQFrnpyN0LtcsclUsIX5jFeVYvA=";
  };

  nativeBuildInputs = [
@ -40,7 +42,7 @@ stdenv.mkDerivation rec {

  buildInputs =
    [
-      tbb
+      tbb_2022_0
      zlib
      zstd
    ]
@ -53,6 +55,10 @@ stdenv.mkDerivation rec {
    "-DMOLD_USE_SYSTEM_TBB:BOOL=ON"
  ];

+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
  passthru = {
    updateScript = nix-update-script { };
    tests =
@ -110,7 +116,7 @@ stdenv.mkDerivation rec {
      };
  };

-  meta = with lib; {
+  meta = {
    description = "Faster drop-in replacement for existing Unix linkers (unwrapped)";
    longDescription = ''
      mold is a faster drop-in replacement for existing Unix linkers. It is
@ -119,13 +125,14 @@ stdenv.mkDerivation rec {
      rapid debug-edit-rebuild cycles.
    '';
    homepage = "https://github.com/rui314/mold";
-    changelog = "https://github.com/rui314/mold/releases/tag/v${version}";
-    license = licenses.mit;
-    platforms = platforms.unix;
+    changelog = "https://github.com/rui314/mold/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
    mainProgram = "mold";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
      azahi
      paveloom
    ];
  };
-}
+})
--- a/pkgs/by-name/my/mysql-workbench/package.nix
+++ b/pkgs/by-name/my/mysql-workbench/package.nix
@ -50,11 +50,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "mysql-workbench";
-  version = "8.0.41";
+  version = "8.0.42";

  src = fetchurl {
    url = "https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${finalAttrs.version}-src.tar.gz";
-    hash = "sha256-H/u1nwizZ9pCEu9JPXRcKshxjvc/efcZ//6ankHcGGk=";
+    hash = "sha256-d4SnNALK76AXWEu0WHX0dZv4co6Q+oCMTYAVV3pd9gU=";
  };

  patches = [
--- a/pkgs/by-name/om/ombi/package.nix
+++ b/pkgs/by-name/om/ombi/package.nix
--- a/pkgs/by-name/om/ombi/update.sh
+++ b/pkgs/by-name/om/ombi/update.sh
--- a/pkgs/by-name/op/openvas-scanner/package.nix
+++ b/pkgs/by-name/op/openvas-scanner/package.nix
@ -31,13 +31,13 @@

 stdenv.mkDerivation rec {
  pname = "openvas-scanner";
-  version = "23.17.0";
+  version = "23.18.0";

  src = fetchFromGitHub {
    owner = "greenbone";
    repo = "openvas-scanner";
    tag = "v${version}";
-    hash = "sha256-HMvtxblp7adr7EMBg1MShkAnEfsP7ENLPhPIBVYZU14=";
+    hash = "sha256-p7+UoIY8LG4XE+ei2qZH30Ic9y0epdpD2z6VWifl2FI=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/pa/pappl/package.nix
+++ b/pkgs/by-name/pa/pappl/package.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "pappl";
-  version = "1.4.8";
+  version = "1.4.9";

  src = fetchFromGitHub {
    owner = "michaelrsweet";
    repo = "pappl";
    tag = "v${version}";
-    hash = "sha256-vp0DQvsQzuiXb5QAXVEcXNvyDJeRM99aO9/baZw9QwA=";
+    hash = "sha256-XHFYwl129iD5rKC1P/roFlX+03uFE8ofwQRIEkUuOCc=";
  };

  outputs = [
--- a/pkgs/by-name/pl/pluto/package.nix
+++ b/pkgs/by-name/pl/pluto/package.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "pluto";
-  version = "5.21.4";
+  version = "5.21.5";

  src = fetchFromGitHub {
    owner = "FairwindsOps";
    repo = "pluto";
    rev = "v${version}";
-    hash = "sha256-tUMQ9d5q4dK63In8uj4+gdrADMMrQLW37UipnSw7hnA=";
+    hash = "sha256-l6w/51vJOghCdKF+wwBoAbhlfaDQhdTzydMlQYsSlio=";
  };

-  vendorHash = "sha256-PABCma+pfguDHxRhvQYCHcjr7Epy2AteC+QiXbAx04k=";
+  vendorHash = "sha256-bGPq8rWuSquP7ybL+jqq6t292WffFSllbjf2+gJocHA=";

  ldflags = [
    "-w"
--- a/pkgs/by-name/po/postfix-tlspol/package.nix
+++ b/pkgs/by-name/po/postfix-tlspol/package.nix
@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "postfix-tlspol";
-  version = "1.8.8";
+  version = "1.8.9";

  src = fetchFromGitHub {
    owner = "Zuplu";
    repo = "postfix-tlspol";
    tag = "v${version}";
-    hash = "sha256-XEQ2SOITUPmqI/+R7/O9ST5m5lHJT5fcBoBQk7GoOZM=";
+    hash = "sha256-SsZyK+DN93o6HgTSAza2ppwHuqoW2strmE/uotuBIAM=";
  };

  vendorHash = null;
--- a/pkgs/by-name/pu/pulumi-esc/package.nix
+++ b/pkgs/by-name/pu/pulumi-esc/package.nix
@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "pulumi-esc";
-  version = "0.13.1";
+  version = "0.14.2";

  src = fetchFromGitHub {
    owner = "pulumi";
    repo = "esc";
    rev = "v${version}";
-    hash = "sha256-EmlZLtlioBbXX71TiqZF9bH2VxLT6u4X7CQQsV0ioeY=";
+    hash = "sha256-vJDhuxbnbDevHeOqS8Mnl3hjNx4Fjw3Ab0ZXa4wJRGA=";
  };

  subPackages = "cmd/esc";
--- a/pkgs/by-name/py/pyenv/package.nix
+++ b/pkgs/by-name/py/pyenv/package.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "pyenv";
-  version = "2.5.5";
+  version = "2.5.6";

  src = fetchFromGitHub {
    owner = "pyenv";
    repo = "pyenv";
    tag = "v${version}";
-    hash = "sha256-6Cl/St+PN4WmVNurw/bxbw0piqcoijxOfBCfDA6jyTk=";
+    hash = "sha256-WdjzogV9+cF9UuSuDxDwYvpDRBLRhbF7Jr61xtZ4N00=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/qu/questdb/package.nix
+++ b/pkgs/by-name/qu/questdb/package.nix
@ -8,11 +8,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "questdb";
-  version = "8.2.3";
+  version = "8.3.1";

  src = fetchurl {
    url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz";
-    hash = "sha256-hjx+SDqwl4wZaLitIP22wULUIAzAoaKYel5UWTZWvvE=";
+    hash = "sha256-y6bOdANERM+21kqv5tn6iRVxEXn3d0KVz2P8YkO0/0M=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/sa/satty/package.nix
+++ b/pkgs/by-name/sa/satty/package.nix
@ -17,17 +17,17 @@
 rustPlatform.buildRustPackage rec {

  pname = "satty";
-  version = "0.17.0";
+  version = "0.18.0";

  src = fetchFromGitHub {
    owner = "gabm";
    repo = "Satty";
    rev = "v${version}";
-    hash = "sha256-Lf/3h6Y6lKWQ8lPJZ6SCm3+w/Dc4m8yUYH7Xv0GAbqo=";
+    hash = "sha256-qsehxmx+iQKG70Es2I+G8hs4G56e/PuPPenNeEQ4sGQ=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-aqFNIxZydyCJX2sRmuVohfyVZdDgYSh7d8UMqog0cm0=";
+  cargoHash = "sha256-VQ8BwEeDM9Dll6GIwXH2wHWwRKJxk3gTrxZ95pFaH4c=";

  nativeBuildInputs = [
    copyDesktopItems
--- a/pkgs/by-name/sc/scala-cli/sources.json
+++ b/pkgs/by-name/sc/scala-cli/sources.json
@ -1,21 +1,21 @@
 {
-  "version": "1.7.1",
+  "version": "1.8.0",
  "assets": {
    "aarch64-darwin": {
      "asset": "scala-cli-aarch64-apple-darwin.gz",
-      "sha256": "0nmqcd8a7qhj8msdwjng0x33024gxwnfby6nw3p2fnm8gjs8y99b"
+      "sha256": "0q4di7f3kfkh8lbzgad1ra6zjgnqfnvjz3a9b6frxr7hcvb7nndw"
    },
    "aarch64-linux": {
      "asset": "scala-cli-aarch64-pc-linux.gz",
-      "sha256": "1ilnahpwrlknh41b7swq3vf4f5wnnpm1snfpi7g6cw9m7sq575m4"
+      "sha256": "0gx5v3q9hcmg17cgsi14k1jw112fflkwh31pzh8s8zi9ch3za7x9"
    },
    "x86_64-darwin": {
      "asset": "scala-cli-x86_64-apple-darwin.gz",
-      "sha256": "17krx8wqizgcac98scihgh34n7y9cd9prpfd6wr09n7xmhrw334b"
+      "sha256": "1s13nbdl242637a0hiwb1cmjqyxm02jgyhk97cj8z1aq8cmg8vnp"
    },
    "x86_64-linux": {
      "asset": "scala-cli-x86_64-pc-linux.gz",
-      "sha256": "0ck252q0wn6q4lv10ydz7w2fj0h33a8a1cf677qwy26d0ciy3ii2"
+      "sha256": "1k81g4kphqyd1xfsn1hih1smir191gp5r8smfxg4fk7lbwl509id"
    }
  }
 }
--- a/pkgs/by-name/sc/scala-cli/update.nix
+++ b/pkgs/by-name/sc/scala-cli/update.nix
@ -35,7 +35,7 @@ writeShellScript "${pname}-update-script" ''
  fi

  nixpkgs=$(git rev-parse --show-toplevel)
-  sources_json="$nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json"
+  sources_json="$nixpkgs/pkgs/by-name/sc/scala-cli/sources.json"

  platform_assets=()

--- a/pkgs/by-name/sc/scooter/package.nix
+++ b/pkgs/by-name/sc/scooter/package.nix
@ -6,17 +6,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "scooter";
-  version = "0.4.0";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "thomasschafer";
    repo = "scooter";
    rev = "v${version}";
-    hash = "sha256-wu9SNcd1+JqTkhUghOiRlGP/za/9Md/lgGrwNA2lCJE=";
+    hash = "sha256-+l2XkG6xUOkfSPe20oXjUKdmBYB7GX0xZuqddC8w/lc=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-DQU3djlSjG1VG2bs+JuegwF3ii+asJXpEEPb95xeXqk=";
+  cargoHash = "sha256-+KvHeTa8x77cMbZNbSeMcr66lAqWSBmfkn1rY+PfqHs=";

  checkFlags = [
    # failed only for buildRustPackage
--- a/pkgs/by-name/sc/scotty/package.nix
+++ b/pkgs/by-name/sc/scotty/package.nix
@ -9,13 +9,13 @@

 buildGoModule (finalAttrs: {
  pname = "scotty";
-  version = "0.4.1";
+  version = "0.5.2";

  src = fetchFromSourcehut {
    owner = "~phw";
    repo = "scotty";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-R9MgX5Am//9ULNKWqfH/JthMhqg4FFitOds7wU5iDSU=";
+    hash = "sha256-3SIgsAdcG44dhEZnoE1FE0prI8aVKtkeYYsmwK+UvUI=";
  };

  # Otherwise checks fail with `panic: open /etc/protocols: operation not permitted` when sandboxing is enabled on Darwin
@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
      --replace-fail '!os.IsNotExist(err)' '!os.IsNotExist(err) && !os.IsPermission(err)'
  '';

-  vendorHash = "sha256-DxtouPfysXsr436YwK9V88rff1hf9Ga7EYytZxxLd/g=";
+  vendorHash = "sha256-9LkWoep4R8Mii34m5wkLCw6AAMP92I1lgQnHajgzae8=";

  env = {
    # *Some* locale is required to be set
--- a/pkgs/by-name/sh/sherlock-launcher/package.nix
+++ b/pkgs/by-name/sh/sherlock-launcher/package.nix
@ -14,13 +14,13 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "sherlock-launcher";
-  version = "0.1.10";
+  version = "0.1.11";

  src = fetchFromGitHub {
    owner = "Skxxtz";
    repo = "sherlock";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-PCgnGRujbeQ2ckXYGAU38+WxGTpIayPVOL3ivnPYFwQ=";
+    hash = "sha256-YuAJbLQc7SIV9HkWGcQBPdZ6uxI5qeeSIaK0t8owe4A=";
  };

  nativeBuildInputs = [
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    wayland
  ];

-  cargoHash = "sha256-053x0ChpE5MCYKzW/nJ29LzGnMgut2RLgb5KkTF17Vc=";
+  cargoHash = "sha256-1swjAwDH1vyMcVv/Mx4P8lrdUJGdvoR1SVIjaUe4zZo=";

  meta = {
    description = "Lightweight and efficient application launcher for Wayland built with Rust and GTK4";
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "signalbackup-tools";
-  version = "20250505";
+  version = "20250507";

  src = fetchFromGitHub {
    owner = "bepaald";
    repo = "signalbackup-tools";
    rev = version;
-    hash = "sha256-LtvR/K+r0Wdnh2b0TkR6mzldF4GKGwKApf4Q+sNj4Ok=";
+    hash = "sha256-i7hL+HrCd2XUdWiySvg3JJhyrfviUeIiyWH8I0pIobA=";
  };

  nativeBuildInputs =
--- a/pkgs/by-name/tr/trickest-cli/package.nix
+++ b/pkgs/by-name/tr/trickest-cli/package.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "trickest-cli";
-  version = "1.9.1";
+  version = "2.0.2";

  src = fetchFromGitHub {
    owner = "trickest";
    repo = "trickest-cli";
    tag = "v${version}";
-    hash = "sha256-oLLPtKKYTHKqyyVuQS/0Xjmce202Dk/Gm1Ajy+hf/YY=";
+    hash = "sha256-b0UiZEuuNqjY43xhwm01PtHTe2YMx6AHLJk336NB0no=";
  };

-  vendorHash = "sha256-gk8YMMvTHBL7yoXU9n0jhtUS472fqLW5m+mSl4Lio6c=";
+  vendorHash = "sha256-Ae0fNzYOAeCMrNFVhw4VvG/BkOMcguIMiBvLGt7wxEo=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/tr/trunk/package.nix
+++ b/pkgs/by-name/tr/trunk/package.nix
@ -8,13 +8,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "trunk";
-  version = "0.21.13";
+  version = "0.21.14";

  src = fetchFromGitHub {
    owner = "trunk-rs";
    repo = "trunk";
    rev = "v${version}";
-    hash = "sha256-Kj0XUO8GSLBUwkvskOidA489cvcHdf9IKSVZ/OqlAnE=";
+    hash = "sha256-0T8ZkBA1Zf4z2HXYeBwJ+2EGoUpxGrqSb4fS4CnL28A=";
  };

  nativeBuildInputs = [ pkg-config ];
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
  checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];

  useFetchCargoVendor = true;
-  cargoHash = "sha256-oXLB/Jbb/J8oXl0IyECIjjv4pdKz94pocD/iTBv4GRs=";
+  cargoHash = "sha256-/5zvbSlMzZHxnAwuu0Jd6WVVjxJtIAQpRwZZHgYyPbs=";

  meta = with lib; {
    homepage = "https://github.com/trunk-rs/trunk";
--- a/pkgs/by-name/up/upx/package.nix
+++ b/pkgs/by-name/up/upx/package.nix
@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "upx";
-  version = "5.0.0";
+  version = "5.0.1";
  src = fetchFromGitHub {
    owner = "upx";
    repo = "upx";
    tag = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-LWir7Quf53G3Q9Lyw+sokn7Rtes2DxeZD8UsYviy3aA=";
+    hash = "sha256-Tkyhr9iuyD2EnVZgo2X/NF0Am12JEZ3vQ9ojOjqsZ2E=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/by-name/ve/versitygw/package.nix
+++ b/pkgs/by-name/ve/versitygw/package.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "versitygw";
-  version = "1.0.12";
+  version = "1.0.13";

  src = fetchFromGitHub {
    owner = "versity";
    repo = "versitygw";
    tag = "v${version}";
-    hash = "sha256-wKD06yyXxV41Lbr2scvTR+fhd4uy6EIlArAVoNxMbzU=";
+    hash = "sha256-BsosWFzaN7P/QXPf86t+fJ6PkBGuykUCTmFEGCgclOE=";
  };

-  vendorHash = "sha256-rgZJn3WvsoV4QfLpceAxVWuBncQGdH5oKnR12FqhyCE=";
+  vendorHash = "sha256-yDHuNqrCfrvKz4spofdw9EH7J9JZvpCYejlz893nwBk=";

  doCheck = false; # Require access to online S3 services

--- a/pkgs/by-name/wc/wcc/package.nix
+++ b/pkgs/by-name/wc/wcc/package.nix
@ -10,14 +10,15 @@
 }:

 stdenv.mkDerivation {
-  pname = "wcc-unstable";
-  version = "0.0.7-unstable-2025-01-13";
+  pname = "wcc";
+  version = "0.0.7-unstable-2025-04-30";

  src = fetchFromGitHub {
    owner = "endrazine";
    repo = "wcc";
-    rev = "fe1f71d7f6c756e196b82a884dc38bb8f8aef4d3";
-    sha256 = "sha256-Kb9QIL+W0JFdfweqZL05OajXGGqXn6e6Jv3IVCr3BwQ=";
+    rev = "8cbb49345d9596dfd37bd1b681753aacaab96475";
+    hash = "sha256-f19EqkXJ97k0gjVBEBLzfNqYZ/J7sCCGBEeFsSax3uU=";
+    deepClone = true;
    fetchSubmodules = true;
  };

@ -34,8 +35,12 @@ stdenv.mkDerivation {
      -e "s#/usr/share/wcc#$out/share/wcc#"

    sed -i -e '/stropts.h>/d' src/wsh/include/libwitch/wsh.h
+
+    sed -i '/wsh-`uname -m`.*-static/d' src/wsh/Makefile
  '';

+  env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
+
  installFlags = [ "DESTDIR=$(out)" ];

  preInstall = ''
@ -60,7 +65,13 @@ stdenv.mkDerivation {
    homepage = "https://github.com/endrazine/wcc";
    description = "Witchcraft compiler collection: tools to convert and script ELF files";
    license = licenses.mit;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ orivej ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+    maintainers = with maintainers; [
+      orivej
+      DieracDelta
+    ];
  };
 }
--- a/pkgs/by-name/ws/wstunnel/package.nix
+++ b/pkgs/by-name/ws/wstunnel/package.nix
@ -8,7 +8,7 @@
 }:

 let
-  version = "10.1.11";
+  version = "10.2.0";
 in

 rustPlatform.buildRustPackage {
@ -19,11 +19,11 @@ rustPlatform.buildRustPackage {
    owner = "erebe";
    repo = "wstunnel";
    tag = "v${version}";
-    hash = "sha256-CtJws2O5ywR2prIlDoMbsPi6SH+ffxdqfCKUByukqpA=";
+    hash = "sha256-j4JJWa8y9fAiCcnFQY9u67XPb6m9cY7Q6p0cxHPQQzc=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-YZrScEdRNZ/RU3PBRThw29Yu04N42nwe5DLLABRZtLw=";
+  cargoHash = "sha256-9YAjC5XBRcXYmQoYs9FoxbVtFoM9hvAweLfrodtj+bw=";

  cargoBuildFlags = [ "--package wstunnel-cli" ];

--- a/pkgs/by-name/xk/xk6/package.nix
+++ b/pkgs/by-name/xk/xk6/package.nix
@ -9,13 +9,13 @@

 buildGoModule rec {
  pname = "xk6";
-  version = "0.19.1";
+  version = "0.19.2";

  src = fetchFromGitHub {
    owner = "grafana";
    repo = "xk6";
    tag = "v${version}";
-    hash = "sha256-LlHInRfKhYhRPfRZTQ9qycnJU8e20NYeEphKBvdcU54=";
+    hash = "sha256-yDPF53hmKvUZB9tu6s20jSDfXKyahkpJ8t6lmz6WzvQ=";
  };

  vendorHash = null;
--- a/pkgs/by-name/xr/xremap/package.nix
+++ b/pkgs/by-name/xr/xremap/package.nix
@ -6,16 +6,16 @@
 }:
 let
  pname = "xremap";
-  version = "0.10.10";
+  version = "0.10.11";

  src = fetchFromGitHub {
    owner = "xremap";
    repo = pname;
    tag = "v${version}";
-    hash = "sha256-U2TSx0O2T53lUiJNpSCUyvkG4Awa0+a4N6meFn09LbI=";
+    hash = "sha256-z9QgiwG4muKYc1N9ycjs9r9QXB8JvzTdkCxu2c3mB9o=";
  };

-  cargoHash = "sha256-8IVexszltzlBBShGkjZwyDKs02udrVpZEOwfzRzAraU=";
+  cargoHash = "sha256-X2tcyf+vG6VFscInyDpcfZr79mSF+M9ziA6/cMJCL7w=";

  buildXremap =
    {
--- a/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix
@ -11,6 +11,7 @@
  qtsvg,
  qttools,
  qtwayland,
+  tzdata,
  wrapQtAppsHook,
  gitUpdater,
 }:
@ -42,12 +43,22 @@ stdenv.mkDerivation rec {
    qtwayland
  ];

+  cmakeFlags = [
+    # fake finding of libsystemd; used to check if we are a systemd-based
+    # distro rather than actually being linked to
+    "-DLIBSYSTEMD_FOUND=TRUE"
+  ];
+
  postPatch = ''
    for f in lxqt-admin-{time,user}/CMakeLists.txt; do
      substituteInPlace $f --replace-fail \
        "\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" \
        "$out/share/polkit-1/actions"
    done
+
+    # patch timezone database file location
+    substituteInPlace lxqt-admin-time/timeadmindialog.cpp \
+      --replace-fail "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
  '';

  passthru.updateScript = gitUpdater { };
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@ -117,6 +117,7 @@ let
    ] null;
    release."2.5.0".sha256 = "sha256-Z5xjO83X/ZoTQlWnVupGXPH3HuJefr57Kv128I0dltg=";
    release."2.4.0".sha256 = "sha256-W2+vVGExLLux8e0nSZESSoMVvrLxhL6dmXkb+JuKiqc=";
+    release."2.3.0".sha256 = "sha256-XVOI+s8Qpa7f17+Xq0y7IGPLFeJqo+cDcd3zfMuO7UU=";
    release."2.2.0".sha256 = "sha256-rADEoqTXM7/TyYkUKsmCFfj6fjpWdnZEOK++5oLfC/I=";
    release."2.0.1".sha256 = "sha256-cuoPsEJ+JRLVc9Golt2rJj4P7lKltTrrmQijjoViooc=";
    release."2.0.0".sha256 = "sha256-A/cH324M21k3SZ7+YWXtaYEbu6dZQq3K0cb1RMKjbsM=";
--- a/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix
@ -58,4 +58,6 @@ with haskellLib;
    sha256 = "sha256-n2q4FGf/pPcI1bhb9srHjHLzaNVehkdN6kQgL0F4MMg=";
  }) super.splitmix;

+  # See https://gitlab.haskell.org/ghc/ghc/-/issues/26019#note_621324, without this flag the build OOMs
+  SHA = haskellLib.appendConfigureFlag "--ghc-option=-fignore-interface-pragmas" super.SHA;
 })
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@ -81,6 +81,12 @@ stdenv.mkDerivation (finalAttrs: rec {
      url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/0554731052d1a97745cb179ab0d45620589dd9c4.patch";
      hash = "sha256-I78wJ4l1DSh+x/e00ZL8uvrGdBH+ufp+EDm0A1XWyCU=";
    })
+    (fetchpatch {
+      # https://nvd.nist.gov/vuln/detail/CVE-2025-43903
+      name = "CVE-2025-43903.patch";
+      url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/f1b9c830f145a0042e853d6462b2f9ca4016c669.patch";
+      hash = "sha256-wZ8fqIAmMnQDf64sWXjfpkhk8TLDWMPUGxz40ktAzFI=";
+    })

    (fetchpatch {
      # fixes build on clang-19
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@ -37,6 +37,7 @@ let
    release."2.0.7".sha256 = "sha256-gCM+vZK6vWlhSO1VMjiWHse23mvxVwRarhxwkIQK7e0=";
    release."2.0.6".sha256 = "sha256-tRUYXQZ0VXrjIZBZ1skdzieUsww4rSNEe5ik+iKpk3U=";
    release."2.0.5".sha256 = "sha256-cHgERFqrfSg5WtUX3UxR6L+QkzS7+t6n4V+wweiEacc=";
+    release."2.0.3".sha256 = "sha256-t2z0sWPiFgp6LuR6CsH/Zk9qfxW+3QjjFcYrB6qSPgc=";
    release."1.20.0".sha256 = "sha256-lctZAIQgOg5d+LfILtWsBVcsemV3zTZYfJfDlCxHtcA=";
    release."1.19.2".sha256 = "sha256-dBj5Ek7PWq/8Btq/dggJUqa8cUtfvbi6EWo/lJEDOU4=";
    release."1.18.2".sha256 = "sha256-usOYukHQ/h4YBxlhYrAkMTVjNm97hq4IArI9bvDzy/k=";
--- a/pkgs/development/python-modules/ansible-builder/default.nix
+++ b/pkgs/development/python-modules/ansible-builder/default.nix
@ -3,12 +3,12 @@
  setuptools,
  setuptools-scm,
  jsonschema,
-  requirements-parser,
  pyyaml,
  podman,
  fetchPypi,
  bindep,
  buildPythonPackage,
+  packaging,
 }:

 buildPythonPackage rec {
@ -33,13 +33,12 @@ buildPythonPackage rec {
    setuptools-scm
  ];

-  buildInputs = [ bindep ];
-
  dependencies = [
    podman
+    bindep
    jsonschema
-    requirements-parser
    pyyaml
+    packaging
  ];

  meta = with lib; {
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@ -359,7 +359,7 @@

 buildPythonPackage rec {
  pname = "boto3-stubs";
-  version = "1.38.9";
+  version = "1.38.11";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -367,7 +367,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "boto3_stubs";
    inherit version;
-    hash = "sha256-TNnEl09LymxJYq7y5kWjFiwyx9eGnJR9BCsFQ436qAQ=";
+    hash = "sha256-QnrqRjn7YptC1BjhOXLc0VahE9oEKQkgeHLrgBqPCcM=";
  };

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

 buildPythonPackage rec {
  pname = "botocore-stubs";
-  version = "1.38.9";
+  version = "1.38.11";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "botocore_stubs";
    inherit version;
-    hash = "sha256-qfpLd669RjpuBRiWHcZi8OabuOtP4DWIj+mh278XmyE=";
+    hash = "sha256-WJjdhVrhUnJdYP9I4fQA/CPRj7D/C5vUpFRYryxEbr4=";
  };

  nativeBuildInputs = [ setuptools ];
--- a/pkgs/development/python-modules/clarifai-grpc/default.nix
+++ b/pkgs/development/python-modules/clarifai-grpc/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "clarifai-grpc";
-  version = "11.3.3";
+  version = "11.3.4";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "Clarifai";
    repo = "clarifai-python-grpc";
    tag = version;
-    hash = "sha256-alBlYWQ75l7vX/XK6QFSSb+g7efUM9Zz1bgROgEgKUw=";
+    hash = "sha256-pRAvVtKQU8UJOkmtyPXCpC+PmZoKbKH7P2DlajXPBQU=";
  };

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

 buildPythonPackage rec {
  pname = "cloudsmith-api";
-  version = "2.0.17";
+  version = "2.0.18";
  format = "wheel";

  disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "cloudsmith_api";
    inherit format version;
-    hash = "sha256-XxstBavFdr3kLAlmrgs4ZrfSkY/W2ymClLbqIxb1wD0=";
+    hash = "sha256-5Mnf1VaEhfhTdmIaSCW5vUDcKc4zWF3IELP1y+1oi48=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/cut-cross-entropy/default.nix
+++ b/pkgs/development/python-modules/cut-cross-entropy/default.nix
@ -18,7 +18,6 @@
  huggingface-hub,
  pandas,
  pytestCheckHook,
-  pythonAtLeast,
  tqdm,
  transformers,
 }:
@ -37,10 +36,6 @@ buildPythonPackage {
    hash = "sha256-BVPon+T7chkpozX/IZU3KZMw1zRzlYVvF/22JWKjT2Y=";
  };

-  # Python 3.13 support requires PyTorch 2.6, which is not merged into master yet
-  # https://github.com/NixOS/nixpkgs/pull/377785
-  disabled = pythonAtLeast "3.13";
-
  build-system = [
    setuptools
    setuptools-scm
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@ -40,7 +40,7 @@

 buildPythonPackage rec {
  pname = "django-allauth";
-  version = "65.6.0";
+  version = "65.7.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -49,7 +49,7 @@ buildPythonPackage rec {
    owner = "pennersr";
    repo = "django-allauth";
    tag = version;
-    hash = "sha256-4ilsaGkfkwKvbaQylvZAelapkH4PZe+/uPh4WgbInlE=";
+    hash = "sha256-1HmEJ5E4Vp/CoyzUegqQXpzKUuz3dLx2EEv7dk8fq8w=";
  };

  nativeBuildInputs = [ gettext ];
--- a/pkgs/development/python-modules/django-maintenance-mode/default.nix
+++ b/pkgs/development/python-modules/django-maintenance-mode/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "django-maintenance-mode";
-  version = "0.21.1";
+  version = "0.22.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "fabiocaccamo";
    repo = "django-maintenance-mode";
    tag = version;
-    hash = "sha256-rZo0yru+y5TkdULBQDMGAVb494PSLtbnNX/7cuphKNk=";
+    hash = "sha256-Gd6Bmir0bHsD7Xaq1N9S8bSMGQWbVCBIA8Cftzu6QB0=";
  };

  nativeBuildInputs = [ setuptools ];
@ -43,7 +43,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Shows a 503 error page when maintenance-mode is on";
    homepage = "https://github.com/fabiocaccamo/django-maintenance-mode";
-    changelog = "https://github.com/fabiocaccamo/django-maintenance-mode/releases/tag/${version}";
+    changelog = "https://github.com/fabiocaccamo/django-maintenance-mode/releases/tag/${src.tag}";
    license = licenses.bsd3;
    maintainers = with maintainers; [ mrmebelman ];
  };
--- a/pkgs/development/python-modules/docling/default.nix
+++ b/pkgs/development/python-modules/docling/default.nix
@ -7,6 +7,7 @@
  poetry-core,

  # dependencies
+  accelerate,
  beautifulsoup4,
  certifi,
  docling-core,
@ -34,6 +35,8 @@
  rtree,
  scipy,
  tesserocr,
+  tqdm,
+  transformers,
  typer,

  # optional dependencies
@ -64,6 +67,7 @@ buildPythonPackage rec {
  ];

  dependencies = [
+    accelerate
    beautifulsoup4
    certifi
    docling-core
@ -91,6 +95,8 @@ buildPythonPackage rec {
    rtree
    scipy
    tesserocr
+    tqdm
+    transformers
    typer
  ];

--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@ -446,8 +446,8 @@ rec {
      "sha256-RQh46jrXqj4bXTRJ+tPR9sql7yUn7Ek9u4p0OU0A7b0=";

  mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.38.9"
-      "sha256-3/V/xDCP9ZGqU8sUapGPrJWpwRhj1qFw2hICNTHC/fQ=";
+    buildMypyBoto3Package "ec2" "1.38.11"
+      "sha256-ZNev1egHwJsXGa8HQBaxZUma2ZEnrFqT6xK+68dExgw=";

  mypy-boto3-ec2-instance-connect =
    buildMypyBoto3Package "ec2-instance-connect" "1.38.0"
@ -614,8 +614,8 @@ rec {
      "sha256-n11mu3O2o2sPL13xPtwlWVvpNfVUdV7l7NO2lXg+ZyM=";

  mypy-boto3-imagebuilder =
-    buildMypyBoto3Package "imagebuilder" "1.38.4"
-      "sha256-6+AO6BK58teLPCzfSdoNVT6y0mzCJRYuI6HJEhvHLbE=";
+    buildMypyBoto3Package "imagebuilder" "1.38.11"
+      "sha256-GjIDucUtcb+AP1Y9FeS8wbLOJbnZXMXtJiQkZJGWVdo=";

  mypy-boto3-importexport =
    buildMypyBoto3Package "importexport" "1.38.0"
@ -866,8 +866,8 @@ rec {
      "sha256-n6yMEzEVwlorfkyPVf3wYsNjbTVvujEd6GR/SRPTCOk=";

  mypy-boto3-medialive =
-    buildMypyBoto3Package "medialive" "1.38.0"
-      "sha256-Pt+ht6keiiA0IsLuGAQvMHdHZFA5r8atQWjv/L2JC6c=";
+    buildMypyBoto3Package "medialive" "1.38.11"
+      "sha256-K0EgOaQKgTAoVlbPqc90j44OI+6YeHUEDe20hWjnyQQ=";

  mypy-boto3-mediapackage =
    buildMypyBoto3Package "mediapackage" "1.38.0"
@ -1174,8 +1174,8 @@ rec {
      "sha256-lBWZesgIKYnjSjUOPBhF4GNsNSk09YDSEyX0qweT3iM=";

  mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.38.7"
-      "sha256-tqb5dUkkvQ+R/aPVdKvGwCEqoVsBYkoCz9ZEG8TisnY=";
+    buildMypyBoto3Package "sagemaker" "1.38.11"
+      "sha256-jImugcJSB+LIaZsUBTyuI9yN3+D8Gw49l5j78VK4Now=";

  mypy-boto3-sagemaker-a2i-runtime =
    buildMypyBoto3Package "sagemaker-a2i-runtime" "1.38.0"
@ -1238,8 +1238,8 @@ rec {
      "sha256-Ir+1OlQHTY3BqVeZQBXOyn+ZVV+ZLIbcwOWU63LOcbw=";

  mypy-boto3-servicecatalog =
-    buildMypyBoto3Package "servicecatalog" "1.38.0"
-      "sha256-xmMOMRCnfNtbz+TeNBc0+z69TIIUt9UGrufk9WMi3oc=";
+    buildMypyBoto3Package "servicecatalog" "1.38.10"
+      "sha256-usT75FXjlu2YAmgLrHVJWISnPmPXqgrl3aq3sPMamMk=";

  mypy-boto3-servicecatalog-appregistry =
    buildMypyBoto3Package "servicecatalog-appregistry" "1.38.0"
@ -1346,20 +1346,20 @@ rec {
      "sha256-b6TgvxWdQI5TAI/OsJzmzlte1v30NdJucdedKgCb9LY=";

  mypy-boto3-synthetics =
-    buildMypyBoto3Package "synthetics" "1.38.0"
-      "sha256-cf3vKJHOS6LJ5fvSYaqZgzou51s3PuLgrhjK0H8/yYA=";
+    buildMypyBoto3Package "synthetics" "1.38.11"
+      "sha256-t9gwrPdz8QSB6pDeOZgB+Jl/I91vG58et5XzTXXqZuA=";

  mypy-boto3-textract =
    buildMypyBoto3Package "textract" "1.38.0"
      "sha256-rfDZLT1heNBkjv4jrZSrhFV29TxEVfhOYmcZRzU4lx0=";

  mypy-boto3-timestream-query =
-    buildMypyBoto3Package "timestream-query" "1.38.0"
-      "sha256-yt89uXt+WYL+CtXAKDcqAUOzw5Xo8O0yGBbHrKm+Jfk=";
+    buildMypyBoto3Package "timestream-query" "1.38.10"
+      "sha256-FYUbGPt20ViawEF9UD3iY7US0JQcSavXV65vm4VvHwI=";

  mypy-boto3-timestream-write =
-    buildMypyBoto3Package "timestream-write" "1.38.0"
-      "sha256-2+5HhSZQW1QzHRdCtN6A6vXszMlM+UZJgsdelk/Xvxs=";
+    buildMypyBoto3Package "timestream-write" "1.38.10"
+      "sha256-Dbihs7mHeWkNzIMMgmxArM9OfWJM5FgDEc2VOMLaT9U=";

  mypy-boto3-tnb =
    buildMypyBoto3Package "tnb" "1.38.0"
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@ -46,7 +46,7 @@

 buildPythonPackage rec {
  pname = "openai";
-  version = "1.77.0";
+  version = "1.78.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -55,7 +55,7 @@ buildPythonPackage rec {
    owner = "openai";
    repo = "openai-python";
    tag = "v${version}";
-    hash = "sha256-98AMzb3VwfM41nRIOrPw75PYNGqHRldTAfeHRm8I7XI=";
+    hash = "sha256-LY9px7l0xY1nnCagepm5p1USw4WW15Sc1UN7+Ep7bqo=";
  };

  postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"'';
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "peewee";
-  version = "3.17.9";
+  version = "3.18.1";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "coleifer";
    repo = "peewee";
    tag = version;
-    hash = "sha256-NpGTwiHI0nL/nCAqHT4v58sI0QRiFSyPFVyGOVJ0Fnk=";
+    hash = "sha256-7MLDhMiW9LaedPMQ2QqSqos4SegzUmTX1joyV18MkEg=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/posthog/default.nix
+++ b/pkgs/development/python-modules/posthog/default.nix
@ -62,11 +62,17 @@ buildPythonPackage rec {
    "test_flush_interval"
  ];

-  meta = with lib; {
+  disabledTestPaths = [
+    # Revisit this at the next version bump, issue open upstream
+    # See https://github.com/PostHog/posthog-python/issues/234
+    "posthog/test/ai/openai/test_openai.py"
+  ];
+
+  meta = {
    description = "Module for interacting with PostHog";
    homepage = "https://github.com/PostHog/posthog-python";
    changelog = "https://github.com/PostHog/posthog-python/blob/${src.tag}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ happysalada ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ happysalada ];
  };
 }
--- a/pkgs/development/python-modules/pyngrok/default.nix
+++ b/pkgs/development/python-modules/pyngrok/default.nix
@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "pyngrok";
-  version = "7.2.5";
+  version = "7.2.7";
  pyproject = true;

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-mhKFLWP76iUaRj2FXVEO1QQBoC5ptKeinIbRtQxeOHU=";
+    hash = "sha256-p/bqJHUUCE6WN/1AUprduRihfB2BuERv8hJdjNKknhk=";
  };

  build-system = [
--- a/pkgs/development/python-modules/pytest-md-report/default.nix
+++ b/pkgs/development/python-modules/pytest-md-report/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "pytest-md-report";
-  version = "0.6.3";
+  version = "0.7.0";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "pytest_md_report";
    inherit version;
-    hash = "sha256-fpHtDAQhsUk8ESbvmWvbUhiCqWogy9Wyzwo4lFSVqFI=";
+    hash = "sha256-O4Mur2YLRwtXQuWNnJpeMSsHEqcBLSUcwE6QioHOPJY=";
  };

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

 buildPythonPackage rec {
  pname = "yamllint";
-  version = "1.37.0";
+  version = "1.37.1";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "adrienverge";
    repo = "yamllint";
    tag = "v${version}";
-    hash = "sha256-874VqcJyHMVIvrR3qzL2H7/Hz7qRb7GDWI56SAdCz00=";
+    hash = "sha256-CohqiBoQcgvGVP0Bt6U768BY1aIwh59YRsgzJfaDmP0=";
  };

  build-system = [ setuptools ];
@ -52,7 +52,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Linter for YAML files";
    homepage = "https://github.com/adrienverge/yamllint";
-    changelog = "https://github.com/adrienverge/yamllint/blob/v${version}/CHANGELOG.rst";
+    changelog = "https://github.com/adrienverge/yamllint/blob/${src.tag}/CHANGELOG.rst";
    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ mikefaille ];
    mainProgram = "yamllint";
--- a/pkgs/games/chiaki/default.nix
+++ b/pkgs/games/chiaki/default.nix
@ -4,8 +4,6 @@
  fetchgit,
  cmake,
  pkg-config,
-  protobuf,
-  python3Packages,
  ffmpeg,
  libopus,
  mkDerivation,
@ -16,6 +14,7 @@
  libevdev,
  udev,
  qtmacextras,
+  nanopb,
 }:

 mkDerivation rec {
@ -32,10 +31,6 @@ mkDerivation rec {
  nativeBuildInputs = [
    cmake
    pkg-config
-    protobuf
-    python3Packages.protobuf
-    python3Packages.python
-    python3Packages.setuptools
  ];

  buildInputs =
@ -45,8 +40,8 @@ mkDerivation rec {
      qtbase
      qtmultimedia
      qtsvg
-      protobuf
      SDL2
+      nanopb
    ]
    ++ lib.optionals stdenv.hostPlatform.isLinux [
      libevdev
--- a/pkgs/games/dwarf-fortress/df.lock.json
+++ b/pkgs/games/dwarf-fortress/df.lock.json
@ -1,28 +1,28 @@
 {
  "game": {
    "latest": {
-      "linux": "51.10",
+      "linux": "51.11",
      "darwin": "0.47.05"
    },
    "versions": {
-      "51.10": {
+      "51.11": {
        "df": {
-          "version": "51.10",
+          "version": "51.11",
          "urls": {
            "linux": {
-              "url": "https://www.bay12games.com/dwarves/df_51_10_linux.tar.bz2",
-              "outputHash": "sha256-r4dadc/nch2smNHt4Ixa2FG2Sc1NFmY88iSnFFeMcz0="
+              "url": "https://www.bay12games.com/dwarves/df_51_11_linux.tar.bz2",
+              "outputHash": "sha256-51cwIFMm5cwSaXjjhpz4pS3D8B5/Mt5+k1ALu1F+JWc="
            }
          }
        },
        "hack": {
-          "version": "51.10-r1",
+          "version": "51.11-r1.2",
          "git": {
            "url": "https://github.com/DFHack/dfhack.git",
-            "revision": "51.10-r1",
-            "outputHash": "sha256-TsgafCiLX/IZXgBdqQaRt7hmATwKz80x2xclCwdE3fM="
+            "revision": "51.11-r1.2",
+            "outputHash": "sha256-x8zY8IGDhnyoeNz24Mt00o+2XLzSHZG165MXQHXW+YA="
          },
-          "xmlRev": "ec3ab067aef716817d9c5b84a6fb85bc22516caa"
+          "xmlRev": "6502bdefd1796315365a7bb58e30e0ce34359bea"
        }
      },
      "50.15": {
@ -96,12 +96,12 @@
    }
  },
  "therapist": {
-    "version": "42.1.12",
-    "maxDfVersion": "51.10",
+    "version": "42.1.13",
+    "maxDfVersion": "51.11",
    "git": {
      "url": "https://github.com/Dwarf-Therapist/Dwarf-Therapist.git",
-      "revision": "v42.1.12",
-      "outputHash": "sha256-/6tiFjfrAziw7XeEzPoNFgrsXk8Z7ea2PGjCvJlRt+A="
+      "revision": "v42.1.13",
+      "outputHash": "sha256-y/kUur/BTArznrEzw54FZBrxnD2KXHcwfrHE4WvoemA="
    }
  }
 }
--- a/pkgs/games/dwarf-fortress/update.rb
+++ b/pkgs/games/dwarf-fortress/update.rb
@ -60,17 +60,17 @@ module Mergeable
    self.members.each do |member|
      if @@expensive && @@expensive.include?(member)
        # Already computed
-        hash[member] = self[member]
-      elsif self[member] && self[member].is_a?(Mergeable)
+        hash[member] = other[member] || self.send(member)
+      elsif self.send(member) && self.send(member).is_a?(Mergeable)
        # Merge it
-        hash[member] = self[member].merge(other[member])
-      elsif self[member] && self[member].is_a?(Hash)
-        hash[member] = Hash[other[member].map {
-          [_1, self[member][_1] && self[member][_1].is_a?(Mergeable) ? self[member][_1].merge(_2) : _2]
+        hash[member] = self.send(member).merge(other.send(member))
+      elsif self.send(member) && self.send(member).is_a?(Hash)
+        hash[member] = Hash[other.send(member).map {
+          [_1, self.send(member)[_1] && self.send(member)[_1].is_a?(Mergeable) ? self.send(member)[_1].merge(_2) : _2]
        }]
      else
        # Compute it
-        hash[member] = other[member]
+        hash[member] = other.send(member)
      end
    end
    self.class.new(**hash)
@ -82,6 +82,18 @@ module Mergeable
    attrs.each {@@expensive << _1}
    self
  end
+
+  # Materializes this object.
+  def materialize!
+    self.members.each do |name|
+      member = self.send(name)
+      if member.respond_to?(:materialize!)
+        member.materialize!
+      end
+      self[name] = member
+    end
+    self
+  end
 end

 module Versionable
@ -417,6 +429,9 @@ class DFWithHackVersions < Struct.new(:latest, :versions, keyword_init: true)
        self.versions[df_version.version] = DFWithHackVersion.new(df: df_version, hack: latest_dfhack_version)
      end
    end
+
+    self.materialize!
+    self
  end

  # Converts a hash to a DFWithHackVersions.
@ -488,7 +503,8 @@ class Therapist < Struct.new(:version, :max_df_version, :git, keyword_init: true
    latest = self.class.latest
    self.version = latest.version
    self.max_df_version = latest.max_df_version
-    self.git = nil
+    self.git = latest.git
+    self.materialize!
    self
  end

--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@ -7,16 +7,13 @@
  tzdata,
  wire,
  yarn-berry_4,
-  nodejs,
  python3,
-  cacert,
  jq,
  moreutils,
  nix-update-script,
  nixosTests,
  xcbuild,
  faketty,
-  git,
 }:

 let
@ -30,21 +27,21 @@ let
  # pulling it out of the Git history every few months and checking which files
  # we need to update now is slightly annoying.
  patchGoVersion = ''
-    find . -name go.mod -not -path "./.bingo/*" -print0 | while IFS= read -r -d ''' line; do
+    find . -name go.mod -not -path "./.bingo/*" -not -path "./.citools/*" -print0 | while IFS= read -r -d ''' line; do
      substituteInPlace "$line" \
-        --replace-fail "go 1.23.7" "go 1.23.7"
+        --replace-fail "go 1.24.2" "go 1.24.2"
    done
    find . -name go.work -print0 | while IFS= read -r -d ''' line; do
      substituteInPlace "$line" \
-        --replace-fail "go 1.23.7" "go 1.23.7"
+        --replace-fail "go 1.24.2" "go 1.24.2"
    done
    substituteInPlace Makefile \
-      --replace-fail "GO_VERSION = 1.23.7" "GO_VERSION = 1.23.7"
+      --replace-fail "GO_VERSION = 1.24.2" "GO_VERSION = 1.24.2"
  '';
 in
 buildGoModule rec {
  pname = "grafana";
-  version = "11.6.0+security-01";
+  version = "12.0.0";

  subPackages = [
    "pkg/cmd/grafana"
@ -56,7 +53,7 @@ buildGoModule rec {
    owner = "grafana";
    repo = "grafana";
    rev = "v${version}";
-    hash = "sha256-JG4Dr0CGDYHH6hBAAtdHPO8Vy9U/bg4GPzX6biZk028=";
+    hash = "sha256-VibGeRU0qCkEWUw9yVzG6LG1nomDsn17DBYAfV2eN5E=";
  };

  # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@ -70,14 +67,14 @@ buildGoModule rec {
  missingHashes = ./missing-hashes.json;
  offlineCache = yarn-berry_4.fetchYarnBerryDeps {
    inherit src missingHashes;
-    hash = "sha256-tpQjEa4xeD4fmrucynt8WVVXZ3uN5WxjSF8YcjE6HLU=";
+    hash = "sha256-yLrGllct+AGG/u/E2iX2gog1d/iKNfkYu6GV6Pw6nuc=";
  };

  disallowedRequisites = [ offlineCache ];

  postPatch = patchGoVersion;

-  vendorHash = "sha256-Ziohfy9fMVmYnk9c0iRNi4wJZd2E8vCP+ozsTM0eLTA=";
+  vendorHash = "sha256-dpLcU4ru/wIsxwYAI1qROtYwHJ2WOJSZpIhd9/qMwZo=";

  proxyVendor = true;

@ -93,6 +90,16 @@ buildGoModule rec {
    yarn-berry_4.yarnBerryConfigHook
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcbuild ];

+  # We have to remove this setupHook, otherwise it also runs in the `goModules`
+  # derivation and fails because `offlineCache` is missing there.
+  overrideModAttrs = (
+    old: {
+      nativeBuildInputs = lib.filter (
+        x: lib.getName x != (lib.getName yarn-berry_4.yarnBerryConfigHook)
+      ) old.nativeBuildInputs;
+    }
+  );
+
  postConfigure = ''
    # Generate DI code that's required to compile the package.
    # From https://github.com/grafana/grafana/blob/v8.2.3/Makefile#L33-L35
--- a/pkgs/servers/monitoring/grafana/missing-hashes.json
+++ b/pkgs/servers/monitoring/grafana/missing-hashes.json
@ -24,16 +24,16 @@
  "@esbuild/win32-arm64@npm:0.25.0": "47bd8e32c90da8472515ddc625e6284cf745b1b9eeecf16e2e699b94b3d11c2d773b16944c8de33d857a8e59426601063a3df04433cb670ed3e8421def07d96b",
  "@esbuild/win32-ia32@npm:0.25.0": "072874686fe049446bba0ec18285414275ac74e8232307a856966ede8a822e72ab9f6119f7352f8feb51c629a20065dbc88f4412120480fe5bcc039dd439d0a7",
  "@esbuild/win32-x64@npm:0.25.0": "ce021c1bb895345ee30f363d89e1f3631040fb44d2e27e614b65dc697090c30c5b66b80aa9d6e5e3b3153010b37e523d6ef34c7b4f2248192b1b4bdd30701b3f",
-  "@nx/nx-darwin-arm64@npm:19.8.2": "c537778a4629def5492e8e65184c2d6f6b36004231580d9d4ae0fbbabfe411d0149c5fac6369e5d5522bcddc0ad8f458b09ef6826a5da984ffb0d1d632e763cd",
-  "@nx/nx-darwin-x64@npm:19.8.2": "d9d8f9cea7b5a1e1ee7cdc783e6d0d228ea6d9bfd4b447ac6a99c7c12d64cb2a5fe26ab1633ccdc6cccbece828dc1f7cdfb628e1e7a7cfeb8ef8f843f200d533",
-  "@nx/nx-freebsd-x64@npm:19.8.2": "526002cfbec66b52fcad54e731fd8253063bb1bd838822169debcfba397946c2f85059adee75619762797bd91f860f7f360e3545a0815a85e301cb70cb20e074",
-  "@nx/nx-linux-arm-gnueabihf@npm:19.8.2": "0240584b8721eeaa44946df7d38259307dd03c1080d1b6086abde1e5bdb0bbd40c09e4fa8675e7103f1e3b381e11c941fe11743b8600aea0b30050cf71e8997b",
-  "@nx/nx-linux-arm64-gnu@npm:19.8.2": "8b988d520deb01393a839b090cd7862bc05c678857f50e71fac752992d9109706bea2e4013db0de002490597a75f5f8575cd5600f3b2593c9f1707e4223d49ce",
-  "@nx/nx-linux-arm64-musl@npm:19.8.2": "f49f65f457c200a4a16fc12384a86d262b06920988e946c7a06ec93de8bbdcc250779a1cbba363667a6faf7cecfe21bd11b06dc97f657e9fddb34d90b3cc6d5e",
-  "@nx/nx-linux-x64-gnu@npm:19.8.2": "1a1c613a2cb5e6641f974a46e9e0e0c85a327355a39cd8909107001c41aaa0b52f3a0d9e31484a247c8b851496d9bb41212c00b930eee8a6b53bcb909f47443a",
-  "@nx/nx-linux-x64-musl@npm:19.8.2": "bd8b6d6a6fa6c996de60f73c391364b9d1c094e24485da400b39209fac25aaca9d68ddb99b21b1a3666697b53eaa3afe325d998bebc656d5996a76788e8cab2f",
-  "@nx/nx-win32-arm64-msvc@npm:19.8.2": "7bbdc04b82b64bb1caaf57e098bcb569f19ec57752a31e742922808b59e86216eebe20c4ac742e2c5769903f16274b2285a87eb9d484a6a6eb2a45ca096ada63",
-  "@nx/nx-win32-x64-msvc@npm:19.8.2": "b6be716206e03e18e7ffabb13ba036abe22cda76af10c6342d836ad9185622be115f9ef91a8b28b38674cb7be0e7eae40614e29e1e81fc224514e6584283b3fa",
+  "@nx/nx-darwin-arm64@npm:20.7.1": "fc5f1e310a8b31c030404791fbddcbfdf072e1342dee50c6795d21e807752560b936ccec02609f25d806aeb44f0935d5dae45a224ac44b9e9e679db57a786616",
+  "@nx/nx-darwin-x64@npm:20.7.1": "b0f4595a3b4dd62cd5b95b461e74bbec82e02a74bdaade5c7418eb52bbc2204dd613d92f0c860cf5dd473d38c90b8b31d42aab3a1afdd78b1ba89b20155080c1",
+  "@nx/nx-freebsd-x64@npm:20.7.1": "e8b193a009241264426172d82918f7aaf6b47de17e5eb43185a77d4e795b755c70c1d9e60c44f2ab43394105db710386aa2f3b8f3f524e8cd490ab9df5442a61",
+  "@nx/nx-linux-arm-gnueabihf@npm:20.7.1": "2b202c359a0812ceb1d7b126016f77909910ba7c4dade3fe2a0f0b772619a93550748a04c7410c26389c82999709cdd1daf774061978ceb918da8a057dd87e38",
+  "@nx/nx-linux-arm64-gnu@npm:20.7.1": "17ad19647fd162cf0b18ab370e1937f13277565cc54271caa5d266951482fd79e89ecbd900b46071bc2a7bb83826194c9eab2de2b4df27994f3e5c75edb8392d",
+  "@nx/nx-linux-arm64-musl@npm:20.7.1": "f234de81327a6ecfd5fce16a616241496e32980e189ed02d012153a440345bcfb946a3ec16ce074af31b985120b1baa7cc0081eead0c20a4de25a7632e297e2d",
+  "@nx/nx-linux-x64-gnu@npm:20.7.1": "04170e48dd902df661244153de8a63a1d60b7277a279de3760a439ac2c6bb48ea791ace863d726d2d4e7e9848ca257f9ce162ee08a3d349e3caaa4461ef87b6a",
+  "@nx/nx-linux-x64-musl@npm:20.7.1": "210314fdbf1c00e3775ea42fa7ef171b81670f9875f2e990e5cfeceee3779114757c40d3663a74cad1e023ddccf526da447027b325dbde740819b0b9e8d91be3",
+  "@nx/nx-win32-arm64-msvc@npm:20.7.1": "6a9a9aa25121132350a97f220877d4c6d2acdd419c045d7ed293e0e0744e581bbc6f7dd38e5048ff0688459caf0348377dedb8cd2e105add1f51da737db193cd",
+  "@nx/nx-win32-x64-msvc@npm:20.7.1": "0ff238e94d4db2fc8bf54b4b393689617738f0a9ed96b6a5c90ea0848d2aa5d6a367d7c92f29f293ff0fe3c37bb27a7c7a0d67b0bcdb478728eac4e49e38dc2c",
  "@parcel/watcher-android-arm64@npm:2.4.1": "279ac643abaccb2f9c986f35e39478e242b33bdda3128ca9e728ca1429b923d5f1bdc22268946138b0ced130ac3b2294cf2a44ff080b27c06a79062a5bbba13c",
  "@parcel/watcher-darwin-arm64@npm:2.4.1": "312fd03aaf7e75824fb84b6b99649caa4db01d55320320d88fb75ad5151bd24876555ae19fe8fdf81f92952bcf01e0a82db7c3bf540e54cee5beb20b85a6a80c",
  "@parcel/watcher-darwin-x64@npm:2.4.1": "47d8fd40e17e419459294b75c455ac7ce2a53dfcc578f2c2ab0fb0f59ad1ee6a6e87b6ecb92708139f48ed8568ffdd675fe5e57ed1468abac6a2a650fe490926",
@ -46,25 +46,24 @@
  "@parcel/watcher-win32-arm64@npm:2.4.1": "a1395a97d1373dd7075da7234af8996302e45cb9d2507633a0f8188c239e8121e63842dded6fc13613986e0833c88435a8750b3c6b35d86b9e1af2b97430b940",
  "@parcel/watcher-win32-ia32@npm:2.4.1": "05a294e24923a02febe852154d8f8dd75fdeb53db8522c3bc87860523f1dc70d41a7507318b3ac93a24feda44526720dba2f1a7e0e20de7ca815c7dd175e3c11",
  "@parcel/watcher-win32-x64@npm:2.4.1": "28dc8dc547c4ef8b24193356bab99c4e5aafb2c8097e2d06b875c2ce4d767a9034ff82fbfac34a86fd331f8daea91a3aeee5c179ed69120c02e035f72dd44877",
-  "@rollup/rollup-android-arm-eabi@npm:4.32.1": "b017ace00bd6c6a7c4dba799cabb9ffd231a23b181aff1664b60aa95dcbb28845f980c61e0031eab23f00fa612b231576d1a1c7fe4ec68e5c3e1787fb1bdd03e",
-  "@rollup/rollup-android-arm64@npm:4.32.1": "edcbb936fa8730598aa971f589f3413bd5148b8031c635a27ec9dd9415ef5a8257f6ef731d915aad0fbfcb5c5306d8ab135e09fefe0f876be198bd39466e1fdb",
-  "@rollup/rollup-darwin-arm64@npm:4.32.1": "721985238c99bd45a2afc8d17906cfdb4b8e7d73cc8adc0d30da8488248030d9d8248e1bdf1088414a67dfe3af8945d664437cebf327363de5842563148887be",
-  "@rollup/rollup-darwin-x64@npm:4.32.1": "dafe6ae9f41b1362bc0a40d7a9c65e769ddbc99a0f47420459b85eb35315016d8b2c7752491cceae9fba63a7b025bf9cba75fe0d7aeeb714c20adbe789d41836",
-  "@rollup/rollup-freebsd-arm64@npm:4.32.1": "56b6addc09573afa9a4c2cdcf60d04f6a02a9fbad091c508390504cdcb5c8c2ac4fe5f57615e3808eb3ae95e0976a0f6058304d07918078ee6cdd1da51270532",
-  "@rollup/rollup-freebsd-x64@npm:4.32.1": "8f0f96127a5011bdb94efbbb89c9cc1a2cb33bcd45501dd67f6615242be16d6e0fbb95a5827d4b81953755483565d8d8404e1edade20df1fadafda1e21842389",
-  "@rollup/rollup-linux-arm-gnueabihf@npm:4.32.1": "2762a35b562ff48deaafb6fb2a3f3a61aeab9193ad404ac2f92c0c8c601aa7ec0e0419601cf45f3d76793b43bdd3497e63d98bc3fa410f6363f3dca37f08eb70",
-  "@rollup/rollup-linux-arm-musleabihf@npm:4.32.1": "4ba13aa9a1ff86990a8aa13144942be97665d4cf657359c4d617f76dbf7d375ddf1e11531c74714997581645558df87d40b4e2e23d1d95ddf80909e529a6c2b9",
-  "@rollup/rollup-linux-arm64-gnu@npm:4.32.1": "578a86aaa8ce61b1e9a3963c753752181b3ce360f00fb5eaa96ae4e48d62d994f7e2c69870781ded78d2ff530d9f03986c3145f19f657aa881222b8d13d0dc99",
-  "@rollup/rollup-linux-arm64-musl@npm:4.32.1": "0800cced8692a3a0c48dfcc05b4ccd731ba288eb2bcfad680ea2a8272b31667c3bcabe3782d809bc9480a052144d6a6e91a7fa2584aded1fcd46ff81a5ec26ee",
-  "@rollup/rollup-linux-loongarch64-gnu@npm:4.32.1": "7bff2363b2d00d264f0001cd510b41eb1b6ceabe000a211871931e04d15983b44bf4b58eb87c61b007c278caff45178bdda596d08c5a2e281a76945a0f4eadd4",
-  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.32.1": "0a86e6510f176d5e156bd2c77fbca2ab182289b54513ef5d450d308e1c1f144c94474d34c11a9f52be10512e92fe2f5239dc984914eaafd76cf96fd625b4f9ef",
-  "@rollup/rollup-linux-riscv64-gnu@npm:4.32.1": "1c1daef81116da736228a921abe935f3d7398c5f7f78aeeef9171f237c2ece162cb3adedb618a57739ec43cce111a24985aa776a5d802b09be46f341d9878c29",
-  "@rollup/rollup-linux-s390x-gnu@npm:4.32.1": "50974fbbd591a744ad5a6c240777fe7b96d1fc8827546655d38cfc3a764cd1a4491e2c012b949c8fd78d48b8000b91d0ec8b649299eaf26bba99564a20ca519c",
-  "@rollup/rollup-linux-x64-gnu@npm:4.32.1": "cadcff5dd0e7d01ac30043e4ce9df81e308c14b7eab1de65e59f114d08c122d76c15b20b9677686c0b6061691bcc13aa835c488c504d6f8c782330cb7db81afe",
-  "@rollup/rollup-linux-x64-musl@npm:4.32.1": "415b177b762909cd04af0277118c798e02f979ff86e84c8b4d65bc70323d8e221aff9c0c7d904221bd6338515fe0223b8d59610728dfcfc42c4dac864f9d0829",
-  "@rollup/rollup-win32-arm64-msvc@npm:4.32.1": "0a86e7b0bd7d80b01c6850c27ba5c8ad52d17ae98069b0741c074ef796285735da2a0bd936e347078c344e569d288ba84a188414163bf67979764e1b532873d1",
-  "@rollup/rollup-win32-ia32-msvc@npm:4.32.1": "e7076720071ba1020906a4ded867069bf20b48b44f2623f52eb06c006d1884aeebd05407f7b758375dc3ce351267c53185745de51fdb1593ec1302527b9b54ce",
-  "@rollup/rollup-win32-x64-msvc@npm:4.32.1": "a49e24d28b1ec5a07b75ae9a23ffb3542300b094a057dc5b57bd4923670a90fb8ba093fe4d3e07a78d6712a9fa20c21289cf5e4a67e7d0e513111053dc807ae2",
+  "@rollup/rollup-android-arm-eabi@npm:4.26.0": "d0c2ef6dd5eae7cfe446998b2fb3285c27426347529ad9403b5b1ed56c585c83f859996a5b4a6e1446143dce1e8fbe7ba2bf37888dbb65ae4409088dec43d6db",
+  "@rollup/rollup-android-arm64@npm:4.26.0": "089a925fdc0cb1b7f5d428e58bea3f0ece1fb2d17fa918aba5d3e58cdaf69913fbf477145f5874f0c04779fe35a35c076d0ef93c7fabbf83c54a9c3bc57907cc",
+  "@rollup/rollup-darwin-arm64@npm:4.26.0": "2f86fd7f56d0f52b93647beb78f37e194c0561e6f653f86d40ed51c4c7647c780dd5b3e117073da163159d349c4722703026f5d644ad5f4402c5178757251b4a",
+  "@rollup/rollup-darwin-x64@npm:4.26.0": "e78b2396b94b8504af25bd4d36cddd2f3d76a3db8ed7f7ce4d0a9cc60f955c54e4ec483361b56810479a47740facaa78402c43618d3c36d10ada63a22af986a9",
+  "@rollup/rollup-freebsd-arm64@npm:4.26.0": "c4e3951402b0ffbaf2b36b1c66ea0fd31da75e6538702c9a12df4245f2c7cd370c718bdd99a48d9fbaacad133510e7bbd46699ec314c510a89228f3a4603bac4",
+  "@rollup/rollup-freebsd-x64@npm:4.26.0": "6a54a2613c9ebbfebf09fede106656aeb1a6bcb0040d04472f7afb57c35dd3cd9502b5a00792b749ce88765072e58a46727741596913a96ee4cc57ffb52186e9",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.26.0": "b25ccb3d3265f55dc7a5b9a9c49c8c416e0087ce6c508470a136bdae6f66fac4832611c9a349c480c919fcfa38613b0dab47634897150026cc5c101c89c683d1",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.26.0": "6939fa7668e50e3901fcc7bf20d89f0b07f8e46df9b8c96ca4bb0b766dd536bc613a48031aab8af63bb6bcc4a303ef306bd9be9cda4c7972b0db993962a22643",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.26.0": "b7f2a5ae857d229a54bcb9a7b4ca0ffb8daa5dffb3e3acf74f47c751dec3ff9d99275432bca40231255920f2ef63e5f2b757c2c2a7a4466db389a40919db4e1b",
+  "@rollup/rollup-linux-arm64-musl@npm:4.26.0": "e6109f231f3301ce0d32fc58938f805db5dcd77ad540dd34abb29f12d62fee8cb764bada8143942b43ab7b81b45aa29e2bb60c6210cc1ec29b93ad69651175e9",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.26.0": "f1a3cb873ce9f102d85dbedad578b8ac25e6218b5415bf458f63d1923775bd48b878cbf3e627d43c1e2ba2be7691b0f703b4d38460012d3ec1b9dcc6297f0fe1",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.26.0": "295848704eb7e93dd1a5525d8b4948669e9a01c583f95431ee97e4d2b8791b0e83bb9a4d356312a1b8c2b58c2061e3567f6c50dfd7f86b390e49220dbd25f298",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.26.0": "7d30e6a9e14220fcc83f980784406c1cb03953c49f4dd70bf1e78b462e4e9491876d086cfa91cc6262832d3671b1f3af6014ec0ef05fbd1928ed1c61a728d03a",
+  "@rollup/rollup-linux-x64-gnu@npm:4.26.0": "903d77b3314ff31ec97c183b4b66abae1a467ee167c7de74a7b9e36d7455f06d63f4fcc781f76e256992d9fa4c13a552c114114605a27cc0ef44df85e75368b4",
+  "@rollup/rollup-linux-x64-musl@npm:4.26.0": "e7913fdc007a841784c1181aff95f0392ef6abdbe5a8098abe96d96a888fe0c28799ab4279f719fd01143ed198e82d5a4e635a65d7e617d3a4f2b4e4354de9ae",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.26.0": "4c96c96d93a9f9794a1571bfee0051225f75910679f9cf0718c1e2d21b4dfe5c3fd1864f8cd86a5b018b56b75f7c0ea6b37954b10f225e60a0e38daf9dcbfda3",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.26.0": "58177998faf3272c87da8c3b28d99f49756ca58efa23ce9aad783de15a203ce1311c12d4a619fa885551a2e98167903bdd29500132b9a6e6732935569063025e",
+  "@rollup/rollup-win32-x64-msvc@npm:4.26.0": "903caa60c6c4f22003aebc81695960438b33cccab3af01925758a8d347553697315b58eea8b363b4e8b4220b289168c6e68251f5cbdbb55d5046d9870cb7152e",
  "@swc/core-darwin-arm64@npm:1.10.12": "f9e130a3f754b327499c9a2cce7ed7f7ade71430321a59d856102908c8d4c0ef873c1c84e35b303cfc632788579cd3f8474dc8d45d4f81ac2657e525b766aee9",
  "@swc/core-darwin-arm64@npm:1.11.4": "f66ade345eda79cb2d61f9f1ef3492bd1caca389c19090b839c9f1e5d5080dde0162269130a0b4b1aec757f5f2d82393bad8b04075968c277a8b2f495ff47c14",
  "@swc/core-darwin-x64@npm:1.10.12": "7176b9926e4bded9475fd964337fb2cf5a42dcd4d38ae660064c1ff554ce837c2b4c51b5ea8fe0b82f1cb7ee42f40ac913aa90cdb21b561b6cb0cf976ccebd91",
--- a/pkgs/shells/nushell/plugins/default.nix
+++ b/pkgs/shells/nushell/plugins/default.nix
@ -21,6 +21,7 @@ lib.makeScope newScope (
      nushell_plugin_dbus = self.dbus;
    };
    skim = callPackage ./skim.nix { };
+    semver = callPackage ./semver.nix { };
  }
  // lib.optionalAttrs config.allowAliases {
    regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release.";
--- a/pkgs/shells/nushell/plugins/semver.nix
+++ b/pkgs/shells/nushell/plugins/semver.nix
@ -0,0 +1,32 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "nu_plugin_semver";
+  version = "0.11.4";
+
+  src = fetchFromGitHub {
+    owner = "abusch";
+    repo = "nu_plugin_semver";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-VTMaZUYgb7wZqiZmd5IVxQsjbHx3QC75VQQdJqaCvfY=";
+  };
+
+  cargoHash = "sha256-oPP4lwXe4jJLfTjUWfaHxQX6CfHbXO5DajyK4r/l6bo=";
+
+  passthru.update-script = nix-update-script { };
+
+  meta = {
+    description = "A nushell plugin to work with semver versions";
+    homepage = "https://github.com/abusch/nu_plugin_semver";
+    changelog = "https://github.com/abusch/nu_plugin_semver/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ koffydrop ];
+    mainProgram = "nu_plugin_semver";
+    platforms = lib.platforms.linux;
+  };
+})
--- a/Show more
+++ b/Show more