mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-16 15:58:36 +00:00
Code Issues Wiki Activity

Merge pull request #15764 from FRidh/wxpythoncleanup

Browse source 
Python: wxPython cleanup
This commit is contained in:
Frederik Rietdijk 2016-05-31 10:47:22 +02:00
parent 45f9fd8c51 253634c4ac
commit cf32f82b8d
6 changed files with 45 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/python-modules/wxPython/2.8.nix
View file

@ -1,6 +0,0 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "2.8.12.1";
sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz";
})

38
pkgs/development/python-modules/wxPython/3.0.nix
View file

@ -1,9 +1,39 @@
{ callPackage, ... } @ args:
{ fetchurl
, lib
, pythonPackages
, openglSupport ? true
, libX11
, wxGTK
, pkgconfig
}:
callPackage ./generic.nix (args // rec {
assert wxGTK.unicode;
with pythonPackages;
buildPythonPackage rec {
name = "wxPython-${version}";
version = "3.0.2.0";
sha256 = "0qfzx3sqx4mwxv99sfybhsij4b5pc03ricl73h4vhkzazgjjjhfm";
disabled = isPy3k || isPyPy;
doCheck = false;
})
src = fetchurl {
url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2";
sha256 = "0qfzx3sqx4mwxv99sfybhsij4b5pc03ricl73h4vhkzazgjjjhfm";
};
propagatedBuildInputs = [ pkgconfig wxGTK (wxGTK.gtk) libX11 ] ++ lib.optional openglSupport pyopengl;
preConfigure = "cd wxPython";
NIX_LDFLAGS = "-lX11 -lgdk-x11-2.0";
buildPhase = "";
installPhase = ''
${python.interpreter} setup.py install WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out
wrapPythonPrograms
'';
passthru = { inherit wxGTK openglSupport; };
}

31
pkgs/development/python-modules/wxPython/generic.nix
View file

@ -1,31 +0,0 @@
{ stdenv, fetchurl, pkgconfig, python, isPy3k, isPyPy, wxGTK, openglSupport ? true, pyopengl
, version, sha256, wrapPython, setuptools, libX11, ...
}:
assert wxGTK.unicode;
stdenv.mkDerivation rec {
name = "wxPython-${version}";
inherit version;
disabled = isPy3k || isPyPy;
doCheck = false;
src = fetchurl {
url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2";
inherit sha256;
};
pythonPath = [ python setuptools ];
buildInputs = [ python setuptools pkgconfig wxGTK (wxGTK.gtk) wrapPython libX11 ] ++ stdenv.lib.optional openglSupport pyopengl;
preConfigure = "cd wxPython";
NIX_LDFLAGS = "-lX11 -lgdk-x11-2.0";
installPhase = ''
${python.interpreter} setup.py install WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out
wrapPythonPrograms
'';
passthru = { inherit wxGTK openglSupport; };
}

24
pkgs/tools/networking/p2p/bit-tornado/default.nix
View file

@ -1,24 +0,0 @@
{ stdenv,fetchurl,python, wxPython, makeWrapper }:
stdenv.mkDerivation {
name = "bit-tornado-0.3.18";
src = fetchurl {
url = http://download2.bittornado.com/download/BitTornado-0.3.18.tar.gz;
sha256 = "1q6rapidnizy8wawasirgyjl9s4lrm7mm740mc5q5sdjyl5svrnr";
};
buildInputs = [ python wxPython makeWrapper ];
buildPhase = '' '';
installPhase = ''
python setup.py install --prefix=$out ;
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
--prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
done
'';
meta = {
description = "Bittorrent client with IPv6 support";
};
}

13
pkgs/top-level/all-packages.nix
View file

@ -939,8 +939,6 @@ in
inherit (strategoPackages016) strategoxt sdf;
};
bittornado = callPackage ../tools/networking/p2p/bit-tornado { };
blueman = callPackage ../tools/bluetooth/blueman {
inherit (gnome3) dconf gsettings_desktop_schemas;
withPulseAudio = config.pulseaudio or true;
@ -6549,7 +6547,9 @@ in
yodl = callPackage ../development/tools/misc/yodl { };
winpdb = callPackage ../development/tools/winpdb { };
winpdb = callPackage ../development/tools/winpdb {
inherit (pythonPackages) wxPython;
};
grabserial = callPackage ../development/tools/grabserial { };
@ -9715,9 +9715,6 @@ in
twisted = pythonPackages.twisted;
wxPython = pythonPackages.wxPython;
wxPython28 = pythonPackages.wxPython28;
yolk = callPackage ../development/python-modules/yolk {};
ZopeInterface = pythonPackages.zope_interface;
@ -12552,7 +12549,7 @@ in
gksu = callPackage ../applications/misc/gksu { };
gnuradio = callPackage ../applications/misc/gnuradio {
inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl;
inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl wxPython;
fftw = fftwFloat;
};
@ -14353,7 +14350,7 @@ in
torch-repl = lib.setName "torch-repl" torchPackages.trepl;
torchat = callPackage ../applications/networking/instant-messengers/torchat {
wrapPython = pythonPackages.wrapPython;
inherit (pythonPackages) wrapPython wxPython;
};
tortoisehg = callPackage ../applications/version-management/tortoisehg { };

16
pkgs/top-level/python-packages.nix
View file

@ -13067,6 +13067,7 @@ in modules // {
description = "OpenSteno Plover stenography software";
maintainers = with maintainers; [ twey kovirobi ];
license = licenses.gpl2;
broken = true;
};
src = pkgs.fetchurl {
@ -13074,7 +13075,8 @@ in modules // {
sha256 = "1jja37nhiypdx1z6cazp8ffsf0z3yqmpdbprpdzf668lcb422rl0";
};
propagatedBuildInputs = with self; [ wxPython30 pyserial hidapi xlib appdirs pkgs.wmctrl mock ];
buildInputs = with self; [ pytest ];
propagatedBuildInputs = with self; [ wxPython pyserial hidapi xlib appdirs pkgs.wmctrl mock ];
};
pygal = buildPythonPackage rec {
@ -20064,7 +20066,7 @@ in modules // {
sha256 = "61d03a13f1dcb3c1829f5a146da1fe0cc0e27947558a51e848b6d469902815ef";
};
propagatedBuildInputs = [ self.squaremap self.wxPython28 ];
propagatedBuildInputs = with self; [ squaremap wxPython ];
meta = {
description = "GUI Viewer for Python profiling runs";
@ -23477,15 +23479,9 @@ in modules // {
};
};
wxPython = self.wxPython28;
wxPython = self.wxPython30;
wxPython28 = import ../development/python-modules/wxPython/2.8.nix {
inherit callPackage;
wxGTK = pkgs.wxGTK28;
};
wxPython30 = import ../development/python-modules/wxPython/3.0.nix {
inherit callPackage;
wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix {
wxGTK = pkgs.wxGTK30;
};