Commit 08a26e45 authored by Eduardo Sánchez Muñoz's avatar Eduardo Sánchez Muñoz
Browse files

pythonPackages.sip: rename to sip_4 

sip 4 is the old and unmaintained version
parent 4f675ad2

pkgs/applications/gis/qgis/unwrapped.nix

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ let 
    urllib3

    pygments

    pyqt5

    sip

    sip_4

    owslib

    six

  ];

pkgs/applications/graphics/krita/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ mkDerivation rec { 
    sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl";

  };



  nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];

  nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ];



  buildInputs = [

    karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons

pkgs/applications/misc/cura/lulzbot/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line 
{ 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
Original line number Diff line number Diff line 
{ 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";