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
Shea Levy
2cc9e52aec
python-2.7: Attempt to fix the nixpkgs evaluation error
...
svn path=/nixpkgs/trunk/; revision=29327
2011-09-17 18:52:28 +00:00
Alexander Tsamutali
cca42b5cc0
development/interpreters/python/2.7: Fix building on Linux 3.x (iirc, that was the problem).
...
svn path=/nixpkgs/trunk/; revision=29325
2011-09-17 16:29:40 +00:00
Peter Simons
e4033547a3
python-2.7: fix sqlite3 impurity
...
The build expression for python contains code that patches all occurrences of
impure paths like "/usr" and "/opt" out of "setup.py". The same code must be
run when building a python module, too.
svn path=/nixpkgs/trunk/; revision=27164
2011-05-05 14:41:15 +00:00
Peter Simons
f0f900f41b
pkgs/development/interpreters/python/2.7/default.nix: strip trailing whitespace
...
svn path=/nixpkgs/trunk/; revision=27163
2011-05-05 14:41:08 +00:00
Peter Simons
fa08bf65c4
python-2.7: Don't repeat the version number "2.7" in build instructions. Instead, use the variable ${majorVersion}.
...
svn path=/nixpkgs/trunk/; revision=27162
2011-05-05 14:41:02 +00:00
Cillian de Roiste
47d86a8371
Adding Python 3.2
...
svn path=/nixpkgs/trunk/; revision=26893
2011-04-19 18:10:15 +00:00
Eelco Dolstra
cf00c432ae
* By popular demand, restore Python 2.6.
...
svn path=/nixpkgs/trunk/; revision=26726
2011-04-06 21:57:30 +00:00
Eelco Dolstra
566d5ab26e
* Hackery to get Python to build on Cygwin.
...
svn path=/nixpkgs/branches/modular-python/; revision=26694
2011-04-05 14:29:11 +00:00
Eelco Dolstra
b9293b6c20
* `patch' on FreeBSD doesn't like paths with // in them.
...
svn path=/nixpkgs/branches/modular-python/; revision=26682
2011-04-04 15:48:58 +00:00
Eelco Dolstra
d449c4db98
* Remove Python 2.6, since the only remaining package that used it
...
(Calibre) also works with 2.7.
svn path=/nixpkgs/branches/modular-python/; revision=26561
2011-03-28 11:50:47 +00:00
Eelco Dolstra
8ca5d5d8b6
* Move python/2.7/modules.nix into python/2.7/default.nix. Also
...
remove the pythonModules attribute. The built-in modules are now
accessible as (e.g.) "python.modules.ssl" or "pythonPackages.ssl".
svn path=/nixpkgs/branches/modular-python/; revision=26559
2011-03-28 09:48:57 +00:00
Eelco Dolstra
a8334929f1
* Delete Python 2.4. It was only used by "zope", which doesn't even
...
build.
svn path=/nixpkgs/branches/modular-python/; revision=26350
2011-03-16 09:56:19 +00:00
Eelco Dolstra
b3667a1e8f
* Sync with the trunk.
...
svn path=/nixpkgs/branches/modular-python/; revision=26347
2011-03-16 09:39:40 +00:00