Commit graph

351 commits

Author SHA1 Message Date
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