Author: eelco
Date: Wed May 4 08:41:50 2011
New Revision: 27127
URL: https://svn.nixos.org/websvn/nix/?rev=27127&sc=1
Log:
* Move wxPython into python-packages.nix so that you can get wxPython
built for the appropriate Python version
(e.g. python26Packages.wxPython).
Modified:
nixpkgs/trunk/pkgs/development/python-modules/wxPython/2.6.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
nixpkgs/trunk/pkgs/top-level/python-packages.nix
Modified: nixpkgs/trunk/pkgs/development/python-modules/wxPython/2.6.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/python-modules/wxPython/2.6.nix Tue May
3 22:38:52 2011 (r27126)
+++ nixpkgs/trunk/pkgs/development/python-modules/wxPython/2.6.nix Wed May
4 08:41:50 2011 (r27127)
@@ -1,14 +1,18 @@
-{stdenv, fetchurl, pkgconfig, wxGTK, python}:
+{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages }:
assert wxGTK.unicode;
stdenv.mkDerivation {
name = "wxPython-2.6.3.3";
+
builder = ./builder.sh;
+
src = fetchurl {
url = mirror://sourceforge/wxpython/wxPython-src-2.6.3.3.tar.bz2;
md5 = "66b9c5f8e20a9505c39dab1a1234daa9";
};
- buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python];
- inherit wxGTK; # !!! move this down
+
+ buildInputs = [ pkgconfig wxGTK (wxGTK.gtk) pythonPackages.python
pythonPackages.wrapPython ];
+
+ passthru = { inherit wxGTK; };
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 3 22:38:52
2011 (r27126)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed May 4 08:41:50
2011 (r27127)
@@ -4524,13 +4524,9 @@
setuptools = pythonPackages.setuptools;
- wxPython = wxPython28;
-
- wxPython26 = callPackage ../development/python-modules/wxPython/2.6.nix {
- wxGTK = wxGTK26;
- };
-
- wxPython28 = callPackage ../development/python-modules/wxPython/2.8.nix { };
+ wxPython = pythonPackages.wxPython;
+ wxPython26 = pythonPackages.wxPython26;
+ wxPython28 = pythonPackages.wxPython28;
twisted = pythonPackages.twisted;
@@ -6909,7 +6905,9 @@
transmission = callPackage ../applications/networking/p2p/transmission { };
- tribler = callPackage ../applications/networking/p2p/tribler { };
+ tribler = callPackage ../applications/networking/p2p/tribler {
+ wxPython = wxPython26;
+ };
twinkle = callPackage ../applications/networking/twinkle {
qt = qt3;
Modified: nixpkgs/trunk/pkgs/top-level/python-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/python-packages.nix Tue May 3 22:38:52
2011 (r27126)
+++ nixpkgs/trunk/pkgs/top-level/python-packages.nix Wed May 4 08:41:50
2011 (r27127)
@@ -1,6 +1,6 @@
{ pkgs, python }:
-python.modules // rec {
+let pythonPackages = python.modules // rec {
inherit python;
@@ -1729,6 +1729,23 @@
};
};
+
+ wxPython = wxPython28;
+
+
+ wxPython26 = import ../development/python-modules/wxPython/2.6.nix {
+ inherit (pkgs) stdenv fetchurl pkgconfig;
+ inherit pythonPackages;
+ wxGTK = pkgs.wxGTK26;
+ };
+
+
+ wxPython28 = import ../development/python-modules/wxPython/2.8.nix {
+ inherit (pkgs) stdenv fetchurl pkgconfig;
+ inherit pythonPackages;
+ wxGTK = pkgs.wxGTK28;
+ };
+
zbase32 = buildPythonPackage (rec {
name = "zbase32-1.1.2";
@@ -1797,4 +1814,4 @@
};
};
-}
+}; in pythonPackages
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
