Unverified Commit 264c765c authored by Anderson Torres's avatar Anderson Torres Committed by GitHub
Browse files

Merge pull request #178318 from panicgh/pyside2 

pyside2: 5.15.2 -> 5.15.5
parents aaac89ba d19e78af

pkgs/applications/networking/onionshare/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
, pycrypto

, pynacl

, pyside2

, pysocks

, pytestCheckHook

, qrcode

, qt5
@@ -132,6 +133,7 @@ rec { 
      pyside2

      psutil

      qrcode

      pysocks

    ];



    nativeBuildInputs = [ qt5.wrapQtAppsHook ];

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

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


stdenv.mkDerivation rec {

  pname = "pyside2";

  version = "5.15.2";

  version = "5.15.5";



  src = fetchurl {

    url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz";

    sha256 = "060ljj1nzyp4zfz2vasbv2i7gs5rfkkjwxxbisd0fdw01d5m01mk";

    sha256 = "0cwvw6695215498rsbm2xzkwaxdr3w7zfvy4kc62c01k6pxs881r";

  };



  patches = [

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

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ stdenv.mkDerivation { 
    license = with licenses; [ gpl2 lgpl21 ];

    homepage = "https://wiki.qt.io/Qt_for_Python";

    maintainers = with maintainers; [ gebner ];

    broken = stdenv.isDarwin || python.isPy310;

    broken = stdenv.isDarwin;

  };

}

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -26761,7 +26761,7 @@ with pkgs; 
  fragments = callPackage ../applications/networking/p2p/fragments { };















  freecad = libsForQt5.callPackage ../applications/graphics/freecad {













    boost = python3Packages.boost169;













    boost = python3Packages.boost;















    inherit (python3Packages)















      GitPython















      matplotlib

























pkgs/top-level/python-packages.nix



+0
−5






























Original line number
Diff line number
Diff line








@@ -1356,11 +1356,6 @@ in {













    enablePython = true;















  });





























  boost169 = toPythonModule (pkgs.boost169.override {













    inherit (self) python numpy;













    enablePython = true;













  });





























  boschshcpy = callPackage ../development/python-modules/boschshcpy { };































  boost-histogram = callPackage ../development/python-modules/boost-histogram {