JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,306 Commits 1 Branch 0 Tags 12 GiB
d33170a3d2
Commit Graph

242 Commits

Author SHA1 Message Date
Florian Friesdorf
53490bd17e include ssl with python2.6 as is the case with 2.7 
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-08-12 13:33:23 +02:00
Eelco Dolstra
e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Florian Friesdorf
4fd6168e8a python.isPyXY markers 2014-07-10 16:40:35 +02:00
Florian Friesdorf
7dde165353 pythonX.Y sitePackages passthru 
Let python tell you the correct path for site-packages.
 2014-07-10 16:34:45 +02:00
Charles Strahan
08f2ce1172 Fix Python 3.{2,3,4} on Darwin. 
This removes the `-lcrypt` linker flag when compiling under Darwin.
 2014-07-09 00:18:11 -04:00
Domen Kožar
2e70c676ca python: link gcc_s 
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-07-02 19:57:16 +02:00
Domen Kožar
cfcbfb494e python: 2.7.7 -> 2.7.8 2014-07-02 18:45:34 +02:00
Vladimír Čunát
5a98b9f514 Merge recent master into p/stdenv 
Merged just before the pypi update, as it seems to cause problems on Hydra.
 2014-06-09 19:07:31 +02:00
Domen Kožar
73169b3a37 python: 2.7.6 -> 2.7.7 2014-06-04 16:18:36 +02:00
Vladimír Čunát
872860e6de Merge #1187 into p/stdenv 
Tested building firefox, kdelibs, evince on x86_64-linux.
 2014-05-29 22:16:07 +02:00
Domen Kožar
53465c35a0 python: 3.4.0 -> 3.4.1 2014-05-22 09:05:38 +02:00
Ricardo M. Correia
f3967570e7 python-3.4: Add support for grsecurity 2014-05-15 13:25:50 +02:00
Ricardo M. Correia
982c84514b python-3.3: Add support for grsecurity 2014-05-15 13:25:50 +02:00
Ricardo M. Correia
6a4fd79b51 python-2.7: Add support for grsecurity 2014-05-15 13:25:50 +02:00
James Cook
21cb9c24f0 Patch python32 for CVE-2014-1912. 2014-04-13 05:15:19 +02:00
James Cook
324ade4658 Patch python27 for CVE-2014-1912. 2014-04-13 05:15:19 +02:00
Ricardo M. Correia
842ae7674b python-3.4: Add support for lzma 2014-03-23 21:26:54 +01:00
Ricardo M. Correia
c173ddb70e python-3.3: Add support for lzma 2014-03-23 21:26:54 +01:00
Georges Dubus
24e9c676d2 python: update 3.4.0 to stable release 2014-03-17 17:07:20 +01:00
Domen Kozar
f911d51243 python 3.3.4 -> 3.3.5 2014-03-09 21:04:14 +01:00
Domen Kožar
83771bd926 add python 3.4.0rc2 2014-03-03 14:21:28 +01:00
Peter Simons
51c9dbc9f3 python-wrapper: add 'ignoreCollisions' parameter (which default to 'false') 2014-02-24 12:41:12 +01:00
Domen Kožar
a0ff8f687f python3.3: 3.3.3 -> 3.3.4 2014-02-20 00:44:51 +01:00
Domen Kožar
31949ead32 python2.7: 2.7.5 -> 2.7.6 2014-02-20 00:44:27 +01:00
Domen Kožar
67cc87a35a python2.6: 2.6.8 -> 2.6.9 2014-02-20 00:44:08 +01:00
William A. Kennington III
bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
Vladimír Čunát
161d029d7d preferLocalBuild: set to true for wrappers and fetchers 2014-02-10 21:04:17 +01:00
Eelco Dolstra
82359bba65 python-3.3: Only build on Linux 
It doesn't build on Darwin: http://hydra.nixos.org/build/8597946
 2014-01-30 13:57:16 +01:00
Vladimír Čunát
9443129b08 Merge master into stdenv-updates 
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
 2014-01-04 18:34:53 +01:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates 
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
 2013-12-29 10:01:22 +01:00
William A. Kennington III
e4b4df6f43 Update python3 from 3.3.2 -> 3.3.3 2013-12-28 21:04:50 +01:00
Peter Simons
4e917cdc35 python-2.6-bsddb: build this module with Berkeley DB 4.5 
The current 'db' attribute refers to DB 4.8, which Python 2.6 does
recognize: <http://hydra.nixos.org/build/7320517/nixlog/1/raw>.
 2013-12-23 21:45:46 +01:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
 2013-12-04 18:33:52 +01:00
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
Peter Simons
6be8ad3392 Merge branch 'origin/master' into stdenv-updates. 
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
 2013-10-18 18:57:24 +02: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
Peter Simons
76244ac2e2 Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
 2013-08-16 22:51:13 +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
Peter Simons
522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates. 
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-30 11:29:30 +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
Vladimír Čunát
8ba92b8895 Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-08 10:48:05 +02:00
Jason \"Don\" O'Conal
9007e57f28 python27: compile with tkinterp on darwin 2013-07-04 13:11:25 +02:00
Vladimír Čunát
4251b70c7e Merge master into stdenv-updates (contains new X stuff) 2013-06-27 16:24:57 +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
Eelco Dolstra
83ec7aa92f python: Remove --with-wctype-functions flag 
This causes functions like string.upper() to misbehave on non-ASCII
characters.  Upstream also advises against it:

  http://bugs.python.org/issue9210
  http://bugs.python.org/issue11309
 2013-06-21 14:05:46 +02: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
Peter Simons
022f120a2c Merge branch 'master' into stdenv-updates. 2013-04-07 23:37:12 +02:00
Domen Kozar
b4ac9a4c9f python: 2.7.3 -> 2.7.4 2013-04-07 12:22:40 +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