Commit graph

114 commits

Author SHA1 Message Date
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
Armijn Hemel
a89ab0583e upgrade to 8.4.13, fixes an error with configure
svn path=/nixpkgs/trunk/; revision=5867
2006-07-22 08:53:14 +00:00
Eelco Dolstra
2bda17d23a * Latest XULRunner and Chatzilla.
svn path=/nixpkgs/trunk/; revision=5773
2006-07-19 14:10:03 +00:00
Rob Vermaas
d05cdd8064 added config flag for postrgres support
svn path=/nixpkgs/trunk/; revision=5668
2006-07-09 15:00:37 +00:00
Armijn Hemel
a5615b51da python 2.5 beta 1
svn path=/nixpkgs/trunk/; revision=5580
2006-07-04 19:20:36 +00:00
Eelco Dolstra
7682bf3d1e * Make it easier to override parts of stdenv (like gcc or make) per
package using the `overrideGCC' and `overrideInStdenv' functions.

svn path=/nixpkgs/trunk/; revision=5505
2006-06-23 20:11:36 +00:00
Eelco Dolstra
3042581b2a * Disable some stuff.
* Use GNU make 3.80 for StrategoXT.
* Updated octave.

svn path=/nixpkgs/trunk/; revision=5502
2006-06-23 14:04:32 +00:00
Eelco Dolstra
c1103ad849 * Spidermonkey doesn't compile with gcc 4.1.1 (ICE), so use 3.4
instead.

svn path=/nixpkgs/trunk/; revision=5495
2006-06-23 11:06:39 +00:00
Eelco Dolstra
450bdbe28a * Latest Python.
svn path=/nixpkgs/trunk/; revision=5483
2006-06-21 15:55:14 +00:00