diff options
Diffstat (limited to 'pkgs/development/python-modules')
4 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 5ba813deba6..a9dced9b6c4 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ] ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ] - ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]; + ++ stdenv.lib.optionals enableTk [ python.tkinter tcl tk tkinter libX11 ]; patches = [ ./basedirlist.patch ] ++ diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index fb95a9fa468..23e06ff4cb4 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,9 +1,9 @@ -{ lib, fetchurl, fetchpatch, python, mkPythonDerivation, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35 }: +{ lib, fetchurl, fetchpatch, python, mkPythonDerivation, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35, isPy3k }: if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else mkPythonDerivation rec { version = "1.10.0"; name = "${python.libPrefix}-pycairo-${version}"; - src = if python.is_py3k or false + src = if isPy3k then fetchurl { url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2"; sha256 = "1gjkf8x6hyx1skq3hhwcbvwifxvrf9qxis5vx8x5igmmgs70g94s"; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 797d89fd482..dfddd7dddbd 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, mkPythonDerivation, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}: mkPythonDerivation rec { - major = "3.20"; + major = "3.22"; minor = "0"; name = "pygobject-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz"; - sha256 = "0ikzh3l7g1gjh8jj8vg6mdvrb25svp63gxcam4m0i404yh0lgari"; + sha256 = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7"; }; buildInputs = [ pkgconfig glib gobjectIntrospection ] diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index 5f224428fce..8dc99955af3 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -1,16 +1,18 @@ { fetchurl , lib -, pythonPackages , openglSupport ? true , libX11 , wxGTK , pkgconfig +, buildPythonPackage +, pyopengl +, isPy3k +, isPyPy +, python }: assert wxGTK.unicode; -with pythonPackages; - buildPythonPackage rec { name = "wxPython-${version}"; version = "3.0.2.0"; |