pythonPackages.sip: rename to sip_4
sip 4 is the old and unmaintained version
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user