JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,325 Commits 2 Branches 0 Tags 13 GiB
18fcb0f5f8
Commit Graph

522 Commits

Author SHA1 Message Date
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
Yury G. Kudryashov
767be212b2 clisp: upgraded to 2.43 (both versions do not work on stdenv-updates branch) 
svn path=/nixpkgs/trunk/; revision=10324
 2008-01-28 19:34:55 +00:00
Yury G. Kudryashov
60c1276cfd svn path=/nixpkgs/trunk/; revision=10319 2008-01-28 19:32:21 +00:00
Yury G. Kudryashov
b3cd1e644a Changed version-related syntax in python, gettext and ocaml 
svn path=/nixpkgs/trunk/; revision=10316
 2008-01-28 19:30:57 +00:00
Yury G. Kudryashov
197720f2af Clisp is compilable 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10302
 2008-01-26 12:02:46 +00:00
Yury G. Kudryashov
da57804fff Merged with trunk again 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10267
 2008-01-23 18:11:03 +00:00
Sander van der Burg
d5b4e5606f Added erlang/ejabberd packages 
svn path=/nixpkgs/trunk/; revision=10258
 2008-01-23 10:06:07 +00:00
Michael Raskin
bc46eaf404 Some review of builder-defs and dependent files. No rebuild needed. Now it should be possible to override elements in builderDefs 
svn path=/nixpkgs/trunk/; revision=10214
 2008-01-18 12:36:56 +00:00
Yury G. Kudryashov
453dcda812 lua-5: url correted 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10148
 2008-01-15 01:41:37 +00:00
Yury G. Kudryashov
a7703662a4 Merged with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10145
 2008-01-15 00:55:21 +00:00
Marc Weber
028b0d7ff4 broken comment php_unstable when compiling wihtout xdebug/ xdebug supported 
svn path=/nixpkgs/trunk/; revision=10056
 2008-01-03 10:46:18 +00:00
Armijn Hemel
73391956ad update to 8.4.16 
svn path=/nixpkgs/trunk/; revision=10013
 2007-12-31 19:39:50 +00:00
Yury G. Kudryashov
e19b3d7f79 clisp: upgraded to 2.43 (both versions do not work on stdenv-updates branch) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9913
 2007-12-12 00:20:50 +00:00
Michael Raskin
306ae4b8b4 Bumped Guile version by applying patch by Ludovic Cuort\`es. Added sdparm. 
svn path=/nixpkgs/trunk/; revision=9910
 2007-12-11 20:48:52 +00:00
Yury G. Kudryashov
3896cd4a28 * Get rid of the `(import (__toPath ((toString 
./JustNothing/.. )+"/"+args.version+".nix")))' hack, you can also just
  write `import (./path/to/pkg + "/${version}.nix)'.


svn path=/nixpkgs/branches/stdenv-updates/; revision=9886
 2007-12-08 01:09:00 +00:00
Yury G. Kudryashov
62676e09eb setup-hooks using addToSearchPath 
I've accidentially reverted setup-hooks while merging with trunk. Correcting it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=9821
 2007-12-01 20:05:26 +00:00
Eelco Dolstra
ea52300e0b svn path=/nixpkgs/branches/stdenv-updates/; revision=9803 2007-11-26 16:19:44 +00:00
Eelco Dolstra
c54b75c959 * Get rid of the `(import (__toPath ((toString 
./JustNothing/.. )+"/"+args.version+".nix")))' hack, you can also just
  write `import (./path/to/pkg + "/${version}.nix)'.

svn path=/nixpkgs/trunk/; revision=9792
 2007-11-26 13:24:56 +00:00
Yury G. Kudryashov
85ebf00cab Changed version-related syntax in python, gettext and ocaml 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9743
 2007-11-17 15:19:03 +00:00
Yury G. Kudryashov
8792fb81c7 Merged with trunk. 
The following is autogenerated by git:

commit 9aaede75e73be646f35069d0717c8c70004ba3f0
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 18:37:23 2007 +0000

    This was needed for me to get a working gnome-doc-utils package

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:30:34 2007 +0000

    gdb upgraded

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit bb908853924046681d1cd6a85b05273aed14fd9f
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:29:11 2007 +0000

    gphoto2 upgraded to 2.4.0: all-packages.nix

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 619c7004d7140d6016927cd1114fd778aca3ecce
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:28:53 2007 +0000

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit f09310ed8403428021d2d751e273fc0add438032
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:28:17 2007 +0000

    gphoto2 upgraded to 2.4.0

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 26d5cc1628e51853fdb9a7d162361b3a13581461
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:27:27 2007 +0000

    missing catalog added. Now you can open files

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:09:32 2007 +0000

    nix expression creating startup wrapper for jedit

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 69701148e45d29b1712c9f14628459def54be076
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:06:53 2007 +0000

    The nice programmers editor jedit is now built on nix as well.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 15ecdd411e78b952d8004323ec871ce6c4969c2e
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:41:15 2007 +0000

    Missing gecko now.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 6975eb6f2a972cca2adb2943190a41880e3bedf7
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:36:15 2007 +0000

    Fix path of libnotify

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:34:02 2007 +0000

    added libnotify

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 7fb35510feb89fecc9d92810a723baead232dff4
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:33:36 2007 +0000

    added libnotify

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 7a9eb1e172ef5b111556d78a30003a87aee7f775
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:24:24 2007 +0000

    libnotify is missing

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 433cc0578ce00860ddfac7d7934818ec0584f6e1
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:08:04 2007 +0000

    Added libsexy

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 194a84b18965e9a3c8f9fa1305fac57690e683cb
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:07:30 2007 +0000

    Added libsexy

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 1d832560cf94bfa6793d90ff43f2235415bc3958
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 13:49:02 2007 +0000

    Added openftd. Doesnt work (yet)

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 13:08:20 2007 +0000

    * GCC 3.4: pass --disable-multilib to make it build on x86_64.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 03:45:42 2007 +0000

    bzip2 dependency added in a couple of places

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 128ac8a7ee8668fc933f4933a66f491c44234379
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 23:47:03 2007 +0000

    Added python to libgsf dependencies

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 1847defee6331b03ba8a54ae9e3e68033310f7a2
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 17:05:45 2007 +0000

    * Use latest Nix.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit cb1992780c20cb5885cf4d3932e7352f8b912533
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 04:23:46 2007 +0000

    Added a currently more functional URL for libgcrypt

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 9d099dbef1a5721065bff5f2edd73844c829f538
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 00:16:03 2007 +0000

    facile: fixed a typo

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 031c5b7d0797f5eee7be0a06856530c29adee710
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 00:11:56 2007 +0000

    Added kde-4

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 00:08:58 2007 +0000

    Added new kde-4 staff

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 18edb608ee7822438d4b2dc2a76af7567efd646a
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:48:40 2007 +0000

    kde-4: removed old staff from kde-4 dir

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:46:48 2007 +0000

    lame: upgrade to 3.97

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 52f8f699f29b6def41eee392f489c7e8ecd9399d
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:44:21 2007 +0000

    libgsf: meta written

    0.14.7 in my previous commit was a typo: 1.14.7 of course

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:40:39 2007 +0000

    libgsf: upgraded to 0.14.7

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 7787b342945cb13856168a353fdc9b0062e5f32b
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:37:51 2007 +0000

    clucene: upgrade, kde4: remove

    clucene-core upgraded to 0.9.20
    clucene-contrib removed (can't find any version later than 0.9.16a and don't
    know whether it's compatible with new clucene-core)
    kde4: old staff removed, will add new tonight

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit b4900dece179788dfb8879518b8ec639ba089980
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:25:32 2007 +0000

    Strigi removed

    I'll add a version from kdesupport trunk today

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ffad224993440be069d4f15cf5e73ed018979311
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:23:36 2007 +0000

    dbus-glib upgraded to 0.74, meta written

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:13:29 2007 +0000

    xine-lib: upgraded to 1.1.8

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:11:37 2007 +0000

    chmlib: upgraded to 0.39

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:05:11 2007 +0000

    Added facile library

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:03:29 2007 +0000

    libgcrypt-1.3.1

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ca314a236b855b73024677f6dc5bc021070c4e72
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 22:49:24 2007 +0000

    Fixed a typo in ocaml-3.10.0

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit b3fa79d09289ab61a30f63692e7c475d0aec142e
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 22:39:58 2007 +0000

    ocaml: Added 3.10.0, using getVersion staff

    I've added the latest (3.10.0) version of ocaml and let the user choose default
    version.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 853d65d8a9fd65f7bf918c42342baf6690008f54
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 22:22:06 2007 +0000

    Let user to choose python2.4 or python2.5

    Currently, there is some code duplication. I'll try to rewrite it without
    modifying resulting derivations.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 21:57:26 2007 +0000

    useVersion function added

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 21:41:01 2007 +0000

    git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit dd564f36bd54d4900aefa759bc94cfac7496d1a2
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 19:07:38 2007 +0000

    added small script fixing the shebang (#!/bin/...) path.
    It searches the PATH env variable for the same executable.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 2f9213e49fbaa40634ccb9699e44aec239212aea
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 01:20:17 2007 +0000

    Now SVN Nix builds as a purely alternative Nix choice

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 016b6bfcc67244964251d68d86e1fa6de2062e54
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Tue Nov 13 15:52:16 2007 +0000

    Added possibility to use non-default Nix.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 89f53d7b8dae8d4ec537322340be212602524102
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Tue Nov 13 01:26:54 2007 +0000

    implemented proposal by niksnut.
    Now you have to use either date= or tag= when specifying cvs revision

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 16:45:47 2007 +0000

    * Symlink $out/bin to $out/libexec.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit d454ab8861882e18ed3b79287727890ec6668455
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 16:42:13 2007 +0000

    Beta-version of builderDefs fixes.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 959e395c49753d902201d457cee102b40608d3f9
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 16:12:50 2007 +0000

    djview location corrected

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 52530f607a15017e94225ee50e2698963325ed80
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 13:51:46 2007 +0000

    * Revert the setup hook changes on the trunk (but they remain on the
      stdenv-updates branch).

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 977bdfec49557f48bc1e121e3375c21d4991434f
Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 13:48:33 2007 +0000

    * added Haskell package gtk2hs

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
 2007-11-16 21:05:15 +00:00
Eelco Dolstra
71353ce929 * Perl: make it build with GCC 4.2. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9693
 2007-11-15 16:15:15 +00:00
Yury G. Kudryashov
732597e430 Let user to choose python2.4 or python2.5 
Currently, there is some code duplication. I'll try to rewrite it without
modifying resulting derivations.

svn path=/nixpkgs/trunk/; revision=9670
 2007-11-14 22:22:06 +00:00
Eelco Dolstra
7a424b47f6 * Revert the setup hook changes on the trunk (but they remain on the 
stdenv-updates branch).

svn path=/nixpkgs/trunk/; revision=9652
 2007-11-12 13:51:46 +00:00
Yury G. Kudryashov
16b44ea14d Some setup-hooks with new syntax; pkgconfig upgraded to 0.22 
svn path=/nixpkgs/trunk/; revision=9645
 2007-11-11 20:32:43 +00:00
Yury G. Kudryashov
bfe435ebaf guile: propagate build inputs 
svn path=/nixpkgs/trunk/; revision=9644
 2007-11-11 20:23:54 +00:00
Yury G. Kudryashov
3f8387bd62 Added Makefile.extra to spidermonkey 
svn path=/nixpkgs/trunk/; revision=9641
 2007-11-11 16:46:15 +00:00
Yury G. Kudryashov
b4c26d6ed9 Spidermonkey upgrade to 1.7 
Nix-expression mostly rewritten
May be needed for previously commited elinks update

svn path=/nixpkgs/trunk/; revision=9634
 2007-11-11 16:12:33 +00:00
Michael Raskin
a8db1746a5 Fixed log nesting; added Qi. 
svn path=/nixpkgs/trunk/; revision=9601
 2007-11-08 14:34:54 +00:00
Marc Weber
742ae36bf1 svn path=/nixpkgs/trunk/; revision=9598 2007-11-06 13:47:00 +00:00
Marc Weber
c7cf206bdd PHP with some configuration flags serving as example. Perhaps you can to extend it more easily if you need to 
svn path=/nixpkgs/trunk/; revision=9588
 2007-11-05 21:13:16 +00:00
Michael Raskin
7b1c9a7a82 Added Compiz Fusion (main plugins). Also some dependencies, and made wmii build under setup-new-2.sh also. 
svn path=/nixpkgs/trunk/; revision=9577
 2007-11-05 08:32:20 +00:00
Wouter den Breejen
78746b036b PHP can take mysql as a arugment 
svn path=/nixpkgs/trunk/; revision=9558
 2007-10-30 16:04:45 +00:00
Michael Raskin
2d9f1f42b6 Now Guile works 
svn path=/nixpkgs/trunk/; revision=9394
 2007-10-02 20:48:39 +00:00
Eelco Dolstra
7588231bca * Purity problem: try to prevent php from looking for expat. 
svn path=/nixpkgs/trunk/; revision=9298
 2007-09-11 12:55:09 +00:00
Eelco Dolstra
8f4d8573c0 * Fix a bunch of URLs. 
svn path=/nixpkgs/trunk/; revision=9292
 2007-09-11 10:15:07 +00:00
Eelco Dolstra
544cb9cb83 * Rewrite all URLs to GNU mirrors to mirror://gnu/. 
svn path=/nixpkgs/trunk/; revision=9201
 2007-08-27 13:42:00 +00:00
Eelco Dolstra
607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/. 
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
 2007-08-27 13:01:33 +00:00
Eelco Dolstra
a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl 
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
 2007-08-24 12:32:36 +00:00
Michael Raskin
4d137ad014 Added xmacro; updated clisp - well, it compiles now... 
svn path=/nixpkgs/trunk/; revision=9098
 2007-08-10 18:54:44 +00:00
Armijn Hemel
f87c4ec7f4 add Python 2.5.1 
svn path=/nixpkgs/trunk/; revision=9077
 2007-08-09 00:35:23 +00:00
Yury G. Kudryashov
2d0d0e8fbf * zsh upgraded to 4.3.2, lua upgraded to 5.1.2 (works only on linux now) 
svn path=/nixpkgs/trunk/; revision=8990
 2007-07-17 16:43:06 +00:00
Eelco Dolstra
a08bb7f48c * Latest Ruby. 
svn path=/nixpkgs/trunk/; revision=8887
 2007-06-18 10:23:09 +00:00
Eelco Dolstra
1dcd8601bf * Proper test for the libc attribute. 
svn path=/nixpkgs/trunk/; revision=8782
 2007-05-27 15:00:30 +00:00
Eelco Dolstra
c5e1ae5eaf * Purity fix in building Python: don't let it search in /usr/include 
and /usr/lib to determine what optional modules (like bzip2, zlib,
  dl, etc.) to build.  Unfortunately there doesn't seem to be a way to
  tell the Python build process to look anywhere else, so I had to
  patch setup.py.

svn path=/nixpkgs/trunk/; revision=8780
 2007-05-27 14:34:01 +00:00
Eelco Dolstra
a6cf6c23f3 * Perl updated to 5.8.8 (NIXPKGS-56). 
* Fix a potential security problem in Cwd in taint mode.

svn path=/nixpkgs/trunk/; revision=8751
 2007-05-24 14:41:18 +00:00
Martin Bravenboer
6892b99bf6 Update of jdk and jre to jdk-distros, based on Distributor License for Java. 
D    pkgs/development/interpreters/jre

Obsolete. jdk and jre are now build by the same expression.

D    pkgs/development/compilers/blackdown

Obsolete. jdk is now downloadable.

D    pkgs/development/compilers/jdk/jdk5-sun-linux.nix

Obsolete

A    pkgs/development/compilers/jdk/dlj-bundle-builder.sh

Build for DLJ bundles.

M    pkgs/top-level/all-packages.nix

Dropped blackdown and ant based on blackdown.

A    pkgs/development/compilers/jdk/jdk6-construct.sh

Copy of DLJ construct script to fix problem with jdk6 bundles.

A    pkgs/development/compilers/jdk/jdk6-linux.nix

New main Nix expression for jdk and jre. Supports mozillaPlugin.

A    pkgs/development/compilers/jdk/dlj-bundle-builder.sh

Include path to libjli in rpath.


svn path=/nixpkgs/trunk/; revision=8186
 2007-03-05 17:13:53 +00:00
Eelco Dolstra
e17d20b6d2 * Purify the JRE. 
svn path=/nixpkgs/trunk/; revision=7936
 2007-02-20 17:04:37 +00:00
Eelco Dolstra
e67a0ca213 * Let JRE provide its Mozilla plugin. 
svn path=/nixpkgs/trunk/; revision=7746
 2007-01-22 15:17:13 +00:00
Eelco Dolstra
f861c8b66c * makeFlags -> buildFlags in a few places. 
svn path=/nixpkgs/trunk/; revision=7503
 2006-12-27 18:34:35 +00:00
Eelco Dolstra
b83fc581e2 * PHP 5.2.0. 
svn path=/nixpkgs/trunk/; revision=7349
 2006-12-15 21:18:27 +00:00
Eelco Dolstra
15c96da276 * Python 2.4.4. 
* Added a setup hook for Python that adds Python packages in
  buildInputs to $PYTHONPATH.

svn path=/nixpkgs/trunk/; revision=7338
 2006-12-13 18:03:08 +00:00
Eelco Dolstra
b90781ec21 * Renamed orig-glibc -> orig-libc in some places, and in others, use 
the new $NIX_GCC/nix-support/dynamic-linker file to locate the
  dynamic linker directly (don't hardcode ld-linux.so.2).

svn path=/nixpkgs/trunk/; revision=6873
 2006-10-27 12:43:32 +00:00
Armijn Hemel
115a99e6f4 orig-glibc -> orig-libc 
svn path=/nixpkgs/trunk/; revision=6854
 2006-10-26 10:13:59 +00:00
Eelco Dolstra
76405f2b7f * `drv + /path' is deprecated, so don't do that anymore. 
svn path=/nixpkgs/trunk/; revision=6754
 2006-10-17 14:06:18 +00:00
Eelco Dolstra
8e08738756 * More URLs. 
svn path=/nixpkgs/trunk/; revision=6718
 2006-10-12 15:58:51 +00:00
Eelco Dolstra
ef9b025dbe * Remove a bunch of unused Nix expressions. 
svn path=/nixpkgs/trunk/; revision=6716
 2006-10-12 15:43:01 +00:00
Eelco Dolstra
5782390a5d * Fix some URLs. 
svn path=/nixpkgs/trunk/; revision=6714
 2006-10-12 15:09:27 +00:00
Eelco Dolstra
ad897a7c96 * Update more URLs. 
svn path=/nixpkgs/trunk/; revision=6713
 2006-10-12 14:53:45 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=6711
 2006-10-12 13:50:54 +00:00
Eelco Dolstra
6006d61835 * Added a bunch of descriptions. 
svn path=/nixpkgs/trunk/; revision=6705
 2006-10-11 16:45:55 +00:00
Eelco Dolstra
bf1e734f85 * Don't use the subpath operator (~) anymore, it's subsumed by normal 
concatenation (+).

svn path=/nixpkgs/trunk/; revision=6080
 2006-08-09 15:05:30 +00:00
Armijn Hemel
3563604395 tk needs the private tcl headers to be installed 
svn path=/nixpkgs/trunk/; revision=5869
 2006-07-22 09:57:01 +00:00
Armijn Hemel
87ae734392 create symlink from $out/bin/tclsh to $out/bin/tclsh${version} 
svn path=/nixpkgs/trunk/; revision=5868
 2006-07-22 09:11:05 +00:00