Unverified Commit 583a5b7a authored by K900's avatar K900 Committed by GitHub
Browse files

Qt 6.10.1 (#464361)

parents a8aa3d12 49f3c043

pkgs/development/libraries/qt-6/fetch.sh

+1 −1
Original line number Diff line number Diff line 
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.10/6.10.0/submodules/ -A '*.tar.xz' )
 
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.10/6.10.1/submodules/ -A '*.tar.xz' )

pkgs/development/libraries/qt-6/modules/qtconnectivity.nix

+0 −4
Original line number Diff line number Diff line
@@ -20,8 +20,4 @@ qtModule { 
    qtbase

    qtdeclarative

  ];



  postPatch = ''

    substituteInPlace src/nfc/configure.cmake --replace-fail "qt_configure_add_summary_entry(ARGS pcslite)" "qt_configure_add_summary_entry(ARGS pcsclite)"

  '';

}

pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix

+0 −13
Original line number Diff line number Diff line 
{

  fetchpatch,

  qtModule,

  qtbase,

  qtlanguageserver,
@@ -36,18 +35,6 @@ qtModule { 
    })

    # add version specific QML import path

    ./use-versioned-import-path.patch

    # Fix common crash

    # https://bugreports.qt.io/browse/QTBUG-140018

    (fetchpatch {

      url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/2b7f93da38d41ffaeb5322a7dca40ec26fc091a1.diff";

      hash = "sha256-AOXey18lJlswpZ8tpTTZeFb0VE9k1louXy8TPPGNiA4=";

    })

    # Fix another common crash

    # https://bugreports.qt.io/browse/QTBUG-139626

    (fetchpatch {

      url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/0de0b0ffdb44d73c605e20f00934dfb44bdf7ad9.diff";

      hash = "sha256-DCoaSxH1MgywGXmmK21LLzCBi2KAmJIv5YKpFS6nw7M=";

    })

  ];



  cmakeFlags = [

pkgs/development/libraries/qt-6/modules/qtmqtt.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ 


qtModule rec {

  pname = "qtmqtt";

  version = "6.10.0";

  version = "6.10.1";



  src = fetchFromGitHub {

    owner = "qt";

    repo = "qtmqtt";

    tag = "v${version}";

    hash = "sha256-0o0zC8SUlug5xOV5AX9PiTim1td8NA4fq6WfBR5aSXA=";

    hash = "sha256-ve9fyhUZFI6TAr/SFRXJudA1yTmTlg8+Fgyc9OUv3ds=";

  };



  propagatedBuildInputs = [ qtbase ];

pkgs/development/libraries/qt-6/modules/qttranslations.nix

+2 −0
Original line number Diff line number Diff line
@@ -6,5 +6,7 @@ 
qtModule {

  pname = "qttranslations";

  nativeBuildInputs = [ qttools ];

  separateDebugInfo = false;

  outputs = [ "out" ];

  allowedReferences = [ "out" ];

}