Merge pull request #178318 from panicgh/pyside2

pyside2: 5.15.2 -> 5.15.5
main
Anderson Torres 2 years ago committed by GitHub
commit 264c765c31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      pkgs/applications/networking/onionshare/default.nix
  2. 4
      pkgs/development/python-modules/pyside2/default.nix
  3. 2
      pkgs/development/python-modules/shiboken2/default.nix
  4. 2
      pkgs/top-level/all-packages.nix
  5. 5
      pkgs/top-level/python-packages.nix

@ -14,6 +14,7 @@
, pycrypto
, pynacl
, pyside2
, pysocks
, pytestCheckHook
, qrcode
, qt5
@ -132,6 +133,7 @@ rec {
pyside2
psutil
qrcode
pysocks
];
nativeBuildInputs = [ qt5.wrapQtAppsHook ];

@ -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 = [

@ -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;
};
}

@ -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

@ -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 {

Loading…
Cancel
Save