public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121588 from eduardosm/sip-rename

Browse Source 
pythonPackages.sip: rename to sip_4, pythonPackages.sip_5: rename to sip
This commit is contained in:
Anderson Torres
2021-05-16 13:31:55 -03:00
committed by GitHub
parent 5bf5cb1b1b e951b632f6
commit cf45c45605
28 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/calibre/default.nix
+2 -2
View File
@@ -45,7 +45,7 @@ mkDerivation rec {
prePatch = ''
sed -i "s/\[tool.sip.project\]/[tool.sip.project]\nsip-include-dirs = [\"${escaped_pyqt5_dir}\/share\/sip\/PyQt5\"]/g" \
setup/build.py
sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip_5.platform_tag}\"]/g" \
sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip.platform_tag}\"]/g" \
setup/build.py
# Remove unneeded files and libs
@@ -95,7 +95,7 @@ mkDerivation rec {
pyqtwebengine
python
regex
sip_5
sip
zeroconf
# the following are distributed with calibre, but we use upstream instead
odfpy
pkgs/applications/misc/cura/lulzbot/default.nix
+2 -2
View File
@@ -10,10 +10,10 @@ let
};
libarcusLulzbot = callPackage ./libarcus.nix {
inherit (python3.pkgs) buildPythonPackage sip pythonOlder;
inherit (python3.pkgs) buildPythonPackage sip_4 pythonOlder;
};
libsavitarLulzbot = callPackage ./libsavitar.nix {
inherit (python3.pkgs) buildPythonPackage sip pythonOlder;
inherit (python3.pkgs) buildPythonPackage sip_4 pythonOlder;
};
inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
pkgs/applications/misc/cura/lulzbot/libarcus.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }:
{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip_4, protobuf, pythonOlder }:
buildPythonPackage {
pname = "libarcus";
@@ -13,7 +13,7 @@ buildPythonPackage {
disabled = pythonOlder "3.4.0";
propagatedBuildInputs = [ sip ];
propagatedBuildInputs = [ sip_4 ];
nativeBuildInputs = [ cmake ];
buildInputs = [ protobuf ];
pkgs/applications/misc/cura/lulzbot/libsavitar.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }:
{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip_4 }:
buildPythonPackage {
pname = "libsavitar-lulzbot";
@@ -19,7 +19,7 @@ buildPythonPackage {
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ sip ];
propagatedBuildInputs = [ sip_4 ];
disabled = pythonOlder "3.4.0";
pkgs/applications/misc/openlp/lib.nix
+2 -2
View File
@@ -5,7 +5,7 @@
# python deps
, python, buildPythonPackage
, alembic, beautifulsoup4, chardet, lxml, Mako, pyenchant
, pyqt5_with_qtwebkit, pyxdg, sip, sqlalchemy, sqlalchemy_migrate
, pyqt5_with_qtwebkit, pyxdg, sip_4, sqlalchemy, sqlalchemy_migrate
}:
buildPythonPackage rec {
@@ -41,7 +41,7 @@ buildPythonPackage rec {
pyenchant
pyqt5_with_qtwebkit
pyxdg
sip
sip_4
sqlalchemy
sqlalchemy_migrate
];