Commit Graph

137 Commits

Author SHA1 Message Date
Domen Kozar
541f2ad531 Revert "python: first fix towards cross-compiling"
This reverts commit c89fe1c0ee.
2013-05-20 12:03:58 +02:00
Domen Kozar
c89fe1c0ee python: first fix towards cross-compiling 2013-05-20 11:15:32 +02:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +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
Yury G. Kudryashov
92f1b06907 This is sha256, not md5
svn path=/nixpkgs/branches/stdenv-updates/; revision=32715
2012-03-01 07:19:01 +00:00
Eelco Dolstra
b14a737a4d * Since we're rebuilding everything that depends on Python anyway, we
may as well update Python to the latest stable version.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32675
2012-02-28 11:09:36 +00:00
Florian Friesdorf
ff37a57373 Revert "remove empty readonly site-packages"
This reverts commit 92b56e5686b06237c23ba41b6b8918ea643781dc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32674
2012-02-28 10:31:28 +00:00
Florian Friesdorf
4956884de5 Revert "do not propagate makeWrapper via pythonXYFull"
This reverts commit 3ee2667e4c60c2ed850da8538cf135fe7f716f30.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32656
2012-02-28 00:07:33 +00:00
Florian Friesdorf
bf1fe3aa09 Revert "pysite support for pythonXYFull wrapper"
This reverts commit f77b9a16a9ef52951a601997593dc557a42660b9.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32653
2012-02-28 00:07:23 +00:00
Florian Friesdorf
1d2e06e068 pysite support for pythonXYFull wrapper
svn path=/nixpkgs/branches/stdenv-updates/; revision=32593
2012-02-26 17:23:42 +00:00
Florian Friesdorf
1c504b49b4 remove empty readonly site-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=32590
2012-02-26 17:23:31 +00:00
Florian Friesdorf
95f0b6119c do not propagate makeWrapper via pythonXYFull
svn path=/nixpkgs/branches/stdenv-updates/; revision=32589
2012-02-26 17:23:28 +00:00
Florian Friesdorf
fe9d9530ba symlink python manpage for pythonXYFull
svn path=/nixpkgs/branches/stdenv-updates/; revision=32588
2012-02-26 17:23:25 +00:00
Florian Friesdorf
09ae58fcd7 python wrapper comment
svn path=/nixpkgs/branches/stdenv-updates/; revision=32587
2012-02-26 17:23:22 +00:00
Florian Friesdorf
8e32380a79 add PSFL, update python meta (license, maintainers, unify description)
svn path=/nixpkgs/branches/stdenv-updates/; revision=32585
2012-02-26 17:23:16 +00:00
Eelco Dolstra
f71dd91a43 * Apply r32435 from the trunk (always build Python with SSL support).
Remove .ssl references from some packages missed in that commit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32469
2012-02-21 23:35:35 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Florian Friesdorf
0c32d209ca python wrapper that sets PYTHONHOME to the profile it is in
svn path=/nixpkgs/trunk/; revision=29462
2011-09-23 17:00:13 +00:00