Commit graph

547 commits

Author SHA1 Message Date
Eelco Dolstra 4a5042a1a1 * Python recompiles a Python if the mtime stored *in* the pyc/pyo file
differs from the mtime of the source file.  This doesn't work in Nix
  because Nix changes the mtime of files in the Nix store to 1.  So
  treat that as a special case.

  Yes, this should make Python programs faster.

svn path=/nixpkgs/branches/modular-python/; revision=25387
2011-01-04 15:10:03 +00:00
Eelco Dolstra b7b1fc322a * Python 2.7: get rid of most dependencies.
svn path=/nixpkgs/branches/modular-python/; revision=25385
2011-01-04 14:47:36 +00:00
Eelco Dolstra c1eb464f3c * Build those Python modules in the Python distribution that require
additional dependencies (e.g. SQLite, X11, or Tcl/Tk) outside the
  main Python package (i.e., pythonBase).  This makes pythonFull
  unnecessary: you can just pass the additional modules as
  buildInputs to packages that require them, e.g.

    buildInputs = [ pythonModules.sqlite3 ];

svn path=/nixpkgs/branches/modular-python/; revision=25364
2011-01-03 16:25:11 +00:00
Eelco Dolstra e1309dee31 * Python 2.7.1.
svn path=/nixpkgs/trunk/; revision=25362
2011-01-03 15:52:48 +00:00
Lluís Batlle i Rossell cd6de2880f Fixing the build of spidermonkey (on -fPIC) for mips.
They enable automatically the -fPIC only on x86_64, while I think most non-i686 needs it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25189
2010-12-17 20:41:25 +00:00
Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
Eelco Dolstra dc09f8766a * PHP 5.3.4.
svn path=/nixpkgs/trunk/; revision=25143
2010-12-15 12:53:24 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Michael Raskin c1e384b3eb Tests fail for a reason that tells more about tests than sabout built binary
svn path=/nixpkgs/trunk/; revision=24949
2010-12-01 21:11:28 +00:00
Peter Simons b173267123 pkgs/development/interpreters/r-lang: cosmetic improvements to package description, etc.
svn path=/nixpkgs/trunk/; revision=24914
2010-11-29 11:13:03 +00:00
Peter Simons 9d4fb7d641 pkgs/development/interpreters/r-lang: updated to version 2.12.0
svn path=/nixpkgs/trunk/; revision=24913
2010-11-29 11:12:43 +00:00
Lluís Batlle i Rossell 0e4c970d11 Updating from trunk - I hope I fixed the conflict around gettext - I left it as
it was before merging.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24876
2010-11-26 14:40:39 +00:00
Lluís Batlle i Rossell 5387036c50 Adding php 5.2 (5.3 does not build on arm), although not the default in the attribute 'php'.
svn path=/nixpkgs/trunk/; revision=24872
2010-11-26 14:26:15 +00:00
Michael Raskin a238d43cff Skip tests - network ones fail
svn path=/nixpkgs/branches/stdenv-updates/; revision=24752
2010-11-18 10:16:16 +00:00
Michael Raskin fb58f74d82 Updating from trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
2010-11-17 17:03:09 +00:00
Peter Simons d3d18bca23 Advance version of Racket.
svn path=/nixpkgs/trunk/; revision=24713
2010-11-16 17:31:21 +00:00
Lluís Batlle i Rossell 8746de3ae8 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
2010-11-11 22:18:14 +00:00
Michael Raskin 4394b2d1ae Update CLisp
svn path=/nixpkgs/trunk/; revision=24649
2010-11-10 17:55:43 +00:00
Lluís Batlle i Rossell 448b75b87b Removing a fix made for gcc 4.3 in php expression. Now it builds with -O2 as usual, instead of -O1.
svn path=/nixpkgs/trunk/; revision=24570
2010-11-02 13:24:12 +00:00
Lluís Batlle i Rossell f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
2010-10-31 19:30:31 +00:00
Lluís Batlle i Rossell a608761679 Updating php from 5.2.13 to 5.3.3. I go from a tarball not available anymore at the URL
of the nix expression, to a new version that may have little incompatibilities with 5.2 syntax.
Let's see if there are complains from php users.

svn path=/nixpkgs/trunk/; revision=24552
2010-10-31 19:26:39 +00:00
Michael Raskin a7518923fe Fix includes
svn path=/nixpkgs/trunk/; revision=24534
2010-10-29 19:18:13 +00:00
Michael Raskin 27acc93394 Add thread-safe to options
svn path=/nixpkgs/trunk/; revision=24532
2010-10-29 18:28:43 +00:00
Evgeny Egorochkin 19e0cda8d8 Fix names of packages. Patch by Karn Kallio.
svn path=/nixpkgs/trunk/; revision=24478
2010-10-26 00:22:44 +00:00
Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Ludovic Courtès 01134e698f GNU Guile 1.9: Add propagated build inputs.
svn path=/nixpkgs/trunk/; revision=24372
2010-10-19 22:23:06 +00:00
Ludovic Courtès f7278f137e GNU Guile 1.9.13.
svn path=/nixpkgs/trunk/; revision=24364
2010-10-19 13:20:15 +00:00
Lluís Batlle i Rossell fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Ludovic Courtès 01955a51a2 Tidy up Nix expression for Racket.
Patch by Karn Kallio <tierpluspluslists@gmail.com>.

svn path=/nixpkgs/trunk/; revision=24085
2010-10-05 16:00:10 +00:00
Peter Simons e3d3ee1af3 pkgs/development/interpreters/maude: don't run the test suite on Darwin; it's known to fail
svn path=/nixpkgs/trunk/; revision=24073
2010-10-05 13:45:57 +00:00
Lluís Batlle i Rossell cd4b54748a Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Ludovic Courtès 332eca4ad9 Add Nix expression for Racket.
Patch by Karn Kallio <tierpluspluslists@gmail.com>.

svn path=/nixpkgs/trunk/; revision=23881
2010-09-21 12:31:11 +00:00
Evgeny Egorochkin 1ba317f3c6 rubyLibs: fix impurity in gem installation. Should not take ruby from user environment.
svn path=/nixpkgs/trunk/; revision=23857
2010-09-18 16:26:14 +00:00
Lluís Batlle i Rossell 2c5de61327 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
Lluís Batlle i Rossell e6a787f44a Making lua and boost cross-build.
svn path=/nixpkgs/trunk/; revision=23807
2010-09-15 09:56:06 +00:00
Yury G. Kudryashov f802a70d87 Update gem-nix patch to use ''...'' instead of "..."
Also update ruby libs

svn path=/nixpkgs/trunk/; revision=23683
2010-09-08 09:56:59 +00:00
Yury G. Kudryashov 17c70d3efd Mass rubygems update
* Upgrade to rubygems-1.3.7
* Upgrade all gems
* Add rails3

svn path=/nixpkgs/trunk/; revision=23682
2010-09-08 09:56:53 +00:00
Yury G. Kudryashov 40a7243ed3 ruby: upgrade, optional docs
svn path=/nixpkgs/trunk/; revision=23681
2010-09-08 09:56:46 +00:00
Rob Vermaas d9f435106c lua5: re-enable -fPIC for lua5
svn path=/nixpkgs/trunk/; revision=23668
2010-09-07 12:56:49 +00:00
Ludovic Courtès 1ecee338e8 GNU Guile 1.9.12.
svn path=/nixpkgs/trunk/; revision=23649
2010-09-05 15:19:17 +00:00
Lluís Batlle i Rossell cca1cae042 Updating from trunk. I had to do some changes to make it fit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
2010-08-29 11:09:23 +00:00
Peter Simons 91f20b6289 pkgs/development/interpreters/maude: updated to version 2.5
svn path=/nixpkgs/trunk/; revision=23467
2010-08-26 18:09:14 +00:00
Peter Simons 3b94efffe5 pkgs/development/interpreters/python/2.5: removed obsolete python version 2.5
Python 2.5 is unused in nixpkgs -- 2.6 has been the default version for
quite a while.

svn path=/nixpkgs/trunk/; revision=23454
2010-08-26 12:09:42 +00:00
Peter Simons 08244152cc pkgs/development/interpreters/lua-5: overriding CFLAGS on the make command-line breaks the build
svn path=/nixpkgs/trunk/; revision=23367
2010-08-23 15:20:49 +00:00
Peter Simons 8170f3b73b pkgs/development/interpreters/lua-5: FreeBSD can't handle "install -D"; use "ensureDir" instead
svn path=/nixpkgs/trunk/; revision=23366
2010-08-23 15:09:02 +00:00
Peter Simons c50ae128d5 pkgs/development/interpreters/lua-5: added support for all Unix platforms
svn path=/nixpkgs/trunk/; revision=23362
2010-08-23 14:41:03 +00:00
Peter Simons f79f257c88 pkgs/development/interpreters/lua-5: $makeFlags is not a list
svn path=/nixpkgs/trunk/; revision=23359
2010-08-23 14:29:26 +00:00
Peter Simons a65aab0171 pkgs/development/interpreters/lua-5: cosmetic changes
svn path=/nixpkgs/trunk/; revision=23358
2010-08-23 14:27:33 +00:00
Peter Simons d3a8a3f7d0 pkgs/development/interpreters/lua-5: added meta section to the expression
svn path=/nixpkgs/trunk/; revision=23357
2010-08-23 14:26:26 +00:00
Lluís Batlle i Rossell f16353b6f2 Updated from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
2010-08-20 13:41:12 +00:00
Peter Simons 0b529ff4d7 pkgs/development/interpreters/python/2.7: added various meta attributes
svn path=/nixpkgs/trunk/; revision=23228
2010-08-18 15:03:34 +00:00
Peter Simons f01ceffb9e pkgs/development/interpreters/python/wrapper.nix: clean up debug code
svn path=/nixpkgs/trunk/; revision=23200
2010-08-17 10:17:32 +00:00
Peter Simons 9670fca780 Added "python-$version-wrapper" expression.
The python wrapper expression expects a list of Python modules, $extraLibs,
which are added to $PYTHONPATH before executing the actual Python interpreter.

svn path=/nixpkgs/trunk/; revision=23194
2010-08-16 17:03:35 +00:00
Peter Simons 3658a8b040 pkgs/development/interpreters/python/2.7/setup-hook.sh: fixed incorrect version number
svn path=/nixpkgs/trunk/; revision=23121
2010-08-11 17:05:44 +00:00
Peter Simons 2b37d181a5 Added Python version 2.7.
svn path=/nixpkgs/trunk/; revision=23117
2010-08-11 15:49:03 +00:00
Lluís Batlle i Rossell ff5d0fa448 Merging from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=23072
2010-08-09 21:21:30 +00:00
David Guibert 9f77579f41 lua: install lua.pc
svn path=/nixpkgs/trunk/; revision=23049
2010-08-09 06:48:21 +00:00
Peter Simons 1a6039cb45 Enable parallel building of gcc, glibc, gmp, mpfr, ncurses, coreutils, perl, python, git, and qt4.
If a build expressions has set "enableParallelBuilding = true", then the
generic builder may utilize more than one CPU core to build that particular
expression. This feature works out of the box for GNU Make. Expressions that
use other build drivers like Boost.Jam or SCons have to specify appropriate
flags such as "-j${NIX_BUILD_CORES}" themselves.

svn path=/nixpkgs/trunk/; revision=23042
2010-08-08 18:51:42 +00:00
Michael Raskin 87cbef96ca Add Veracity distributed VCS (+ issue tracker)
svn path=/nixpkgs/trunk/; revision=23031
2010-08-07 22:44:25 +00:00
Michael Raskin 5792074ddc Add an RC (1.8.0-rc1) of SpiderMonkey by cloning the release expression
svn path=/nixpkgs/trunk/; revision=23030
2010-08-07 21:44:13 +00:00
Lluís Batlle i Rossell 5417c720fd Merging from trunk.
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
2010-08-02 15:48:19 +00:00
Eelco Dolstra b1afe4e7ac * Finish renaming.
svn path=/nixpkgs/trunk/; revision=22801
2010-07-29 07:02:26 +00:00
Eelco Dolstra 5b2dcdd24d * Remove the old PHP.
svn path=/nixpkgs/trunk/; revision=22800
2010-07-29 07:00:00 +00:00
Eelco Dolstra f1598a8941 * More cleanup.
svn path=/nixpkgs/trunk/; revision=22798
2010-07-28 18:01:17 +00:00
Eelco Dolstra 749b8607ca * More cleanup.
svn path=/nixpkgs/trunk/; revision=22795
2010-07-28 15:35:01 +00:00
Eelco Dolstra 6609710409 * Get rid of many instances of "args: with args;", and other coding
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
2010-07-28 11:55:54 +00:00
Eelco Dolstra 0e6ea04477 * Update Ruby to 1.8.7-p299 to fix a build problem caused by the
upgrade to OpenSSL 1.0.0
  (http://hydra.nixos.org/build/494496/nixlog/1/raw).

svn path=/nixpkgs/branches/x-updates/; revision=22700
2010-07-22 09:49:48 +00:00
Peter Simons 9f8ff9f714 pkgs/development/interpreters/python/2.6/default.nix: enable parallel building
svn path=/nixpkgs/branches/stdenv-updates/; revision=22673
2010-07-20 13:13:30 +00:00
Eelco Dolstra ed1172a0e5 * PHP updated to 5.2.13. Removed the "if version == ..." stuff, it's
bad practice.

svn path=/nixpkgs/trunk/; revision=22592
2010-07-13 22:35:50 +00:00
Michael Raskin 7c5e566c5c Cleaned up the unspecified-extra-argument calls where there is no way to access extra arguments. Tarball and full instantiation checks passed.
svn path=/nixpkgs/trunk/; revision=22539
2010-07-08 19:22:50 +00:00
Michael Raskin ccc497f80d Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense.
svn path=/nixpkgs/trunk/; revision=22529
2010-07-08 13:25:52 +00:00
Michael Raskin 6c77fda8c1 Restore R13B version
svn path=/nixpkgs/trunk/; revision=22476
2010-07-05 12:43:59 +00:00
Lluís Batlle i Rossell 5b4e3a5b40 Adding Wings 3D (as a side effect, update erlang, and add esdl).
svn path=/nixpkgs/trunk/; revision=22436
2010-07-01 09:08:37 +00:00
Lluís Batlle i Rossell 9885a6a4da I did not enable well the -fPIC for lua in my last commit. 2nd attempt, for vlc to build fine.
Making vlc build finally (disabling dbus in it)

svn path=/nixpkgs/trunk/; revision=22415
2010-06-25 18:34:35 +00:00
Lluís Batlle i Rossell 029299e710 Making lua build with -fPIC. This allows building vlc on linux-x86_64.
svn path=/nixpkgs/trunk/; revision=22411
2010-06-24 23:05:15 +00:00
Peter Simons 70240d36ac Enable parallel building of gcc, glibc, gmp, mpfr, coreutils, perl, git, and qt4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22400
2010-06-23 14:35:18 +00:00
Ludovic Courtès f1ea4d1835 GNU Guile 1.8: Fix builds with GCC 4.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22369
2010-06-22 08:06:12 +00:00
Ludovic Courtès 298b0ff43c GNU Guile 1.9.11.
svn path=/nixpkgs/trunk/; revision=22215
2010-06-10 21:52:28 +00:00
Marc Weber 5a59b1b55d adding PHP. 5.3.2. See comments.
I had to add the newer PHP because current PHP 5.2.11 doesn't read SOAP
from https urls. Debian's PHP does work - I couldn't find their fix

svn path=/nixpkgs/trunk/; revision=22056
2010-05-29 18:26:54 +00:00
Peter Simons fd8c6ae43d Moved 'maintainers' attribute into the meta section of the expression.
I've also set the 'platforms' attribute to ensure that Hydra actually
builds these packages. Thanks to Lluís Batlle i Rossell for pointing out
these mistakes.

svn path=/nixpkgs/trunk/; revision=21688
2010-05-09 16:01:44 +00:00
Marc Weber 3303106e97 python: support ncurses, replace composedArgsAndFun by makeOverridable
because composedArgsAndFun didn't pass values to the builder

svn path=/nixpkgs/trunk/; revision=21686
2010-05-09 14:33:50 +00:00
Peter Simons bba637c718 pkgs/development/interpreters/python/3.1: renamed this package to "python3"
Python version 3.x is really quite different from 2.x. Using a new name
for the package prevents Nix from performing unintended updates to the
3.x version.

svn path=/nixpkgs/trunk/; revision=21264
2010-04-23 10:42:29 +00:00
Eelco Dolstra f20c7e9c46 * Cleanup: removed the unused `python-new'.
svn path=/nixpkgs/trunk/; revision=21198
2010-04-21 11:12:06 +00:00
Marc Weber 8c0b7e4ad2 - adding experimental python31 build
- cleanup python libraries:
 * moving all python libraries into a attr set into a directory
   so that expressions can be used for both: python 2.5 and 2.6 easily
 * disabling packages which don't build

svn path=/nixpkgs/trunk/; revision=21142
2010-04-17 18:28:25 +00:00
Ludovic Courtès 8a2edb8797 GNU Guile 1.9.10.
svn path=/nixpkgs/trunk/; revision=21110
2010-04-15 22:53:11 +00:00
Lluís Batlle i Rossell 35639242b5 I made a typo in ruby libs.nix
svn path=/nixpkgs/trunk/; revision=21033
2010-04-12 21:03:18 +00:00
Lluís Batlle i Rossell d7cba8fc61 Adding rubygems/lib to RUBYLIB in wrapProgram for ruby libs.nix
Adding ncursesw, and feeding it to sup for wide character support

svn path=/nixpkgs/trunk/; revision=21032
2010-04-12 19:23:14 +00:00
Lluís Batlle i Rossell cf70c1ecbc Updating ruby libs - the same as there were
svn path=/nixpkgs/trunk/; revision=21031
2010-04-12 18:48:38 +00:00
Peter Simons 774a276ff3 pkgs/development/interpreters/maude: added myself as a maintainer
svn path=/nixpkgs/trunk/; revision=21029
2010-04-12 11:21:42 +00:00
Marc Weber 7b5896ca33 add Groovy 1.7.1
patch provided by Francois Perrad

svn path=/nixpkgs/trunk/; revision=20862
2010-03-29 23:36:32 +00:00
Peter Simons d791abd982 pkgs/development/interpreters/python/2.6: updated to version 2.6.5
svn path=/nixpkgs/trunk/; revision=20775
2010-03-23 09:34:52 +00:00
Ludovic Courtès 1a1cea3076 GNU Guile 1.9.9.
svn path=/nixpkgs/trunk/; revision=20762
2010-03-19 13:57:17 +00:00
Lluís Batlle i Rossell ba274e578c Made graphicsmagick-config not say anything about libraries that would be needed for static linking, because we are linking it dynamically.
Made octave link with graphicsmagick to get imread() working.

Nevertheless, imread does not work, because of some problems between octave and latest versions of graphicsmagick: http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html

Next to do: add an older version of graphics magick for octave.

svn path=/nixpkgs/trunk/; revision=20389
2010-03-04 16:41:10 +00:00
Michael Raskin c902a64fb7 Update PLT Scheme
svn path=/nixpkgs/trunk/; revision=20141
2010-02-20 18:34:50 +00:00
Ludovic Courtès 97c9ff361f GNU Guile 1.9.8.
svn path=/nixpkgs/trunk/; revision=20140
2010-02-20 16:19:36 +00:00
Michael Raskin 5401a03919 Disable checks - the failure reason is impossibility to resolve localhost
svn path=/nixpkgs/trunk/; revision=20065
2010-02-17 06:43:49 +00:00
Eelco Dolstra 822d59d4f9 * Remove phpIniBuilder (obsolete).
svn path=/nixpkgs/trunk/; revision=20028
2010-02-15 20:29:50 +00:00
Lluís Batlle i Rossell 6c622c014d octave wants x11 (I reported this to octave as a bug).
Maybe it got in from their recent fltk/gl attempts to make their own plotter.

svn path=/nixpkgs/trunk/; revision=20017
2010-02-15 17:10:25 +00:00
Lluís Batlle i Rossell 43e167641f Updating octave and gnuplot.
svn path=/nixpkgs/trunk/; revision=20007
2010-02-15 10:54:50 +00:00
Eelco Dolstra 64f1191313 * Fix Perl on FreeBSD.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19685
2010-01-26 18:10:59 +00:00
Lluís Batlle i Rossell bcba809460 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
2010-01-25 18:52:07 +00:00
Lluís Batlle i Rossell b14e1f31c9 Fixing the 'platforms' at python 2.6.
svn path=/nixpkgs/trunk/; revision=19602
2010-01-21 16:43:27 +00:00
Michael Raskin e70276079f Add myself as a maintainer
svn path=/nixpkgs/trunk/; revision=19594
2010-01-21 10:07:25 +00:00
Ludovic Courtès 50a7b78fb4 GNU Guile 1.9.7.
svn path=/nixpkgs/trunk/; revision=19565
2010-01-20 11:09:00 +00:00
Eelco Dolstra d348b996cf svn path=/nixpkgs/branches/stdenv-updates/; revision=19546 2010-01-19 17:10:03 +00:00
Eelco Dolstra fa5a119fcd * Perl 5.10.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19517
2010-01-18 12:09:51 +00:00
Lluís Batlle i Rossell 67038ea160 Fixing the meta platforms of python 2.6.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19507
2010-01-17 22:19:10 +00:00
Lluís Batlle i Rossell 70dd97620c Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=19485
2010-01-16 15:19:23 +00:00
Marc Weber 92a0256e8e ruby update:
* xrefresh server on Linux (only paths config option is honored)
* sup can be started without hacks now :)
* rubygems update 1.3.5
* fix handling of /bin/* ruby scripts
* only recognize runtime dependencies when creating nix derivations.
  Some development dependencies are no longer available.
* make ruby lib ffy compile by using NIX_POST_EXTRACT_FILES_HOOK
* update rubygems patch: Even if there is a missing dep create attr
  item. Maybe this missing source can be fixed manually.

svn path=/nixpkgs/trunk/; revision=19470
2010-01-15 19:35:06 +00:00
Lluís Batlle i Rossell 9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Eelco Dolstra fc9d2d63d6 * php-xdebug doesn't have a "lib" argument. This causes Hydra to barf
on the entire nixpkgs:trunk jobset.  It should probably be a bit
  more robust...

svn path=/nixpkgs/trunk/; revision=19282
2010-01-07 10:59:49 +00:00
Marc Weber 900a1c22a4 moving xdebug into its own package. This means you have to specify an additional php.ini file to make php debugger work for command line php.
svn path=/nixpkgs/trunk/; revision=19266
2010-01-06 17:04:38 +00:00
Ludovic Courtès 07393ba7f0 GNU Guile 1.9: Reinstate gcov workaround.
Reverts r18418.

svn path=/nixpkgs/trunk/; revision=19254
2010-01-06 08:43:42 +00:00
Ludovic Courtès cb130281ba perl: Fix for impure GNU/kFreeBSD builds.
svn path=/nixpkgs/trunk/; revision=19059
2009-12-21 01:02:47 +00:00
Lluís Batlle i Rossell 5bae851b1e Merging from trunk. I had to give away some structure to build the native
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
2009-12-19 11:14:16 +00:00
Ludovic Courtès f7c171f73f GNU Guile 1.9.6.
svn path=/nixpkgs/trunk/; revision=19026
2009-12-18 10:49:35 +00:00
Michael Raskin 6320a15c36 Fixing a typo
svn path=/nixpkgs/trunk/; revision=18954
2009-12-15 08:41:29 +00:00
Michael Raskin 7f9c1761b9 Bringing Io snapshot hash in sync with what github currently gives..
svn path=/nixpkgs/trunk/; revision=18951
2009-12-15 07:29:49 +00:00
Ludovic Courtès 1ca40e6a71 guile: Revert r18907 ("Improve `disable-gc-sensitive-tests.patch'.").
This patch no longer applies to `master' and may be unnecessary now.

svn path=/nixpkgs/trunk/; revision=18936
2009-12-14 15:20:05 +00:00
Lluís Batlle i Rossell dae3eb2383 Merging from trunk.
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
2009-12-12 18:39:09 +00:00
Ludovic Courtès b4ae0db5a5 guile: Improve `disable-gc-sensitive-tests.patch'.
svn path=/nixpkgs/trunk/; revision=18907
2009-12-11 21:48:14 +00:00
Marc Weber 5d6b65d339 fix perl-5.8 build
svn path=/nixpkgs/trunk/; revision=18895
2009-12-11 13:58:26 +00:00
Marc Weber 5319704f80 removing old bleeding edge cruft replacing it by a niftier version using
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894
2009-12-11 13:58:23 +00:00
Lluís Batlle i Rossell 89fe676bb3 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
2009-12-10 14:48:45 +00:00
Eelco Dolstra 135cfab57e * PHP 5.2.11.
svn path=/nixpkgs/trunk/; revision=18786
2009-12-03 14:33:40 +00:00
Lluís Batlle i Rossell 2b580b9846 Updating the perl-5.10 expression to support the bootstrapping stdenv better
- I still have not understood why it worked without this fix before, and I think
this has been triggered by the gcc-4.4, but I have not investigated this much. I
went with the trivial fix.

Adding a glibc-2.10.1 expression, because the glibc-2.11 still does not have
a ports release, so it cannot be used in arm. I'm using it only in native
compilation by now.

Making the default glibc to be 2.10 instead of 2.11 in armv5tel-linux.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18688
2009-11-28 12:57:42 +00:00
Rob Vermaas d8800474f7 x86_64 darwin related changes
svn path=/nixpkgs/trunk/; revision=18665
2009-11-27 10:16:42 +00:00
Lluís Batlle i Rossell adc61253b9 Merging from trunk, partially, to get rid of the annoying failing commits from
svn when files were removed, recreated and whatever...
 svn merge -r 18479:18485 ^/nixpkgs/trunk



svn path=/nixpkgs/branches/stdenv-updates/; revision=18659
2009-11-26 21:34:53 +00:00
Rob Vermaas 95970eb095 x86_64-darwin support for perl
svn path=/nixpkgs/trunk/; revision=18652
2009-11-26 15:50:10 +00:00
Lluís Batlle i Rossell 75b60caea0 Updating guile so it uses gawk as a buildNativeInput and not as buildInput.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18561
2009-11-23 17:01:28 +00:00
Lluís Batlle i Rossell 45886e474d On native builds:
- Disabling guile test, because one fails. I commented on that in the source.
On cross builds:
- Adding stripping
- Updating the glibc-2.11 expression to match the parameters of glibc-2.9,
  which I was updating more.
- Renaming from selfNativeBuildInput to selfBuildNativeInput, so this matches
  better the pattern buildNativeInputs.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18550
2009-11-22 22:48:43 +00:00
Ludovic Courtès 98af7b9cb9 GNU Guile 1.8: Clean up.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18545
2009-11-22 22:16:58 +00:00
Lluís Batlle i Rossell 585ba8c27f Big fixes in the cross build:
- Before this changes, cflags and ldflags for the native and the cross compiler
  got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
  independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
  buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
  Maybe we should have a single stdenv and forget about the stdenvCross
  adapter - this could end in a stdenv a bit complex, but simpler than the
  generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
  now works for both the cross and the native compilers, but I think this
  should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
  its manual, so the derivation still fails. Guile requires patching to
  cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
  gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
  directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
  derivation variables mixed with those of the stdenvCross.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
2009-11-22 19:51:45 +00:00
Lluís Batlle i Rossell a263cb814e Fixed some details on cross compilation. Among others:
- Stating better the guile dependencies (native/host) for guile to build
- Fixing cross-linking, through --rpath-link (ld(1) explains well about it
- Made gcc call the linker and the assembler through the gcc wrapper instead of
  directly. I thought this was the source of missing -rpath's, but the source
  of the problem ended up being the lack of --rpath-link. But I think the
  native gcc calls the wrapped ld and as, so let's do the same cross
  compiling.
- Removed the binutilsCross from the glibc expressions. Now they are built
  using the gcc-cross-wrapper, and they were built with the direct gcc and
  binutils before this change.
- I think patchelf and strip don't break the cross-compiled binaries, so I
  reallow them on cross compilation.
- I disable the checkPhase on cross compilation. This made gmp and libtool
  fail when cross compiled, iirc.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18498
2009-11-21 02:42:52 +00:00
Lluís Batlle i Rossell a5fee3325a Fixing some things on the gcc-cross-wrapper (libc was not properly added to the
linking path), and with this achieved bash being cross-compilable.
I fixed the few expressions involved in bash building, so they have well stated
native and non-native inputs.

I also tried to cross-build guile, and with this I found a problem in the
actual cross-gcc: it calls the binutils ld, instead of the ld wrapper. This
way, the programs/shared_libraries don't get the proper -rpath.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18497
2009-11-20 22:56:58 +00:00
Eelco Dolstra 973b9cfde6 * Remove some incorrect uses of makeOverridable.
svn path=/nixpkgs/trunk/; revision=18483
2009-11-20 12:51:14 +00:00
Lluís Batlle i Rossell e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
2009-11-19 19:09:10 +00:00
Ludovic Courtès 1f9e87871e GNU Guile 1.9: Remove unnecessary patch.
svn path=/nixpkgs/trunk/; revision=18418
2009-11-18 13:41:17 +00:00
Ludovic Courtès e615bc4574 GNU Guile 1.9.5.
svn path=/nixpkgs/trunk/; revision=18415
2009-11-18 13:18:24 +00:00
Lluís Batlle i Rossell 4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Marco Maggesi 4d0e24acd3 Add packages scsh, The Scheme Shell
svn path=/nixpkgs/trunk/; revision=18248
2009-11-07 11:17:53 +00:00
Peter Simons 4d675a283e pkgs/development/interpreters/python/2.6/default.nix: fixed build on Darwin
svn path=/nixpkgs/trunk/; revision=18136
2009-11-05 13:44:30 +00:00
Peter Simons f9b71e1c54 pkgs/development/interpreters/python/2.6/default.nix: updated to version 2.6.4
svn path=/nixpkgs/trunk/; revision=18090
2009-11-04 10:29:43 +00:00
Ludovic Courtès f7947871a3 GNU Guile 1.9 with coverage analysis builds.
svn path=/nixpkgs/trunk/; revision=17994
2009-10-28 16:16:23 +00:00
Marc Weber 30006470aa sry
svn path=/nixpkgs/trunk/; revision=17939
2009-10-23 11:30:20 +00:00
Marc Weber 8f588a421d really fix php xdebug
svn path=/nixpkgs/trunk/; revision=17936
2009-10-23 08:56:46 +00:00
Marc Weber bbaf9acc0e fix php compilation without xdebug. Not using xdebug is the default now xdebug update to 2.0.5 because I had strange behaviour while running a piece of code
svn path=/nixpkgs/trunk/; revision=17927
2009-10-22 16:49:07 +00:00
Peter Simons 90dd9d14bf python-2.6: fixed build on Darwin
* Dropped "nolongdouble.patch". The patch no longer applies to Python 2.6, and
   apparently isn't required anymore either.

 * Added access to native Darwin arch utility. Python tries to run 'arch' in
   the configure stage, but that binary reside in /usr/bin. To make it
   available to the expression, the small wrapper darwinArchUtility is added as
   a buildInput if appropriate.

 * Don't pass --enable-shared. The build fails if we try to enable building of
   shared libraries, apparently because some required libraries aren't linked,
   i.e. the linker call isn't right.

TODO:

 * Figure out how to enable shared linking.

 * The resulting binary on Darwin seem to lack the binascii module.

svn path=/nixpkgs/trunk/; revision=17894
2009-10-20 12:13:49 +00:00
Peter Simons 0b25624891 python 2.6.3: initial version of python 2.6 support
The build succeeds on i686-linux. Other platforms look good, too,
because there were hardly any changes necessary to update the expression
from 2.5.

svn path=/nixpkgs/trunk/; revision=17889
2009-10-19 23:10:09 +00:00
Peter Simons 1e575d3572 perl-5.8 and perl-5.10: fixed build on MacOS X
On MacOS X, we used to use the native perl interpreter from /usr/bin.
Unfortunately, that interpreter fails to build a number of packages
(Subversion, Git, etc. ...), because it assumes knowledge about the
underlying C compiler that is not valid for the compiler used by Nix.
For example, /usr/bin/perl assumes that the compiler can build binaries
for both the ppc and the x86 architecture. /usr/bin/gcc can do that, but
the gcc from Nix can't.

The solution is to compile Perl 5.10 in Nix so that the ./configure
phase can properly detect the system's capabilities. However, note that
the resulting binary is impure: it will find headers in /usr/include and
libraries in /usr/lib. In this respect, the Nix-compiled perl binary is
no different than the native one in /usr/bin -- it's just configured
more accurately.

svn path=/nixpkgs/trunk/; revision=17870
2009-10-19 09:17:10 +00:00