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

Merge pull request #288842 from K900/qt-6.6.2 

qt6: 6.6.1 -> 6.6.2
parents bb661ae2 3d538ec7

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

+0 −10
Original line number Diff line number Diff line
@@ -66,16 +66,6 @@ let 
            revert = true;

            hash = "sha256-cjB2sC4cvZn0UEc+sm6ZpjyC78ssqB1Kb5nlZQ15M4A=";

          })

          # CVE-2023-51714: Potential Integer Overflow in Qt's HTTP2 implementation

          # https://www.qt.io/blog/security-advisory-potential-integer-overflow-in-qts-http2-implementation

          (fetchpatch2 {

            url = "https://download.qt.io/official_releases/qt/6.5/0001-CVE-2023-51714-qtbase-6.5.diff";

            hash = "sha256-0Xnolq9dWkKUrmLUlv15uQ9nkZXrY3AsmvChaLX8P2I=";

          })

          (fetchpatch2 {

            url = "https://download.qt.io/official_releases/qt/6.6/0002-CVE-2023-51714-qtbase-6.6.diff";

            hash = "sha256-+/u3vy5Ci6Z4jy00L07iYAnqHvVdqUzqVnT9uVIqs60=";

          })

        ];

      };

      env = callPackage ./qt-env.nix { };

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.6/6.6.1/submodules/ -A '*.tar.xz' )
 
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.2/submodules/ -A '*.tar.xz' )

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

+4 −2
Original line number Diff line number Diff line
@@ -5,12 +5,14 @@ 


qtModule rec {

  pname = "qtmqtt";

  version = "6.6.1";

  version = "6.6.2";



  src = fetchFromGitHub {

    owner = "qt";

    repo = "qtmqtt";

    rev = "v${version}";

    hash = "sha256-6jQrUT1wLk6rhDIns0ubdUCZ7e/m38Oqvl8c1/sfWxI=";

    hash = "sha256-R8B7Vt/XzI7+17DDZ+TVbqfGKdEfUMiLa1BqzIbo4OM=";

  };



  propagatedBuildInputs = [ qtbase ];

}

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

+0 −9
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
, wayland

, pkg-config

, libdrm

, fetchpatch

}:



qtModule {
@@ -12,12 +11,4 @@ qtModule { 
  propagatedBuildInputs = [ qtbase qtdeclarative ];

  buildInputs = [ wayland libdrm ];

  nativeBuildInputs = [ pkg-config ];

  patches = [

    # Fix potential crash issues when some submenus are expanded

    # https://codereview.qt-project.org/c/qt/qtwayland/+/519344/

    (fetchpatch {

      url = "https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=aae65c885d8e38d8abc2959cded7b5e9e5fc88b3";

      hash = "sha256-FD1VaiTgl9Z1y+5EDpWYShM1ULoFdET86FoFfqDmjyo=";

    })

  ];

}

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

+0 −4
Original line number Diff line number Diff line
@@ -134,10 +134,6 @@ qtModule { 


    # Override locales install path so they go to QtWebEngine's $out

    ../patches/qtwebengine-locales-path.patch



    # Cherry-pick libxml 2.12 build fix

    # FIXME: remove for 6.7

    ../patches/qtwebengine-libxml-2.12.patch

  ];



  postPatch = ''