| Commit message (Collapse) | Author | Age |
| |
|
| |
|
|\
| |
| |
| | |
Many non-conflict problems weren't (fully) resolved in this commit yet.
|
| |
| |
| |
| |
| |
| | |
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes regression from 086e801d5132bcf9a4e4cac56c361651b7b22ac0.
The switch tu UCS-4 only happened for the main Python interpreter and
libraries, but the extension modules were using the same source but
without any configureFlags, so the extensions still referred to UCS-2
symbols.
Tested module builds of Python 2.7 and all modules except crypto fail.
Also tested against sqlite3 module of Python 2.6, although for other
modules there still seems to be an unrelated build failure with Tcl/Tk
libraries, so we might need to fix that later.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A build output of such a failure can be found here:
http://hydra.nixos.org/build/21994789/nixlog/1/raw
The build_ext command doesn't return non-zero if it fails but instead
produces a file with a "_failed.so" suffix, which we're now checking
after the build_ext command.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
There was a typo that failed them.
Also, drop pkgconfig again, as it seems unused; and fix python26.
Now all python*.modules build, except for python26.tkinter
which fails on master as well.
|
|/ |
|
|
|
|
| |
versionOlder/versionAtLeast to specify bounds
|
|
|
|
|
| |
(cherry picked from commit 23a202519cb1d8704a0b4294d8d13a224efb1a74)
Signed-off-by: Domen Kožar <domen@dev.si>
|
| |
|
|
|
|
|
| |
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
|
|\
| |
| |
| |
| | |
Conflicts (simple):
pkgs/development/lisp-modules/clwrapper/setup-hook.sh
|
| | |
|
|\| |
|
| |\
| | |
| | | |
Fix python26Packages.sqlite3
|
| | | |
|
|\| | |
|
| |/
| |
| |
| |
| |
| | |
- test/test_support.py module is used by many libraries which backport python
3.0 functionality to 2.6/2.7
- enable subprocess32 tests (now passing for python 2.6/2.7)
|
|\|
| |
| |
| | |
Hydra nixpkgs: ?compare=1156478
|
| | |
|
|\|
| |
| |
| |
| | |
Conflicts:
pkgs/development/libraries/poppler/default.nix
|
| | |
|
| |
| |
| |
| |
| | |
When includeModules is true, python is built with all optional modules
as part of derivation.
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| | |
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.
Conflicts:
pkgs/stdenv/generic/default.nix
|
| |
| |
| |
| | |
Signed-off-by: Domen Kožar <domen@dev.si>
|
|/ |
|
| |
|
|
|
|
| |
Let python tell you the correct path for site-packages.
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
The current 'db' attribute refers to DB 4.8, which Python 2.6 does
recognize: <http://hydra.nixos.org/build/7320517/nixlog/1/raw>.
|
|\|
| |
| |
| |
| | |
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.
|
| | |
|
|\|
| |
| |
| |
| | |
Conflicts:
pkgs/development/compilers/ghc/with-packages.nix
|
| | |
|
|\|
| |
| |
| |
| |
| | |
Conflicts:
pkgs/applications/version-management/git-and-tools/git/default.nix
pkgs/top-level/all-packages.nix
|
| | |
|
|/
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
| |
see #68
|
| |
|