Merge master into staging-next

      (b == armv5tel && isCompatible a armv6l)

      # ARMv6

      (b == armv6l && isCompatible a armv6m)

      (b == armv6m && isCompatible a armv7l)

      (b == armv6m && isCompatible a armv6l)

      (b == armv6l && isCompatible a armv7l)

      # ARMv7

      (b == armv7l && isCompatible a armv7a)

      (b == armv7l && isCompatible a armv7r)

      (b == armv7l && isCompatible a armv7m)

      (b == armv7m && isCompatible a armv7a)

      (b == armv7m && isCompatible a armv7r)

      # ARMv8

      (b == aarch64 && a == armv8a)

      (b == armv8a && isCompatible a aarch64)

      (b == armv8r && isCompatible a armv8a)

      (b == armv8m && isCompatible a armv8a)

      # PowerPC

      (b == powerpc && isCompatible a powerpc64)

      (b == mips && isCompatible a mips64)

      (b == mipsel && isCompatible a mips64el)

      # RISCV

      (b == riscv32 && isCompatible a riscv64)

      # SPARC

      (b == sparc && isCompatible a sparc64)

      # WASM

      (b == wasm32 && isCompatible a wasm64)

      # identity

      (b == a)

    ];

}:

buildGo126Module (finalAttrs: {

  pname = "beszel";

  version = "0.18.6";

  version = "0.18.7";

  src = fetchFromGitHub {

    owner = "henrygd";

    repo = "beszel";

    tag = "v${finalAttrs.version}";

    hash = "sha256-CRO0Y3o3hwdE55D027fo0tvt9o7vsA1ooEBFlXuw2So=";

    hash = "sha256-pVZ1ru9++BypZ3EwoE8clqJowXj1/CMiJxKaC+UY9VE=";

  };

  webui = buildNpmPackage {

    sourceRoot = "${finalAttrs.src.name}/internal/site";

    npmDepsHash = "sha256-509/n5OH4z6LZH+jlmDLl2DlqKrD7M5ajtalmF/4n1o=";

    npmDepsHash = "sha256-mYAD8FrQwa+F/VgGxFpe8vqucfZaM0PmY+gJJqw1IKk=";

  };

  vendorHash = "sha256-g+UmoxBoCL3oGXNTY67Wz7y6FC/nkcS8020jhTq4JQE=";

  vendorHash = "sha256-TVpZbK9V9/GqpVFcjF7QGD5XJJHzRgjVXZOImHQTR1k=";

  tags = [ "testing" ];

  lib,

  stdenv,

  qt6,

  libsForQt5,

  qt6Packages,

  fetchFromGitHub,

  gst_all_1,

  cmake,

  ninja,

  pkg-config,

}:

let

  inherit (libsForQt5) qcoro;

in

stdenv.mkDerivation (finalAttrs: {

  pname = "brickstore";

  version = "2024.12.3";

  version = "2026.3.2";

  src = fetchFromGitHub {

    owner = "rgriebl";

    repo = "brickstore";

    tag = "v${finalAttrs.version}";

    hash = "sha256-4sxPplZ1t8sSfwTCeeBtfU4U0gcE9FROt6dKvkfyO6Q=";

    hash = "sha256-UIVzvzsterKkL8/JPx5S0wly6mLxflAqX0gMFX3rOes=";

    fetchSubmodules = true;

  };

    libglvnd

    ninja

    pkg-config

    qcoro

    qt6.qtdoc

    qt6.qtdeclarative

    qt6.qtimageformats

    qt6.qttools

    qt6.qtwayland

    qt6.wrapQtAppsHook

    qt6Packages.qcoro

    onetbb

  ];

  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 \

        'add_subdirectory(''${qcoro_SOURCE_DIR} ''${qcoro_BINARY_DIR} EXCLUDE_FROM_ALL)' \

        'add_subdirectory(${qcoro.src} ${qcoro}bin/qcoro)'

  # Use nix-provided qcoro instead of fetching from GitHub

  postPatch = ''

    substituteInPlace CMakeLists.txt \

      --replace-fail 'include(BuildQCoro)' \

        'find_package(QCoro6 CONFIG REQUIRED COMPONENTS Core Network Qml)'

  '';

  qtWrapperArgs = [

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)

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"