3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

484 commits

Author SHA1 Message Date
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
Ludovic Courtès 8e9ea2c209 GNU Guile 1.9.4 (alpha).
svn path=/nixpkgs/trunk/; revision=17843
2009-10-16 08:00:36 +00:00
Eelco Dolstra 257ffc8e73 * Fix broken meta attributes.
svn path=/nixpkgs/trunk/; revision=17773
2009-10-13 09:39:27 +00:00
Lluís Batlle i Rossell e5654ae80f Reverting simons' r17618, which causes a major stdenv rebuild.
svn path=/nixpkgs/trunk/; revision=17622
2009-10-02 19:05:39 +00:00
Peter Simons 67cea803fa 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/FCC can do that, but the gcc from Nix can't.

The solution is to compile Perl 5.10 via Nix so that it can properly configure
itself. However, note that the resulting binary is impure: it will find headers
in /usr/include and libraries in /usr/lib -- something a pure perl binary
wouldn't do. In this respect our Nix-compiled perl binary is not better than
the native one from /usr/bin -- it's just more accurately configured.

svn path=/nixpkgs/trunk/; revision=17618
2009-10-02 16:26:05 +00:00
Ludovic Courtès 50f75f17c5 Guile 1.9: Work around defects in guile-2.0.pc' and guile-config'.
svn path=/nixpkgs/trunk/; revision=17486
2009-09-28 23:23:37 +00:00
Marc Weber 931a5936cb using getConfig for php so that users who don't know the composableDerivation very well can switch off features.
svn path=/nixpkgs/trunk/; revision=17423
2009-09-25 19:39:05 +00:00
Ludovic Courtès cdd0317b9a Guile 1.9: Propagate `pkg-config'.
svn path=/nixpkgs/trunk/; revision=17359
2009-09-23 09:13:51 +00:00
Ludovic Courtès cb865a1ac1 Python 2.5: Add `passthru.platforms'.
svn path=/nixpkgs/trunk/; revision=17198
2009-09-16 14:42:56 +00:00
Ludovic Courtès 717910394b GNU Guile 1.9.3.
svn path=/nixpkgs/trunk/; revision=17188
2009-09-16 12:46:17 +00:00
Eelco Dolstra 23ece2e968 * Fix for building Perl 5.8 on newer kernel headers. We still need
Perl 5.8 for old GHCs.

svn path=/nixpkgs/trunk/; revision=17111
2009-09-14 13:31:26 +00:00
Michael Raskin 9e58814536 Changing CLisp, FPC to new style of adding to hydra
svn path=/nixpkgs/trunk/; revision=16855
2009-08-25 09:00:19 +00:00
Marc Weber 075f9712f2 fix soappy by using trunk version
svn path=/nixpkgs/trunk/; revision=16790
2009-08-20 20:19:04 +00:00
Marc Weber 79038a2038 build ruby with gdbm support
svn path=/nixpkgs/trunk/; revision=16789
2009-08-20 20:19:01 +00:00
Marc Weber e7dc062579 adding xapian and xapian-bindings
svn path=/nixpkgs/trunk/; revision=16788
2009-08-20 20:18:58 +00:00
Michael Raskin 7ffff9d558 Adding ACL2.
ACL2 = A Computational Logic for Applicative Common Lisp. It is 
a Lisp sublanguage and a correctness prover for it.

svn path=/nixpkgs/trunk/; revision=16708
2009-08-13 14:32:52 +00:00
Michael Raskin d2e63b3167 Change used archive format for CLisp
svn path=/nixpkgs/trunk/; revision=16631
2009-08-09 22:47:18 +00:00
Michael Raskin e752ff5332 Try updating CLisp after libsigsegv update
svn path=/nixpkgs/trunk/; revision=16628
2009-08-09 22:41:29 +00:00
Michael Raskin 25b3fe32ad Adding myself as a maintainer of some of the packages
svn path=/nixpkgs/trunk/; revision=16572
2009-08-04 07:49:16 +00:00
Pjotr Prins cebbdff56c Updated ruby interpreter
svn path=/nixpkgs/trunk/; revision=16556
2009-08-03 11:53:58 +00:00
Lluís Batlle i Rossell d4aedd92cc I revert my changes to get nixpkgs working on armv5tel-linux.
I thought I didn't change stdenv, but I did. This will go soon into the stdenv
branch then.
Reverse-merging r16467 through r16465.


svn path=/nixpkgs/trunk/; revision=16468
2009-07-26 22:47:33 +00:00
Lluís Batlle i Rossell 4f5e00f686 Fixing perl so it builds well with stdenvNative in my arm-linux debian.
svn path=/nixpkgs/trunk/; revision=16467
2009-07-26 21:48:17 +00:00
Rob Vermaas 685bb27c64 remove -Wno-long-double flag for python on darwin
svn path=/nixpkgs/trunk/; revision=16456
2009-07-24 14:51:04 +00:00
Marc Weber 92662d3d0f fix sup & enhance ruby import
sup,gem:
  * no longer requires /homeless-shelter to be built
  * sup, gem can be run immediately without exporting GEM_HOME

ruby-support:
  * using mirror server of rubyforge
  * [..] is added at the end of long truncated long descriptions

svn path=/nixpkgs/trunk/; revision=16408
2009-07-16 20:00:02 +00:00
Michael Raskin 7d2931b5ab Adding Falcon multiparadigm programming language. It has macros and non-trivial syntax at once, which seems interesting in itself..
svn path=/nixpkgs/trunk/; revision=16299
2009-07-09 22:30:19 +00:00
Marc Weber 2d99612b73 update python 2.4. It's only used by zope and even plone (beeing based
on zope) runs with this python version so it should be fine (?)

svn path=/nixpkgs/trunk/; revision=16293
2009-07-09 22:23:54 +00:00
Marc Weber 6ec3225722 fix pygtk in pyhtonNew
svn path=/nixpkgs/trunk/; revision=16261
2009-07-09 03:50:22 +00:00
Ludovic Courtès 8e0c39c285 GNU Guile 1.8.7.
svn path=/nixpkgs/trunk/; revision=16181
2009-07-05 21:41:36 +00:00
Eelco Dolstra 222ab9d494 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=16160
2009-07-03 11:55:17 +00:00
Peter Simons c713cfa0be Maude needs libgmpxx.
svn path=/nixpkgs/trunk/; revision=16159
2009-07-03 11:31:33 +00:00
Marc Weber 108052a4e9 really fix the name conflicts by patching the patch which generates the code
svn path=/nixpkgs/trunk/; revision=16123
2009-06-30 21:45:17 +00:00
Ludovic Courtès 1b9dbe740b Avoid collision between Ruby-GetText and GNU Gettext.
svn path=/nixpkgs/trunk/; revision=16120
2009-06-30 21:05:13 +00:00
Marc Weber d1e39e78f9 adding rubygems support to nix - implemented target libraries/apps: sup mail client
svn path=/nixpkgs/trunk/; revision=16100
2009-06-30 14:29:20 +00:00
Marc Weber 8661c406f2 ruby / gems update
svn path=/nixpkgs/trunk/; revision=16099
2009-06-30 14:29:17 +00:00
Eelco Dolstra cdf4cf5c23 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=16094
2009-06-30 11:42:15 +00:00
Marc Weber 3fa07803c6 adding jruby-1.1.6 cause the one shipping with netbeans can't get uid.
svn path=/nixpkgs/trunk/; revision=16060
2009-06-26 16:52:58 +00:00
Marc Weber ffb53a0e6f adding sqlalchemy which is a nice orm mapper for python
svn path=/nixpkgs/trunk/; revision=16059
2009-06-26 16:52:54 +00:00
Marc Weber 959342d209 PHP enable SOAP and openssl support
svn path=/nixpkgs/trunk/; revision=15953
2009-06-14 01:30:04 +00:00
Rob Vermaas 342d9834bf * -msse2 flag for python on i686-darwin
svn path=/nixpkgs/trunk/; revision=15914
2009-06-10 09:18:51 +00:00
Michael Raskin 526f6f63c7 Updating CLisp and adding SBCL. SBCL currently has to be symlinked to a writable directory (I am investigating a fix). CLisp 2.47 is somewhat incompatible with lots of software, so I added 2.44.1 as preserved version
svn path=/nixpkgs/trunk/; revision=15806
2009-05-31 06:07:25 +00:00
Marc Weber 3157bb1098 removed all __primops from nixpkgs
svn path=/nixpkgs/trunk/; revision=15693
2009-05-24 10:57:46 +00:00
Marc Weber f7f938a1d1 big breaking change: renaming lib.getAttr to lib.attrByPath
getAttr was ambiguous. It's also a builtin function

fix

svn path=/nixpkgs/trunk/; revision=15692
2009-05-24 10:57:41 +00:00
Marc Weber 2774979bf7 missing patch
svn path=/nixpkgs/trunk/; revision=15688
2009-05-23 13:15:07 +00:00
Marc Weber 3c25ec6a3a adding soappy
svn path=/nixpkgs/trunk/; revision=15687
2009-05-23 13:04:41 +00:00
Marc Weber 8d3c1ea9e2 adding pyxml
svn path=/nixpkgs/trunk/; revision=15684
2009-05-21 17:39:13 +00:00
Marc Weber 52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
2009-05-19 23:25:58 +00:00
Eelco Dolstra f786614e7e * PHP: build with an external, dynamically linked sqlite. Otherwise
PHP builds an internal copy of sqlite, and we get into trouble when
  other Apache modules use a dynamically linked sqlite.  For instance,
  Subversion 1.6 barfs with "(20014)Internal error: SQLite compiled for
  3.6.12, but running with 3.3.7".

svn path=/nixpkgs/trunk/; revision=15587
2009-05-13 10:43:34 +00:00
Michael Raskin 50d7f81d1d Io source update
svn path=/nixpkgs/trunk/; revision=15537
2009-05-10 19:42:43 +00:00
Marc Weber 13080750d4 only use -O1 for php. Using -O2 causes some annoying segfaults. See comment
svn path=/nixpkgs/trunk/; revision=15482
2009-05-07 05:45:40 +00:00
Eelco Dolstra 5f70884dd3 * Slight purity improvement.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15471
2009-05-06 14:03:26 +00:00
Michael Raskin 67066d1c56 Update erlang
svn path=/nixpkgs/trunk/; revision=15452
2009-05-05 15:46:03 +00:00
Lluís Batlle i Rossell ef25944cdb Updating tcl/tk
svn path=/nixpkgs/trunk/; revision=15434
2009-05-03 14:35:56 +00:00
Armijn Hemel 7445bc765c update python to 2.5.4
update scummvm to 0.13.1

svn path=/nixpkgs/trunk/; revision=15414
2009-04-30 14:01:25 +00:00
Eelco Dolstra 210ba6316e * Urgh. Some files that had been deleted in the trunk came back
through the stdenv-updates merge (probably because they had been
  modified in the branch).

svn path=/nixpkgs/trunk/; revision=15403
2009-04-29 16:19:57 +00:00
Marc Weber 761e653515 reenable curl support for php
-lssl was missing

svn path=/nixpkgs/trunk/; revision=15327
2009-04-27 01:18:03 +00:00
Eelco Dolstra 7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Eelco Dolstra 686ed295da * Disable curl support in PHP - it breaks for some reason.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15263
2009-04-23 09:56:15 +00:00
Eelco Dolstra 7e4dcb6c2b * Urgh. Perl is built during the stdenv bootstrap, where we don't
have libpthread.  So don't build with thread support there.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15253
2009-04-22 17:44:44 +00:00
Eelco Dolstra a98d8aee74 * Install Perl modules in $out/lib/perl5. This is what Perl wants by
default, but it didn't happen in Nixpkgs because the string "perl"
  appeared in the prefix, and in that case Perl uses $out/lib.
* Enable thread-safe Perl while we're at it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15252
2009-04-22 17:37:21 +00:00
Eelco Dolstra 94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Eelco Dolstra ff057f0d07 * Build libperl.so.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15233
2009-04-21 22:38:52 +00:00
Lluís Batlle i Rossell a6e86e241f Updating lua5.
svn path=/nixpkgs/trunk/; revision=15223
2009-04-21 19:47:20 +00:00
Eelco Dolstra fd473913f5 * Removed some obsolete nullglobs.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15140
2009-04-19 08:55:27 +00:00
Eelco Dolstra 6b9ccbaf78 * setup.sh: turn on nullglob globally.
* setup.sh: removed some obsolete features, specifically some that
  were only used by the old build farm.
* addToSearchPath: removed some parameters that weren't used
  anywhere.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15136
2009-04-18 22:22:51 +00:00
Eelco Dolstra 79cb8d11a6 * editline: renamed to libedit (which seems to be the proper name for
the package).
* Removed the old ghc-wrapper, which hasn't been used for a long time.
* Renamed the "boot" GHC to "binary", which is more descriptive.
  (They *can* be used for other things than bootstrapping a GHC
  source build.)
* Updated the GHC 6.10.1 binary to 6.10.2.

svn path=/nixpkgs/trunk/; revision=15095
2009-04-16 19:25:22 +00:00
Eelco Dolstra eeed10ba8e * g77 -> gfortran throughout. Got rid of the separate
expressions/builders for Fortran.  Tested by building Octave with
  gfortran 4.3.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14978
2009-04-09 15:24:33 +00:00
Eelco Dolstra 2eb05cf933 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
2009-04-09 12:19:57 +00:00
Eelco Dolstra b22899a7cb * Fix some evaluation errors.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14960
2009-04-09 09:48:14 +00:00
Lluís Batlle i Rossell 9f2a2a6a84 Adding qhull, and updating octaves.
svn path=/nixpkgs/trunk/; revision=14955
2009-04-08 20:06:03 +00:00
Eelco Dolstra 3593b97d63 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
2009-03-16 12:45:27 +00:00
Eelco Dolstra 46f7027688 * Reverted r14547, r14526 -> these belong in the stdenv-branch.
svn path=/nixpkgs/trunk/; revision=14549
2009-03-16 10:00:26 +00:00
Lluís Batlle i Rossell de8bbafb53 Adding -fPIC code for static library code in perl and vxl, for x86_64.
svn path=/nixpkgs/trunk/; revision=14526
2009-03-13 16:46:10 +00:00
Marc Weber b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
2009-03-06 23:21:28 +00:00
Marc Weber 51289a41b0 adjust packages to overridableDelayableArgs
svn path=/nixpkgs/trunk/; revision=14427
2009-03-06 23:21:24 +00:00
Marc Weber 307fd7b70f added pexpect and mechanize python libraries
svn path=/nixpkgs/trunk/; revision=14111
2009-02-18 11:50:46 +00:00
Peter Simons 25a9e73924 Updated SHA256 hash for Full Maude 2.4. Unfortunately, the maintainers
have the habit of releasing updates under the exact same file name and
URL.

svn path=/nixpkgs/trunk/; revision=14094
2009-02-17 12:51:04 +00:00
Eelco Dolstra 390695e73f * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14057
2009-02-12 21:16:55 +00:00
Eelco Dolstra 599015e8b0 * Split lib/default.nix into several files, as it had become a big
mess.  Also cleaned up some functions:

  - foldl appeared broken (it recursively called fold).
  - Renamed logicalAND/logicalOR to and/or.
  - Removed listOfListsToAttrs, eqStrings: obsolete.
  - Removed isInList, which does the same thing as elem.
  - stringToCharacters: don't return a "" at the end of the list.
  - Renamed concatList to concat, as concatList (singular) is a
    misnomer: it takes two lists.  Likewise, renamed mergeAttr to
    mergeAttrs.

  misc.nix still contains a lot of stuff that should be refactored and
  moved to other files.

svn path=/nixpkgs/trunk/; revision=14013
2009-02-09 16:51:03 +00:00
Eelco Dolstra 9f3a83f247 svn path=/nixpkgs/branches/stdenv-updates/; revision=13944 2009-02-01 21:30:27 +00:00
Eelco Dolstra c1579d2e78 * stdenv branch: synced with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
2009-01-16 10:59:27 +00:00
Marc Weber e6ab06e3fa python wrapper: install pydoc as well
svn path=/nixpkgs/trunk/; revision=13767
2009-01-14 16:23:17 +00:00
Marc Weber 7807b74774 php: enable gd support (2d graphics) by default
svn path=/nixpkgs/trunk/; revision=13736
2009-01-11 14:31:48 +00:00
Marc Weber 692d493f4e php: enabling mbstring support by default
svn path=/nixpkgs/trunk/; revision=13704
2009-01-04 20:18:20 +00:00
Marc Weber 5638574907 fixes for previous commit
svn path=/nixpkgs/trunk/; revision=13662
2008-12-20 02:15:26 +00:00
Marc Weber e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
2008-12-20 01:20:35 +00:00
Eelco Dolstra e4a8b61eba svn path=/nixpkgs/branches/stdenv-updates/; revision=13604 2008-12-10 10:58:07 +00:00
Eelco Dolstra e31341510d * Merged from the trunk. Let's see how well this works with
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
2008-12-10 09:59:21 +00:00
Ludovic Courtès 37812e79dd GNU Guile 1.8.6.
svn path=/nixpkgs/trunk/; revision=13599
2008-12-08 22:15:47 +00:00
Marc Weber 90b53dcccc bleeding edge octave version (without docs)
svn path=/nixpkgs/trunk/; revision=13561
2008-12-02 22:55:45 +00:00
Marc Weber 896fb49cb0 Hopefully build farm fix
I've forgotten to comment out a name preventing filtering out a half finished derivation.
(The missing glib is passed using fix by the following code)

svn path=/nixpkgs/trunk/; revision=13555
2008-12-02 13:23:31 +00:00
Marc Weber a7e33ec60c updates: istanbul starts without errors. But no window appears.
svn path=/nixpkgs/trunk/; revision=13554
2008-12-02 12:28:45 +00:00
Marc Weber 30794845ee python 25 proposal
svn path=/nixpkgs/trunk/; revision=13547
2008-12-02 12:27:05 +00:00
Michael Raskin d6f1d7acb3 Added Tk support for Python
svn path=/nixpkgs/trunk/; revision=13526
2008-12-01 00:02:25 +00:00
Eelco Dolstra 21c1ee574c * Use exec.
svn path=/nixpkgs/trunk/; revision=13384
2008-11-24 09:59:38 +00:00
Peter Simons c2417256a8 Finalized maude 2.4 release.
- Updated full-maude to 2.4. 
 - Added program wrapper to set ${MAUDE_LIB} correctly.
 - TODO: the documentation is still not quite up-to-date.

svn path=/nixpkgs/trunk/; revision=13303
2008-11-14 22:53:09 +00:00
Eelco Dolstra aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Peter Simons 893757cfd9 Updated maude to 2.4 release.
TODO: The full-maude distribution is missing from the web site. The
expression installs 2.3j until that is fixed. Also, the documentation
that's installed isn't up-to-date yet, it's from version 2.3.

svn path=/nixpkgs/trunk/; revision=13285
2008-11-13 19:35:48 +00:00
Michael Raskin c4e1f47334 More Io fixes - hopefully final for now
svn path=/nixpkgs/trunk/; revision=13259
2008-11-12 11:13:49 +00:00
Michael Raskin d7528deba0 More Io binding dependencies..
svn path=/nixpkgs/trunk/; revision=13246
2008-11-11 13:07:09 +00:00
Michael Raskin add91332e8 Added Io programming language
svn path=/nixpkgs/trunk/; revision=13241
2008-11-11 08:53:47 +00:00
Peter Simons 0eed283de0 maudeUnstable: updated to alpha91d
svn path=/nixpkgs/trunk/; revision=13227
2008-11-07 22:46:03 +00:00
Michael Raskin c5363217ad meta.function -> passthru.function, not killing other contents of passthru
svn path=/nixpkgs/trunk/; revision=13190
2008-11-04 21:24:10 +00:00
Eelco Dolstra 93a49a00f1 * Use xulrunner for chatzilla.
svn path=/nixpkgs/trunk/; revision=13162
2008-10-30 13:13:43 +00:00
Marc Weber ffcfd819f5 added longDescription example usage to ruby-gems
svn path=/nixpkgs/trunk/; revision=13097
2008-10-19 12:59:34 +00:00
Eelco Dolstra f370f61ee9 * f77 -> fortran.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13042
2008-10-10 08:55:15 +00:00
Peter Simons f1328839d4 maudeUnstable: updated full-maude to latest alpha release
svn path=/nixpkgs/trunk/; revision=13017
2008-10-09 10:10:49 +00:00
Peter Simons 884f30e61f maude: update unstable version to 2.4 alpha 91c
svn path=/nixpkgs/trunk/; revision=12920
2008-09-25 21:37:59 +00:00
Peter Simons 656127373d maude: Updated unstable version to 2.4-alpha-91b. All unit tests pass now.
svn path=/nixpkgs/trunk/; revision=12890
2008-09-19 10:06:58 +00:00
Eelco Dolstra 549a4405e3 * xulrunner-wrapper: use Firefox 3 directly (via "firefox -app"),
since it has full support for running XUL applications.  This saves
  a lot of space (you don't need two copies of basically the same
  software).
* Deleted the old xulrunner (1.8.0.4), it didn't compile anyway with
  recent GTK.
* Updated chatzilla to 0.9.83.

svn path=/nixpkgs/trunk/; revision=12794
2008-09-04 09:29:09 +00:00
Marc Weber 8e7577363b enabling php sockets openssl and curl support
svn path=/nixpkgs/trunk/; revision=12777
2008-08-31 06:36:56 +00:00
Pjotr Prins 73d2e4f49d - Some Ruby interpreter bumped version
- Kernel headers 2.6.18 added (XEN virtual images)
- unifdef package added for kernel headers 2.6.18
- Python Zope and 4suite added
- Trying bioconductor packages with R-lang (still failing)
- Bumped gmp version
- Added rq cluster runner - still requires extra gems (installs, but does not run)


svn path=/nixpkgs/trunk/; revision=12766
2008-08-29 13:53:28 +00:00
Michael Raskin 87ff8d6347 Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner.
svn path=/nixpkgs/trunk/; revision=12655
2008-08-19 05:54:09 +00:00
Pjotr Prins 48d8e0779c Fixed Ruby download path, new version 1.8.7-p72
svn path=/nixpkgs/trunk/; revision=12618
2008-08-14 11:47:51 +00:00
Michael Raskin abe260b6c5 Now CLisp builds with full CLX (XShape included)
svn path=/nixpkgs/trunk/; revision=12559
2008-08-08 22:37:37 +00:00
Pjotr Prins 07595b0397 Introduced biolib package
svn path=/nixpkgs/trunk/; revision=12535
2008-08-07 15:01:21 +00:00
Pjotr Prins f222b38f00 Added rightly named package gfortran and updated gcc version for compiling gfortran
r-lang debends on gfortran


svn path=/nixpkgs/trunk/; revision=12529
2008-08-07 08:33:03 +00:00
Pjotr Prins bc6b7a3213 Updated Ruby package to support shared libs and pthreads
svn path=/nixpkgs/trunk/; revision=12466
2008-08-02 22:25:54 +00:00
Peter Simons a16eebd0a6 Cosmetic, no functional change intended.
This patch moves curly braces to the end of the line, i.e.

  foo = { 
    ...
  };

instead of the previously used style:

  foo = 
  { 
    ...
  };

I commit this change hoping that my contributions to this project now conform
to the rules described in maintainers/docs/coding-conventions.txt so that the
self-appointed indention sheriff of the NixOS community can finally get off my
back and rest assured knowing that all i's are dotted and all t's are crossed.

svn path=/nixpkgs/trunk/; revision=12386
2008-07-18 20:11:25 +00:00
Peter Simons 057bd7c1c2 maude: build of unstable beta version because it has less bugs in full-maude
svn path=/nixpkgs/trunk/; revision=12385
2008-07-18 20:11:12 +00:00
Peter Simons b64e42ce35 added maude beta version
svn path=/nixpkgs/trunk/; revision=12384
2008-07-18 20:11:02 +00:00
Michael Raskin ecefcac4d7 Added PLT Scheme
svn path=/nixpkgs/trunk/; revision=12370
2008-07-17 09:57:47 +00:00
Peter Simons 8d7fe32a0e maude, tecla, buddy: new packages
Maude is a high-level specification language. Buddy and libtecla are required
to build Maude.

svn path=/nixpkgs/trunk/; revision=12358
2008-07-15 09:58:30 +00:00
Michael Raskin 65b252a0df Patched Guile to load srfi .so files correctly from its own directory.
svn path=/nixpkgs/trunk/; revision=12120
2008-06-16 14:27:26 +00:00
Eelco Dolstra 4192f35202 * unixODBCDrivers needs sqlite.
svn path=/nixpkgs/trunk/; revision=12072
2008-06-13 09:44:43 +00:00
Eelco Dolstra bb2a310c5c * Cleaned up the PHP expression. Added support for GD. Also
turned on PostgreSQL support by default (maybe I shouldn't,
  since it makes PHP rather dependency-heavy...).

svn path=/nixpkgs/trunk/; revision=12002
2008-06-06 13:03:55 +00:00
Michael Raskin 99c9108757 OpenSSL support for Python
svn path=/nixpkgs/trunk/; revision=11894
2008-05-26 12:27:17 +00:00
Michael Raskin 9d3b0a2cb7 Added bazaar tools (not installed globally, just copied to share, you have to symlink them to your ~/.bazaar/plugins). Also readline support for python.
svn path=/nixpkgs/trunk/; revision=11893
2008-05-26 11:39:08 +00:00
Michael Raskin 642ff45e22 Added codeville - a distributed revision control system with special efforts spent on merging. Heh, efforts into RCS availability seem to have side effects on Python side, too..
svn path=/nixpkgs/trunk/; revision=11891
2008-05-26 07:47:07 +00:00
Ludovic Courtès 7cc1d84272 GNU Guile 1.8.5.
svn path=/nixpkgs/trunk/; revision=11798
2008-05-09 12:12:26 +00:00
Pjotr Prins 4609c9dae9 Support for R-language (statistical)
svn path=/nixpkgs/trunk/; revision=11769
2008-05-07 11:24:28 +00:00
Michael Raskin 26bdb2a619 Added option for SQLite support to Python2.5
svn path=/nixpkgs/trunk/; revision=11754
2008-05-06 07:01:34 +00:00
Michael Raskin c0426f6fe7 Added Ruby Gems. I have no idea how to better use repository-provided dependencies.
svn path=/nixpkgs/trunk/; revision=11557
2008-04-11 09:23:33 +00:00
Michael Raskin 0ef3e9e148 Added zlib and OpenSSL optional support to ruby
svn path=/nixpkgs/trunk/; revision=11556
2008-04-11 09:21:27 +00:00
Ludovic Courtès 144e3b4e9d Guile: Use `share/guile/site' as the standard Guile module location.
svn path=/nixpkgs/trunk/; revision=11507
2008-04-09 08:15:30 +00:00
Ludovic Courtès d0d98958d2 Python 2.5: Add GDBM support.
svn path=/nixpkgs/trunk/; revision=11485
2008-04-08 07:37:49 +00:00
Eelco Dolstra 15a322f887 * php_unstable: caused nix-env to barf on FreeBSD.
svn path=/nixpkgs/trunk/; revision=11464
2008-04-04 18:49:49 +00:00
Marc Weber 0b6e4828cc added php curl support
svn path=/nixpkgs/trunk/; revision=11446
2008-04-01 18:16:01 +00:00
Ludovic Courtès 95f0e6a1a7 Differentiate between longDescription' and description'.
svn path=/nixpkgs/trunk/; revision=11230
2008-03-20 14:35:03 +00:00
Ludovic Courtès 420506d752 Guile: Add various fixes allowing the test suite to run.
svn path=/nixpkgs/trunk/; revision=11196
2008-03-19 08:42:30 +00:00
Eelco Dolstra 26a152653d * Adde xpra. Doesn't quite work yet.
* Removed python_alts.

svn path=/nixpkgs/trunk/; revision=11161
2008-03-17 13:45:50 +00:00
Ludovic Courtès 9433120f1f Guile: Disable `doCheck' for now.
svn path=/nixpkgs/trunk/; revision=11107
2008-03-13 21:04:07 +00:00
Ludovic Courtès c1389c4f36 Guile: Run the test suite.
Warning: This makes `nix-worker' hang at the very end of the process,
once "make install" has completed and all installed files have been
scanned for references.

svn path=/nixpkgs/trunk/; revision=11099
2008-03-13 14:18:29 +00:00
Michael Raskin ae7274413b Changed port in test-suite to avoid OpenFire port conflict during build.
svn path=/nixpkgs/trunk/; revision=11066
2008-03-11 20:58:29 +00:00
Armijn Hemel 1be3f71528 update to 2.5.2
svn path=/nixpkgs/trunk/; revision=10934
2008-03-03 23:15:15 +00:00
Michael Raskin 71f8e0911a Added src to meta for builderDefs-based packages.
svn path=/nixpkgs/trunk/; revision=10913
2008-03-02 18:49:31 +00:00
Eelco Dolstra 1c65ea4e20 * Added expect.
svn path=/nixpkgs/trunk/; revision=10877
2008-02-27 15:48:53 +00:00
Eelco Dolstra 359e488921 * WTF.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10835
2008-02-22 15:18:22 +00:00
Eelco Dolstra 59d88c1772 * Revert r10833, it doesn't really work. Instead build ghcboot
with Perl 5.8.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10834
2008-02-22 14:43:00 +00:00
Eelco Dolstra 5e985bc375 * Perl 5.10.0, while we're at it.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10808
2008-02-21 16:19:09 +00:00
Eelco Dolstra af40c15c30 * Use CPAN mirrors.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10806
2008-02-21 15:52:31 +00:00
Eelco Dolstra e12b421add * Merged most of the stdenv-updates branch. Some stuff didn't
merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
2008-02-20 23:02:41 +00:00
Ludovic Courtès 401543289c GNU Guile 1.8.4.
svn path=/nixpkgs/trunk/; revision=10764
2008-02-20 09:02:00 +00:00
Marc Weber 4122366233 added zlib support to PHP
svn path=/nixpkgs/trunk/; revision=10703
2008-02-15 11:12:56 +00:00
Ludovic Courtès df17eb0dc3 Guile: fix chroot build; make sure guile-snarf' sees gawk'; add a setup hook.
svn path=/nixpkgs/trunk/; revision=10636
2008-02-12 10:41:00 +00:00
Yury G. Kudryashov 07da3cba4c PHP now with postgresql support
svn path=/nixpkgs/branches/stdenv-updates/; revision=10591
2008-02-10 17:39:25 +00:00
Yury G. Kudryashov 156b7f93ef * Updated Apache-related packages.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10589
2008-02-10 17:39:07 +00:00
Armijn Hemel 3ebfd510ba testing expression for perl 5.10, needs more work (different patches)
svn path=/nixpkgs/trunk/; revision=10567
2008-02-10 13:30:12 +00:00
Yury G. Kudryashov dd184fa88d erlang and libsigsegv upgraded
svn path=/nixpkgs/branches/stdenv-updates/; revision=10537
2008-02-07 10:43:05 +00:00
Yury G. Kudryashov 4086ba92fa python: --with-wctype-functions
svn path=/nixpkgs/branches/stdenv-updates/; revision=10519
2008-02-06 19:00:36 +00:00
Marc Weber ef01d05ec9 PHP now with postgresql support
svn path=/nixpkgs/trunk/; revision=10510
2008-02-05 19:58:28 +00:00
Eelco Dolstra cb0c387ce2 * Updated Apache-related packages.
svn path=/nixpkgs/trunk/; revision=10502
2008-02-05 11:41:49 +00:00
Yury G. Kudryashov de6ab6354f Clisp is compilable
svn path=/nixpkgs/trunk/; revision=10363
2008-01-28 19:50:39 +00:00
Yury G. Kudryashov 10a1a685a0 lua-5: url correted
svn path=/nixpkgs/trunk/; revision=10331
2008-01-28 19:38:59 +00:00