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

sip: update to 4.15.4 and add python3 support

Browse Source
This commit is contained in:
Song Wenwu 2014-01-08 16:06:08 +08:00 committed by Rok Garbas
parent 7ec465a5cc
commit 98d2f7ea45
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/python-modules/python-sip/default.nix → pkgs/development/python-modules/sip/default.nix
View File

@ -1,21 +1,19 @@
{ stdenv, fetchurl, python }: { stdenv, fetchurl, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sip-4.14.6"; name = "sip-4.15.4";
src = fetchurl { src = fetchurl {
urls = [ url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz";
"http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz" sha256 = "0a12lmqkf342yg42ygnjm1fyldcx9pzhy7z68p4ms4ydfcl78jsr";
"http://pkgs.fedoraproject.org/repo/pkgs/sip/${name}.tar.gz/d6493b9f0a7911566545f694327314c4/${name}.tar.gz"
];
sha256 = "1bwdd5xhrx8dx8rr86r043ddlbg7gd1vh0pm2nxw5l1yprwa7paa";
}; };
configurePhase = stdenv.lib.optionalString stdenv.isDarwin '' configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''
# prevent sip from complaining about python not being built as a framework # prevent sip from complaining about python not being built as a framework
sed -i -e 1564,1565d siputils.py sed -i -e 1564,1565d siputils.py
'' + '' '' + ''
python ./configure.py -d $out/lib/${python.libPrefix}/site-packages \ ${python.executable} ./configure.py \
-d $out/lib/${python.libPrefix}/site-packages \
-b $out/bin -e $out/include -b $out/bin -e $out/include
''; '';
@ -23,6 +21,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Creates C++ bindings for Python modules"; description = "Creates C++ bindings for Python modules";
homepage = "http://www.riverbankcomputing.co.uk/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ lovek323 sander urkud ]; maintainers = with maintainers; [ lovek323 sander urkud ];
platforms = platforms.all; platforms = platforms.all;

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

@ -6189,7 +6189,7 @@ let
rhpl = callPackage ../development/python-modules/rhpl { }; rhpl = callPackage ../development/python-modules/rhpl { };
sip = callPackage ../development/python-modules/python-sip { }; sip = callPackage ../development/python-modules/sip { };
pyqt4 = callPackage ../development/python-modules/pyqt { pyqt4 = callPackage ../development/python-modules/pyqt {
stdenv = if stdenv.isDarwin stdenv = if stdenv.isDarwin

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

@ -121,6 +121,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
inherit python buildPythonPackage pygobject pycairo; inherit python buildPythonPackage pygobject pycairo;
}; };
sip = import ../development/python-modules/sip {
inherit (pkgs) stdenv fetchurl;
inherit python;
};
# packages defined here # packages defined here
aafigure = buildPythonPackage rec { aafigure = buildPythonPackage rec {