Alexander Kjeldaas
3bf4362381
python: improve library determinism
...
1) Make the core python libraries deterministic.
2) Make the python libraries created by glib deterministic.
@vcunat put back the removal of share/gtk-doc in glib.
2014-09-13 15:03:12 +02:00
Vladimír Čunát
82797f98f2
Merge branch 'staging' into modular-stdenv
...
Conflicts:
pkgs/development/interpreters/perl/5.10/setup-hook.sh
pkgs/development/interpreters/perl/5.8/setup-hook.sh
pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát
1e389c976c
merge 'staging' into modular-stdenv
...
In 2c62a36b77
the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.
Conflicts:
pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Domen Kožar
33949a413c
python34: include a patch to fix http://bugs.python.org/issue21121
2014-08-30 20:43:31 +02:00
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