dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #178318 from panicgh/pyside2

Browse Source 
pyside2: 5.15.2 -> 5.15.5
This commit is contained in:
Anderson Torres 2022-06-22 23:07:45 -03:00 committed by GitHub
commit 264c765c31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/onionshare/default.nix
View File

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

4
pkgs/development/python-modules/pyside2/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pyside2"; pname = "pyside2";
version = "5.15.2"; version = "5.15.5";
src = fetchurl { src = fetchurl {
url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz"; url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz";
sha256 = "060ljj1nzyp4zfz2vasbv2i7gs5rfkkjwxxbisd0fdw01d5m01mk"; sha256 = "0cwvw6695215498rsbm2xzkwaxdr3w7zfvy4kc62c01k6pxs881r";
}; };
patches = [ patches = [

2
pkgs/development/python-modules/shiboken2/default.nix
View File

@ -34,6 +34,6 @@ stdenv.mkDerivation {
license = with licenses; [ gpl2 lgpl21 ]; license = with licenses; [ gpl2 lgpl21 ];
homepage = "https://wiki.qt.io/Qt_for_Python"; homepage = "https://wiki.qt.io/Qt_for_Python";
maintainers = with maintainers; [ gebner ]; maintainers = with maintainers; [ gebner ];
broken = stdenv.isDarwin || python.isPy310; broken = stdenv.isDarwin;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -26761,7 +26761,7 @@ with pkgs;
fragments = callPackage ../applications/networking/p2p/fragments { }; fragments = callPackage ../applications/networking/p2p/fragments { };
freecad = libsForQt5.callPackage ../applications/graphics/freecad { freecad = libsForQt5.callPackage ../applications/graphics/freecad {
boost = python3Packages.boost169; boost = python3Packages.boost;
inherit (python3Packages) inherit (python3Packages)
GitPython GitPython
matplotlib matplotlib

5
pkgs/top-level/python-packages.nix
View File

@ -1356,11 +1356,6 @@ in {
enablePython = true; enablePython = true;
}); });
boost169 = toPythonModule (pkgs.boost169.override {
inherit (self) python numpy;
enablePython = true;
});
boschshcpy = callPackage ../development/python-modules/boschshcpy { }; boschshcpy = callPackage ../development/python-modules/boschshcpy { };
boost-histogram = callPackage ../development/python-modules/boost-histogram { boost-histogram = callPackage ../development/python-modules/boost-histogram {