diff options
| author | Eduardo Sánchez Muñoz <esm@eduardosm.net> | 2021-05-03 13:43:20 +0200 |
|---|---|---|
| committer | Eduardo Sánchez Muñoz <esm@eduardosm.net> | 2021-05-10 20:41:38 +0200 |
| commit | 08a26e45796e456278d75201fadb2498fe08dd7d (patch) | |
| tree | 58eb68879cc578e4ab2176983051f3394b55e040 /pkgs/applications/misc/cura | |
| parent | 4f675ad255bfe13f7fe350af50f44137550da537 (diff) | |
pythonPackages.sip: rename to sip_4
sip 4 is the old and unmaintained version
Diffstat (limited to 'pkgs/applications/misc/cura')
| -rw-r--r-- | pkgs/applications/misc/cura/lulzbot/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/cura/lulzbot/libarcus.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/cura/lulzbot/libsavitar.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/misc/cura/lulzbot/default.nix b/pkgs/applications/misc/cura/lulzbot/default.nix index 229966561c6d5..360ef47ecf1d4 100644 --- a/pkgs/applications/misc/cura/lulzbot/default.nix +++ b/pkgs/applications/misc/cura/lulzbot/default.nix @@ -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; diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix index 7b1dbf4d85ef5..15e221a8f7431 100644 --- a/pkgs/applications/misc/cura/lulzbot/libarcus.nix +++ b/pkgs/applications/misc/cura/lulzbot/libarcus.nix @@ -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 ]; diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix index f12059e6317b5..dd84173ffce11 100644 --- a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix +++ b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix @@ -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"; |