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

Merge recent master into staging

Browse Source 
Hydra nixpkgs: ?compare=1151601
This commit is contained in:
Vladimír Čunát
2014-09-13 21:48:29 +02:00
parent 6a63d1e1e1
commit d957b4bd78
138 changed files with 9311 additions and 7047 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/wxPython/2.8.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages }:
{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages, python, isPyPy }:
assert wxGTK.unicode;
let version = "2.8.12.1"; in
stdenv.mkDerivation {
if isPyPy then throw "wxPython-${version} not supported for interpreter ${python.executable}" else stdenv.mkDerivation {
name = "wxPython-${version}";
builder = ./builder.sh;
pkgs/development/python-modules/wxPython/3.0.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages, openglSupport ? true }:
{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages, openglSupport ? true, python, isPyPy }:
assert wxGTK.unicode;
@@ -6,7 +6,7 @@ with stdenv.lib;
let version = "3.0.0.0"; in
stdenv.mkDerivation {
if isPyPy then throw "wxPython-${version} not supported for interpreter ${python.executable}" else stdenv.mkDerivation {
name = "wxPython-${version}";
builder = ./builder3.0.sh;