Commit graph

151 commits

Author SHA1 Message Date
Shea Levy
06fe4d9904 Partial revert of b09f8110db
Didn't mean to commit this change

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-19 09:04:32 -05:00
Shea Levy
b09f8110db nspr: Bump to 4.10.2
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-18 15:23:30 -05:00
Peter Simons
29588edfe1 python-wrapper: split 'extraLibs' into 'stdLibs' and 'extraLibs', and add 'postBuild' step
The default setting for extraLibs used to be the set of modules that come with
python by default but aren't usually enabled in our standard python derivation
because they require additional libraries. This meant that users who want to
*add* libraries to that set had to use a fairly complicated override, to add
more entries without loosing the ones set by default.

After this patch, the "standard libraries" such as "curses' are listed in
stdLibs while the extraLibs argument remains empty by default. This allows
users to override extraLibs without overriding the standard libraries.

Furthermore, the wrapper environment can be messed around with in an
additional 'postBuild' step. One nice application of this build step is
to patch scripts and binaries to use the wrapped python interpreter
instead of the pristine one, thereby enabling them to pick up all
modules that have been configured. The following example shows how this
is done for the 'pylint' utility:

  pkgs.python27Full.override {
    extraLibs = [pkgs.pylint];
    postBuild = ''
      cd ${pkgs.pylint}/bin
      for i in *; do
        rm $out/bin/$i
        sed -r -e "s|^exec |exec $out/bin/python -- |" <$i >$out/bin/$i
        chmod +x $out/bin/$i
      done;
    '';
  };
2013-11-07 15:13:02 +01:00
Peter Simons
46419ae454 python-wrapper: recursively include all dependencies of the specified 'extraLibs' in the generated environment
This patch means that adding 'matplotlib' to extraLibs will automatically
include 'numpy', too, because matplotlib depends on it.
2013-11-07 14:00:08 +01:00
Michael Raskin
ebdec6418d Reflect addition of curses_panel python module 2013-10-18 12:54:49 +04:00
Michael Raskin
fb2cb7bc0f Adding Glances system monitoring tool 2013-10-18 11:11:47 +04:00
Shea Levy
f6e835a2c3 Fix pythonWrapper when all of the binaries come from python
See discussion in #834

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-10-03 15:25:43 -04:00
Peter Simons
742d6597ca Re-implement python-wrapper with buildEnv.
The new wrapper creates an environment that contains all files from
Python and the extra libraries that have been specified. All files are
found at run-time by means of the $PYTHONHOME variable; the wrapper no
longer uses $PYTHONPATH.
2013-10-02 22:47:19 +02:00
Domen Kožar
b331056e75 python2.6: add crpyt module 2013-08-14 08:42:48 +02:00
Domen Kožar
1974c55d91 add python application substanced and it's dependencies 2013-08-13 11:14:24 +02:00
Domen Kozar
918e5efb99 recurse into python33 and pypy packages 2013-07-29 14:52:19 +02:00
Domen Kozar
5ec6cf3756 add python3 support to pythonPackages 2013-07-29 12:09:06 +02:00
Domen Kozar
e41fc2a677 add python32 2013-07-23 11:55:35 +02:00
Domen Kozar
e491997a6b python3: 3.3.1 -> 3.3.2 2013-07-23 11:21:38 +02:00
Jason \"Don\" O'Conal
9007e57f28 python27: compile with tkinterp on darwin 2013-07-04 13:11:25 +02:00
Evgeny Egorochkin
09e6ae577b Python: add DETERMINISTIC_BUILD env var. If set, python doesn't write timestamps to pyc files. Tested by
building argparse, compiling from cli, compiling using py_compile.
2013-06-22 09:45:01 +03:00
Domen Kozar
1a1d8dfc69 Python: 2.7.4 -> 2.7.5 2013-06-05 21:07:46 +02:00
Domen Kozar
bf58711b2b python: 2.7.3 -> 2.7.4 2013-05-03 09:06:06 +02:00
Vladimír Čunát
8249695b61 Merge branch 'master' into x-updates
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Domen Kozar
ec25d38261 python 3.3.1rc1 -> 3.3.1 2013-04-07 11:13:37 +02:00
Vladimír Čunát
eb2e46aab2 Merge branch 'master' into x-updates
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Cillian de Róiste
0ad1f78760 Python3: fix the download URL 2013-03-28 22:57:37 +01:00
Cillian de Róiste
a5e48c0f20 Python 3.3 upgrade to 3.3.1rc1 to fix an important bug for Nix
http://bugs.python.org/issue15833

When Python 3.3.0 attempts to compile python bytecode in the system
directories it raises and exception and stops. Since Python 3.3 is
only required by the latest Blender, I hope it's OK to use the RC
until the final release.
2013-03-28 01:10:23 +01:00
Peter Simons
270a0009be python3: update to version 3.3.0 2013-03-26 01:16:15 +01:00
Florian Friesdorf
870f4cca73 fix pythonWrapper for non-gnu ln 2013-03-25 15:13:08 +01:00
Vladimír Čunát
b1eeae8cac Merge branch 'master' into x-updates
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
Florian Friesdorf
94f2013c0c pythonDocs: recurseIntoAttrs does not recurse, bypass problem 2013-03-13 13:16:03 +01:00
Vladimír Čunát
86639d9bb9 Merge branch 'master' into x-updates
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
2013-03-09 17:55:37 +01:00
Florian Friesdorf
b345bca3af pythonDocs: group in subfolders pythonXY/TYPE
I got it now - promised.
2013-03-05 12:41:30 +01:00
Florian Friesdorf
2e21e4fadc fix pythondocs (missing lib, doc instead of docs) 2013-03-05 12:28:48 +01:00
Florian Friesdorf
930e4d5391 pythonDocs: add meta.maintainers, subgroup attrset by doctype 2013-03-03 06:48:05 +01:00
Florian Friesdorf
06e4059f80 fix pythonDocs install path 2013-03-02 16:01:42 +01:00
Florian Friesdorf
0314b8b00f add python docs 2013-03-02 05:42:26 +01:00
Lluís Batlle i Rossell
bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +01:00
Vladimír Čunát
b3ce50d88a add python33 (needed by new blender) 2013-02-16 18:11:32 +01:00
Vladimír Čunát
dbcdc27e03 python3: fix libPrefix passthru 2013-02-16 18:10:43 +01:00
Florian Friesdorf
1a52c7659d python: fix linkme-wrapper 2013-02-15 06:14:58 +01:00
Florian Friesdorf
906be2ea98 python-linkme-wrapper: optimize some escaping 2013-02-05 20:12:28 +01:00
Florian Friesdorf
a63bb419f2 remove pythonhome-wrapper, python-linkme-wrapper is more flexible 2013-01-22 15:28:30 +01:00
Florian Friesdorf
1fa2e7f9a9 python-linkme-wrapper 2013-01-22 15:28:30 +01:00
Florian Friesdorf
212b4df91c recursivePthLoader included via wrapper, not propagated by modules 2013-01-11 09:53:28 +01:00
Florian Friesdorf
ee0204d2c8 for some reason the python2.6 manpage is not gzipped 2013-01-09 08:27:39 +01:00
Florian Friesdorf
723d5a5581 fix python-2.6 build: purity for systems with stdenv.gcc.libc
On other systems python26 will continue to look for
/usr/include/netinet/in.h among others. I don't know whether/what to
do about that.
2013-01-09 08:26:15 +01:00
Florian Friesdorf
16e2a9133f python-2.6.8: long overdue 2013-01-09 08:06:46 +01:00
Florian Friesdorf
838761cad2 python manpages as python2.6, python2.7 and python
see #68
2012-12-22 03:26:26 +01:00
Florian Friesdorf
3665e02901 python: make pdb.py available as bin/pdb and bin/pdb${python.majorVersion} 2012-07-20 21:43:14 +02:00
Eelco Dolstra
356ce12cd0 * Python 2.7.3 (including various security fixes).
svn path=/nixpkgs/branches/stdenv-updates/; revision=34008
2012-05-07 20:08:10 +00:00
Peter Simons
27de563164 Updated Python 3.x.
- updated to version 3.2.3
 - fixed version numbers in setup-hook.sh
 - sort input variable list alphabetically
 - tk support needs x11 support as well
 - deleted obsolete version 3.1

Furthermore, all CPPFLAGS and LDFLAGS required to find the build inputs are now
explicitly passed to ./configure. The python 3.x build systems tries to ignore
the environment as much as possible to provide deterministic builds. This means
that our magic environment variable stuff won't work, and previously built
python3 binaries lacked all kinds of extensions, such as zlib, etc.

svn path=/nixpkgs/trunk/; revision=33937
2012-04-27 08:20:46 +00:00
Ludovic Courtès
04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'.
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Eelco Dolstra
934ef8e3fc * Fix evaluation of pythonPackages.bugz.
svn path=/nixpkgs/trunk/; revision=33815
2012-04-17 15:31:44 +00:00