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

Merge pull request #269121 from NixOS/backport-264877-to-staging-23.11 

[Backport staging-23.11] pyqt6: 6.5.2 -> 6.6.0
parents 2b6bc000 6e674fa9

pkgs/development/python-modules/pyqt-builder/default.nix

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


buildPythonPackage rec {

  pname = "pyqt-builder";

  version = "1.15.2";

  version = "1.15.3";

  format = "pyproject";



  src = fetchPypi {

    pname = "PyQt-builder";

    inherit version;

    hash = "sha256-dGz+g8A+v/RFjUeKHAZxR5Dvk+RY7NWii8KDe6yI63Q=";

    hash = "sha256-WzPpnty3fUpjo4YF9EV6BM/04lTHce1SnryViZBszbE=";

  };



  nativeBuildInputs = [

pkgs/development/python-modules/pyqt/6.x.nix

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


buildPythonPackage rec {

  pname = "PyQt6";

  version = "6.5.2";

  version = "6.6.0";

  format = "pyproject";



  disabled = pythonOlder "3.6";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-FIfuc1D5/7ZtYKtBdlGSUsKzcXYsvo+DQP2VH2OAEoA=";

    hash = "sha256-1BUS1mBEwt+cX1FaVqkiFw1oo3s0Bv/dyLStxXGBtXY=";

  };



  patches = [
@@ -132,9 +132,6 @@ buildPythonPackage rec { 
  ++ lib.optional withLocation "PyQt6.QtPositioning"

  ;



  # fix build with qt 6.6

  env.NIX_CFLAGS_COMPILE = "-fpermissive";



  meta = with lib; {

    description = "Python bindings for Qt6";

    homepage = "https://riverbankcomputing.com/";

pkgs/development/python-modules/pyqt6-charts.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,14 +11,14 @@ 


buildPythonPackage rec {

  pname = "PyQt6_Charts";

  version = "6.5.0";

  version = "6.6.0";

  format = "pyproject";



  disabled = pythonOlder "3.6";



  src = fetchPypi {

    inherit pname version;

    sha256 = "sha256-b/APZbJRf5m/EG3dKMdvPKNE+R7PW6aBkeIKLZACSWI=";

    sha256 = "sha256-FMxuXRnK6AEpUkpC+mMy0NXa2kKCqUI0Jea5rhtrxW0=";

  };



  # fix include path and increase verbosity

pkgs/development/python-modules/pyqt6-webengine.nix

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


buildPythonPackage rec {

  pname = "PyQt6_WebEngine";

  version = "6.5.0";

  version = "6.6.0";

  format = "pyproject";



  disabled = pythonOlder "3.6";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-i6nbVsTBgaKi+rFnPKNeW2PcaRE/CFAn3cQ8cQttbuk=";

    hash = "sha256-1QuYTD+F5AnmkrFWEychUi1OjPm2wl4M+Sfuot+zlIc=";

  };



  # fix include path and increase verbosity

pkgs/development/python-modules/sip/default.nix

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


buildPythonPackage rec {

  pname = "sip";

  version = "6.7.11";

  version = "6.7.12";



  format = "pyproject";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-8Nwyh6CxcuVmSTHIeEd1DUfk/c2k/jYrUUr47dZVtGk=";

    hash = "sha256-COZvdCWS64GKyP2kFz4u1kyfLUC3C+4R2xxJkSfZhFA=";

  };



  nativeBuildInputs = [