mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 17:41:12 +00:00
Code Issues Wiki Activity
71696 commits 267 branches 125 tags 5.3 GiB
Commit graph

7369 commits

Author SHA1 Message Date
Eelco Dolstra c37304db96 * Oops, the bootstrap tools contained an impure gzip/gunzip. 
* To prevent this kind of thing, check that all tools are statically
  linked.
* Use findutils 4.2.27, 4.2.28 doesn't build with dietlibc.

svn path=/nixpkgs/trunk/; revision=6881
 2006-10-27 22:50:58 +00:00
Eelco Dolstra de25bee83d * Of course, the latest GNU tar has the same gnulib header file shit 
as coreutils.

svn path=/nixpkgs/trunk/; revision=6880
 2006-10-27 20:14:19 +00:00
Eelco Dolstra 3ea7d9d272 * Fix static linking in gcc. 
* Use the coreutils in dietlibc.
* Add objdump to the binutils static tarball.

svn path=/nixpkgs/trunk/; revision=6879
 2006-10-27 20:08:53 +00:00
Eelco Dolstra 0f7883d12f * Revive the old coreutils, since coreutils 6 is broken beyond repair 
with dietlibc (it does some incredibly nasty hackery with the system
  header files...).

svn path=/nixpkgs/trunk/; revision=6878
 2006-10-27 19:53:23 +00:00
Eelco Dolstra 2efe6dc281 * Tsk. 
svn path=/nixpkgs/trunk/; revision=6865
 2006-10-26 22:30:48 +00:00
Eelco Dolstra 0b7e256162 * Hook variables in the generic builder are now executed using eval. 
This has a major advantage: you can write hooks directly in Nix
  expressions.  For instance, rather than write a builder like this:

    source $stdenv/setup

    postInstall=postInstall
    postInstall() {
        ln -sf gzip $out/bin/gunzip
        ln -sf gzip $out/bin/zcat
    }

    genericBuild

  (the gzip builder), you can just add this attribute to the
  derivation:

    postInstall = "ln -sf gzip $out/bin/gunzip; ln -sf gzip $out/bin/zcat";

  and so a separate build script becomes unnecessary.  This should
  allow us to get rid of most builders in Nixpkgs.

* Allow configure and make arguments to contain whitespace.
  Previously, you could say, for instance

    configureFlags="CFLAGS=-O0"

  but not

    configureFlags="CFLAGS=-O0 -g"

  since the `-g' would be interpreted as a separate argument to
  configure.  Now you can say

    configureFlagsArray=("CFLAGS=-O0 -g")

  or similarly

    configureFlagsArray=("CFLAGS=-O0 -g" "LDFLAGS=-L/foo -L/bar")

  which does the right thing.  Idem for makeFlags, installFlags,
  checkFlags and distFlags.

  Unfortunately you can't pass arrays to Bash through the environment,
  so you can't put the array above in a Nix expression, e.g.,

    configureFlagsArray = ["CFLAGS=-O0 -g"];

  since it would just be flattened to a since string.  However, you
  can use the inline hooks described above:

    preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")";


svn path=/nixpkgs/trunk/; revision=6863
 2006-10-26 22:20:25 +00:00
Eelco Dolstra 45bf677dcc * Doh. 
svn path=/nixpkgs/trunk/; revision=6859
 2006-10-26 19:00:46 +00:00
Eelco Dolstra 29f9225a9d * Symlink gunzip, zcat. 
svn path=/nixpkgs/trunk/; revision=6857
 2006-10-26 14:35:57 +00:00
Eelco Dolstra 7d5de08c1c * More simplification. 
svn path=/nixpkgs/trunk/; revision=6838
 2006-10-24 23:07:37 +00:00
Eelco Dolstra 66fb5088c5 * Doh. 
svn path=/nixpkgs/trunk/; revision=6837
 2006-10-24 23:05:53 +00:00
Eelco Dolstra 4d3059721d * bash 2.0, findutils 4.2.28. 
* Some Nix expression simplifications.  Sense and simplicity!

svn path=/nixpkgs/trunk/; revision=6836
 2006-10-24 23:05:12 +00:00
Eelco Dolstra f86c11815f * Use coreutils 6.4; the dietlibc patch has been merged. 
svn path=/nixpkgs/trunk/; revision=6835
 2006-10-24 22:49:08 +00:00
Eelco Dolstra de70885cfc * No longer needed. 
svn path=/nixpkgs/trunk/; revision=6834
 2006-10-24 22:41:38 +00:00
Eelco Dolstra 97a65f81b2 * Unify the bzip2 builders. 
svn path=/nixpkgs/trunk/; revision=6833
 2006-10-24 22:40:33 +00:00
Eelco Dolstra 5f4f8766cf * GNU tar 1.16. 
svn path=/nixpkgs/trunk/; revision=6822
 2006-10-24 17:24:46 +00:00
Eelco Dolstra 3d2e573eff * GNU sed 4.1.5 compiled with dietlibc gives "Memory exhausted" errors 
on trivial patterns, so use an older sed instead (4.1.2).  See
  http://linuxfromscratch.org/pipermail/hlfs-dev/2005-September/002447.html.

svn path=/nixpkgs/trunk/; revision=6792
 2006-10-20 20:05:26 +00:00
Eelco Dolstra 65bbb45ab7 * Add findutils to the bootstrap tools. 
svn path=/nixpkgs/trunk/; revision=6791
 2006-10-20 16:01:38 +00:00
Eelco Dolstra 884e8571c3 * Add grep. 
svn path=/nixpkgs/trunk/; revision=6783
 2006-10-19 22:47:51 +00:00
Eelco Dolstra 1acd2157cc * Add patch, sed. 
svn path=/nixpkgs/trunk/; revision=6782
 2006-10-19 22:31:08 +00:00
Eelco Dolstra c6ecc900cf * Add more stuff to the bootstrap builder. 
* Remove some redundant *Diet values in all-packages.nix.

svn path=/nixpkgs/trunk/; revision=6780
 2006-10-19 21:36:51 +00:00
Eelco Dolstra ce22859f8a * Bash on dietlibc. 
* Pass -D_BSD_SOURCE=1 by default in the dietlibc stdenv.

svn path=/nixpkgs/trunk/; revision=6768
 2006-10-18 16:16:07 +00:00
Eelco Dolstra f3619824a9 * bzip2 with dietlibc. 
svn path=/nixpkgs/trunk/; revision=6767
 2006-10-18 15:49:47 +00:00
Eelco Dolstra efc2b12da5 * A better patch. 
svn path=/nixpkgs/trunk/; revision=6766
 2006-10-18 15:26:48 +00:00
Eelco Dolstra 6ff020ad3a * Build coreutils on dietlibc. 
svn path=/nixpkgs/trunk/; revision=6765
 2006-10-18 15:16:53 +00:00
Eelco Dolstra 501ceef268 * A function `useDietLibC' that returns a modified stdenv that uses 
dietlibc to produce small, statically linked binaries.  This stdenv
  also passes `-Os' to GCC automatically to optimise for size.  It
  also tries to prevent builders from linking against dynamic
  libraries (which dietlibc doesn't support).

* A function `addAttrsToDerivation' that returns a modified stdenv
  that always adds the specified attributes to the derivations that it
  produces.  Example (from curl):

    curlDiet =  import ../tools/networking/curl {
      inherit fetchurl zlib;
      stdenv = addAttrsToDerivation {
        CFLAGS = "-DHAVE_INET_NTOA_R_2_ARGS=1";
      } (useDietLibC stdenv);
    };

  (This is needed to get curl to build with dietlibc.  Also note the
  stacking of stdenv-modifying functions.)

* curl-diet: no longer necessary.

svn path=/nixpkgs/trunk/; revision=6761
 2006-10-18 12:50:04 +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 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 67c581cdcc * Updated Pango, Cairo, Zip. 
svn path=/nixpkgs/trunk/; revision=6697
 2006-10-11 13:19:36 +00:00
Armijn Hemel 0ec7b4988f add coreutils-6.3, not the default, wait until more stdenv packages need updating 
svn path=/nixpkgs/trunk/; revision=6646
 2006-10-02 21:43:27 +00:00
Armijn Hemel 193edaab22 7.15.4 -> 7.15.5 
svn path=/nixpkgs/trunk/; revision=6243
 2006-08-25 21:01:42 +00:00
Armijn Hemel 3402fe7c80 new curl 
svn path=/nixpkgs/trunk/; revision=6241
 2006-08-25 20:38:30 +00:00
Armijn Hemel 3580697f20 add ploticus, yet another graphics program 
svn path=/nixpkgs/trunk/; revision=6214
 2006-08-23 16:09:03 +00:00
Eelco Dolstra bb53e3df6d * gnupg: use readline. 
svn path=/nixpkgs/trunk/; revision=6198
 2006-08-21 10:38:02 +00:00
Eelco Dolstra 0412dcc14c * Latest GnuPG. 
svn path=/nixpkgs/trunk/; revision=6177
 2006-08-18 09:31:45 +00:00
Eelco Dolstra 3fd8841922 * GNU Netcat. 
svn path=/nixpkgs/trunk/; revision=6120
 2006-08-15 13:22:45 +00:00
Eelco Dolstra 38ee361757 * Backout accidental commit. 
svn path=/nixpkgs/trunk/; revision=6088
 2006-08-09 15:49:02 +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 7154adfa34 new version of ISC dhcpd 
svn path=/nixpkgs/trunk/; revision=6074
 2006-08-08 17:50:16 +00:00
Armijn Hemel e0758ef36a grub needs coreutils (for df and uniq) 
svn path=/nixpkgs/trunk/; revision=6062
 2006-08-06 23:53:48 +00:00
Armijn Hemel 0d685d9ebe move NIX_GLIBC_FLAGS_SET=1 to the dietlibc-wrapper 
svn path=/nixpkgs/trunk/; revision=5992
 2006-07-30 17:07:15 +00:00
Armijn Hemel 0d620b8890 1.4.2.2 -> 1.4.4 
svn path=/nixpkgs/trunk/; revision=5878
 2006-07-22 22:31:45 +00:00
Martin Bravenboer 69da897d0b Oops 
svn path=/nixpkgs/trunk/; revision=5753
 2006-07-17 20:42:44 +00:00
Martin Bravenboer c79c39f61f Problems with darwinports host. Added patches here. 
svn path=/nixpkgs/trunk/; revision=5752
 2006-07-17 20:41:15 +00:00
Martin Bravenboer bb3cfbe2a3 Added transfig, opefully the ugliest package of this world 
svn path=/nixpkgs/trunk/; revision=5751
 2006-07-17 20:35:02 +00:00
Eelco Dolstra fbf526d408 * Use stdenv.isDarwin. 
svn path=/nixpkgs/trunk/; revision=5728
 2006-07-17 11:07:32 +00:00
Eelco Dolstra 2881391565 * Fix GNU patch on Darwin (and probably FreeBSD as well). 
svn path=/nixpkgs/trunk/; revision=5705
 2006-07-14 11:20:30 +00:00
Eelco Dolstra ea2da73c8d * Doh! Idem. 
svn path=/nixpkgs/trunk/; revision=5704
 2006-07-14 10:59:14 +00:00
Eelco Dolstra f9a32684d2 * Workaround for silly sed problem. 
svn path=/nixpkgs/trunk/; revision=5703
 2006-07-14 10:58:46 +00:00
Eelco Dolstra 05094496b4 * TightVNC. 
svn path=/nixpkgs/trunk/; revision=5698
 2006-07-13 14:54:24 +00:00
Armijn Hemel 53d9e09d0d update to 7.15.4 
svn path=/nixpkgs/trunk/; revision=5674
 2006-07-10 18:22:50 +00:00
Armijn Hemel 1477b909f9 upgrade from 4.13 -> 4.17 
svn path=/nixpkgs/trunk/; revision=5622
 2006-07-06 18:15:07 +00:00
Armijn Hemel c1afbc0f77 screen uses the generic builder 
svn path=/nixpkgs/trunk/; revision=5621
 2006-07-06 18:12:00 +00:00
Armijn Hemel 4812209ebe upgrade to new version 
svn path=/nixpkgs/trunk/; revision=5620
 2006-07-06 18:05:40 +00:00
Armijn Hemel 976b5ad98e add new version of getopt, but don't make it the default (that would cause sdf 
to rebuild, and stratego, and ...)

svn path=/nixpkgs/trunk/; revision=5619
 2006-07-06 17:55:41 +00:00
Eelco Dolstra e410c935a1 * Treat i686-darwin as powerpc-darwin. 
svn path=/nixpkgs/trunk/; revision=5604
 2006-07-06 09:30:40 +00:00
Armijn Hemel 2389b06fe7 add openssh 4.3p2 
svn path=/nixpkgs/trunk/; revision=5595
 2006-07-05 16:09:43 +00:00
Eelco Dolstra 6da726d56e * Trang (tool for converting to and from RelaxNG schemas). 
svn path=/nixpkgs/trunk/; revision=5579
 2006-07-04 19:17:34 +00:00
Armijn Hemel cb66528886 mktemp uses the generic builder, so the builder can be removed 
svn path=/nixpkgs/trunk/; revision=5560
 2006-07-02 22:42:33 +00:00
Armijn Hemel cbd254fd10 update to new less, remove builder, since it was just a generic build 
svn path=/nixpkgs/trunk/; revision=5536
 2006-06-29 11:44:12 +00:00
Armijn Hemel f590067ee0 new autoconf, gettext and coreutils. Tested to build in work in NixOS. 
svn path=/nixpkgs/trunk/; revision=5532
 2006-06-28 21:35:37 +00:00
Armijn Hemel c21a8b1492 cosmetic fix 
svn path=/nixpkgs/trunk/; revision=5518
 2006-06-24 17:29:14 +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 423af3206e * groff updated to 1.19.2. 
svn path=/nixpkgs/trunk/; revision=5494
 2006-06-23 10:52:12 +00:00
Armijn Hemel e738411d7c update wget to 1.10.2, has extra gettext dependency 
svn path=/nixpkgs/trunk/; revision=5471
 2006-06-18 16:01:28 +00:00
Armijn Hemel a33dc947c6 disable local build of pangoxsl, add patch to remove "pangoxsl" from SUBDIRS, 
otherwise it will still try to build the local pangoxsl (and fail)

svn path=/nixpkgs/trunk/; revision=5468
 2006-06-18 11:58:00 +00:00
Armijn Hemel 3d789d45dc new version of parted 
svn path=/nixpkgs/trunk/; revision=5461
 2006-06-17 12:21:12 +00:00
Armijn Hemel 42c5136265 new coreutils 
svn path=/nixpkgs/trunk/; revision=5460
 2006-06-17 11:58:14 +00:00
Armijn Hemel 809f592e0a new version of curl 
svn path=/nixpkgs/trunk/; revision=5459
 2006-06-17 11:51:46 +00:00
Eelco Dolstra 8554e01d2b * Added cabextract. Might be useful for adding Visual C++. 
svn path=/nixpkgs/trunk/; revision=5368
 2006-06-01 21:25:40 +00:00
Eelco Dolstra 46a15b49a0 * Ugh, bzip2 should be autotooled... 
svn path=/nixpkgs/trunk/; revision=5357
 2006-05-31 15:07:56 +00:00
Eelco Dolstra 4acfb1a684 * More examples of interpolation. 
svn path=/nixpkgs/trunk/; revision=5244
 2006-05-01 15:25:17 +00:00
Eelco Dolstra cce11c4f1f * Added gtk-gnutella. 
* Added a patch to MPlayer to fix the aspect ratio on screens rotated
  with Xrandr.
* Disable toolbus for now because it requires a non-existant package
  (tcltk).

svn path=/nixpkgs/trunk/; revision=5171
 2006-04-18 18:46:36 +00:00
Eelco Dolstra 57c5067b07 * Refactoring. 
svn path=/nixpkgs/trunk/; revision=5149
 2006-04-10 17:49:24 +00:00
Roy van den Broek 9d27c94bda Pass the path to OpenSSL to the `--with-ssl' configure flag when building 
with SSL support.


svn path=/nixpkgs/trunk/; revision=5144
 2006-04-05 09:08:43 +00:00
Eelco Dolstra 77d7e2ea95 * That's a SHA-1 hash. 
svn path=/nixpkgs/trunk/; revision=5081
 2006-03-23 12:53:05 +00:00
Eelco Dolstra bfa6f51e30 * GnuPG updated to 1.4.2.2. 
svn path=/nixpkgs/trunk/; revision=5080
 2006-03-23 10:22:18 +00:00
Armijn Hemel 12a23295d5 and update gnused again to 4.1.5...build buildfarm, build! >:) 
svn path=/nixpkgs/trunk/; revision=4862
 2006-02-19 14:00:17 +00:00
Armijn Hemel ef92af7139 update findutils to 4.2.27 
svn path=/nixpkgs/trunk/; revision=4861
 2006-02-19 13:57:56 +00:00
Armijn Hemel f05a25f5f5 coreutils-5.94 
svn path=/nixpkgs/trunk/; revision=4860
 2006-02-19 13:51:40 +00:00
Eelco Dolstra a276487772 * Doh! 
svn path=/nixpkgs/trunk/; revision=4739
 2006-02-06 12:48:07 +00:00
Eelco Dolstra e12399051a * Grmbl. 
svn path=/nixpkgs/trunk/; revision=4738
 2006-02-06 12:44:34 +00:00
Eelco Dolstra 4d91fa9c45 * Quick hack to get bzip2 to build on Darwin. 
svn path=/nixpkgs/trunk/; revision=4737
 2006-02-06 12:29:36 +00:00
Martin Bravenboer 5472ca11e8 Revert sed update 
svn path=/nixpkgs/trunk/; revision=4723
 2006-02-05 01:55:03 +00:00
Armijn Hemel 8ec9843f24 update to sed 4.1.5 
svn path=/nixpkgs/trunk/; revision=4721
 2006-02-05 01:08:08 +00:00
Eelco Dolstra e761659405 * Bittorrent 4.4.0. 
svn path=/nixpkgs/trunk/; revision=4672
 2006-02-02 12:57:48 +00:00
Eelco Dolstra 9f898a586b * Copy even more files (in particular from losser.st-lab.cs.uu.nl, 
can't assume that it will live forever).

svn path=/nixpkgs/trunk/; revision=4624
 2006-01-30 16:11:00 +00:00
Eelco Dolstra 3389f4bc36 * Copy lots of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=4623
 2006-01-30 16:04:03 +00:00
Eelco Dolstra 53c56afcfe * Fix some broken URLs. 
svn path=/nixpkgs/trunk/; revision=4622
 2006-01-30 15:52:15 +00:00
Andres Löh 719217d77a * modified tetex to support extra .sty's from other packages 
* added lazylist and polytable (both tetex packages)
* added lhs2tex ebuild, depending on the two above

svn path=/nixpkgs/trunk/; revision=4609
 2006-01-27 20:51:41 +00:00
Armijn Hemel 6a42433ee4 make X forwarding optional. If enabled "xauth" is a dependency 
svn path=/nixpkgs/trunk/; revision=4573
 2006-01-17 18:48:18 +00:00
Armijn Hemel c055bf8adf fix findutils wrapper: 
- add symlinks to find and xargs
- set LOCATE_PATH for locate

svn path=/nixpkgs/trunk/; revision=4544
 2006-01-13 19:35:32 +00:00
Armijn Hemel dde6370c2a add a statically linked bzip2. This is the last of the tools we need for a fullystatic initial stdenv... 
svn path=/nixpkgs/trunk/; revision=4477
 2006-01-01 13:34:35 +00:00
Armijn Hemel 796636040a static diffutils for initial stdenv 
svn path=/nixpkgs/trunk/; revision=4445
 2005-12-27 10:39:20 +00:00
Armijn Hemel abcfd1bce5 add static version for initial stdenv 
svn path=/nixpkgs/trunk/; revision=4444
 2005-12-27 02:50:48 +00:00
Armijn Hemel cecd284522 add static version for initial stdenv...and maybe NixOS... 
svn path=/nixpkgs/trunk/; revision=4443
 2005-12-27 02:47:59 +00:00
Armijn Hemel 6aa7ab644a static version of gnused for initial stdenv... 
svn path=/nixpkgs/trunk/; revision=4442
 2005-12-27 02:44:56 +00:00
Armijn Hemel 40c9f1a764 add a statically compiled version of findutils for the inital stdenv and NixOS 
svn path=/nixpkgs/trunk/; revision=4441
 2005-12-26 17:13:37 +00:00
Eelco Dolstra b43c421658 * JDK: put the machine-dependent header files in the right place. 
* Added SWT for GTK (built from source).
* Added Azureus (a Bittorrent client written in Java).

svn path=/nixpkgs/trunk/; revision=4438
 2005-12-26 00:51:24 +00:00
Armijn Hemel c067f85ab1 upgrade the statically linked curl to 7.15.1 from 7.14.1. 
It would be good to use the output from this Nix expression for the initial
static stdenv.  Right now it is present, but we have not on record how it
exactly was compiled. If we use this package, we do know that in the future.

However, if we update this package it will cause a *MASSIVE* rebuild, namely
everything.

I won't be doing that...for now...even though some downtime for some people
would be a very good idea ;)

svn path=/nixpkgs/trunk/; revision=4433
 2005-12-25 00:49:21 +00:00
Armijn Hemel d2b1dc4a52 update curl to 7.15.1, fixes a security flaw. Merry X-mas :) 
svn path=/nixpkgs/trunk/; revision=4432
 2005-12-25 00:25:17 +00:00
Eelco Dolstra 272e44da1c * GnuPG updated to 1.4.2. Added support to optionally build it with 
IDEA support (requires a license).

svn path=/nixpkgs/trunk/; revision=4399
 2005-12-18 22:14:31 +00:00
Eelco Dolstra 784605f8de * Bittorrent 4.2.1. 
svn path=/nixpkgs/trunk/; revision=4378
 2005-12-15 17:45:40 +00:00
Armijn Hemel 41047b0fc5 don't have the privilege seperation path in the store 
svn path=/nixpkgs/trunk/; revision=4360
 2005-12-13 12:48:12 +00:00
Eelco Dolstra 94fe7734fa * Glibc 2.3.6. 
* GCC 3.4.5.
* Updated several other stdenv packages.
* Modified the builders of several packages to use the generic
  builder.

svn path=/nixpkgs/trunk/; revision=4336
 2005-12-06 00:12:45 +00:00
Eelco Dolstra 82e678362f * "." -> "source". 
svn path=/nixpkgs/trunk/; revision=4335
 2005-12-05 14:11:09 +00:00
Armijn Hemel ca347a2530 change name again to prevent that nix-env -iKf /nixpkgs/trunk/pkgs/system/i686-linux.nix coreutils will install both normal coreutils and this version. 
svn path=/nixpkgs/trunk/; revision=4254
 2005-11-06 23:57:54 +00:00
Armijn Hemel 8e5b0d6603 rename coreutils to coreutils-<release>-diet. Maybe this should be renamed again, not sure... 
svn path=/nixpkgs/trunk/; revision=4253
 2005-11-06 23:35:07 +00:00
Martin Bravenboer 4ba92bbd4e * Added unstable pre release of Stratego/XT 0.16 
* Upgraded bibtex-tools to latest unstable release.


svn path=/nixpkgs/trunk/; revision=4176
 2005-10-31 14:28:11 +00:00
Armijn Hemel 000497050f add sablotron 
svn path=/nixpkgs/trunk/; revision=4141
 2005-10-26 13:50:07 +00:00
Armijn Hemel 91e960b400 remove dependency on /bin/bash for dhclient 
svn path=/nixpkgs/trunk/; revision=4094
 2005-10-16 21:48:27 +00:00
Armijn Hemel 16bfb94736 don't forget the patch! 
svn path=/nixpkgs/trunk/; revision=4078
 2005-10-12 20:33:15 +00:00
Armijn Hemel bcb78a4ab7 make dhclient work 
svn path=/nixpkgs/trunk/; revision=4077
 2005-10-12 20:32:57 +00:00
Eelco Dolstra 552de99c19 * Update a bunch of base packages. 
svn path=/nixpkgs/trunk/; revision=4065
 2005-10-11 14:29:30 +00:00
Martin Bravenboer 085518614c Added bc :P 
svn path=/nixpkgs/trunk/; revision=4045
 2005-10-10 00:55:07 +00:00
Eelco Dolstra e0c0a344c4 * Added JDiskReport 1.2.3 (with a wrapper script `jdiskreport' to 
start it).

svn path=/nixpkgs/trunk/; revision=4031
 2005-10-07 23:02:58 +00:00
Martin Bravenboer 4c70ef7e5d Cleaning up the java naming conventions 
svn path=/nixpkgs/trunk/; revision=3871
 2005-09-17 23:58:51 +00:00
Armijn Hemel f99dacf885 add gnutar linked to dietlibc 
svn path=/nixpkgs/trunk/; revision=3779
 2005-09-05 12:26:16 +00:00
Armijn Hemel 69b0f36458 don't forget curl-diet itself, d'oh! 
svn path=/nixpkgs/trunk/; revision=3776
 2005-09-05 11:35:26 +00:00
Armijn Hemel dffe1406a0 add cpio 
svn path=/nixpkgs/trunk/; revision=3752
 2005-08-30 13:56:15 +00:00
Armijn Hemel 51492eb656 add place where I ripped the original patch (partially) from 
svn path=/nixpkgs/trunk/; revision=3737
 2005-08-28 14:29:32 +00:00
Armijn Hemel 3a0ff0b50d add dietlibc'ed coreutils for the NixOS installer... 
svn path=/nixpkgs/trunk/; revision=3736
 2005-08-28 14:23:30 +00:00
Martin Bravenboer ef60b29c05 update of xmlroff 
svn path=/nixpkgs/trunk/; revision=3724
 2005-08-27 21:08:49 +00:00
Armijn Hemel 1e8abc0185 add man 
svn path=/nixpkgs/trunk/; revision=3669
 2005-08-23 14:19:16 +00:00
Armijn Hemel e685273463 add findutils wrapper. Works for updatedb, not for locate. updatedb needs some mmore config to ignore /proc 
svn path=/nixpkgs/trunk/; revision=3667
 2005-08-23 13:47:01 +00:00
Armijn Hemel e4ab68cc39 add a patch which adds $PATH to the search path of updatedb. updatedb had the PATH set hard, probably because of security reasons. 
svn path=/nixpkgs/trunk/; revision=3666
 2005-08-23 12:42:20 +00:00
Eelco Dolstra 454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=3660
 2005-08-22 08:39:27 +00:00
Armijn Hemel acc1db9ac6 use execv instead of execve 
svn path=/nixpkgs/trunk/; revision=3657
 2005-08-21 22:37:31 +00:00
Armijn Hemel 77c089a857 add a wrapper for dhclient 
svn path=/nixpkgs/trunk/; revision=3655
 2005-08-21 19:46:16 +00:00
Armijn Hemel 4b640be166 add dhcp 
svn path=/nixpkgs/trunk/; revision=3652
 2005-08-21 16:11:25 +00:00
Armijn Hemel 789a0ab393 add groff, needed for dhcp 
svn path=/nixpkgs/trunk/; revision=3651
 2005-08-21 13:59:04 +00:00
Martin Bravenboer 5ac3904860 Added pangoxsl and xmlroff 
svn path=/nixpkgs/trunk/; revision=3574
 2005-08-13 21:35:49 +00:00
Armijn Hemel 29005ceca7 remove a file that was accidentily added, remove some cruft 
svn path=/nixpkgs/trunk/; revision=3573
 2005-08-13 19:19:57 +00:00
Armijn Hemel 63cc326828 grub-install needs a wrapper to make it pure-ish 
svn path=/nixpkgs/trunk/; revision=3571
 2005-08-13 19:00:37 +00:00
Martin Bravenboer bc533fb37a Include version in name of jing-tools 
svn path=/nixpkgs/trunk/; revision=3568
 2005-08-13 17:17:53 +00:00
Eelco Dolstra 0bf13e6f16 * Graphviz 2.4. 
svn path=/nixpkgs/trunk/; revision=3530
 2005-08-05 11:52:44 +00:00
Armijn Hemel b98f9b82f5 disable ntfs (note to self: don't forget to commit changes) 
svn path=/nixpkgs/trunk/; revision=3528
 2005-08-05 10:22:28 +00:00
Armijn Hemel 4d4425467e add a patch which removes a trailing comma in an enum in a header file. qtparted and other C++ programs don't like this... 
svn path=/nixpkgs/trunk/; revision=3494
 2005-08-01 09:31:28 +00:00
Armijn Hemel 869259ba99 preliminary qtparted support for rob, untested (might fail build) 
svn path=/nixpkgs/trunk/; revision=3490
 2005-07-31 22:20:46 +00:00
Armijn Hemel f660a6d892 parted needs ncurses and readline...and still not there yet... 
svn path=/nixpkgs/trunk/; revision=3488
 2005-07-31 20:53:53 +00:00
Armijn Hemel 2aeb12f0b4 add GNU parted 
svn path=/nixpkgs/trunk/; revision=3485
 2005-07-31 20:11:56 +00:00
Eelco Dolstra 6b41222b5c * Added Xauth (pilfered from the modular X.org tree). 
svn path=/nixpkgs/trunk/; revision=3466
 2005-07-29 10:06:49 +00:00
Martin Bravenboer 478c44aef3 hevea needs patching on Mac OS X (see the Darwin ports) 
svn path=/nixpkgs/trunk/; revision=3454
 2005-07-26 16:18:14 +00:00
Armijn Hemel 8c62c8966d add grub bootloader 
svn path=/nixpkgs/trunk/; revision=3352
 2005-07-18 09:18:07 +00:00
Eelco Dolstra 41ceac357c * Prevent a retained dependency on static-tools in stdenv-linux 
(findutils stores a reference to coreutils).

svn path=/nixpkgs/trunk/; revision=3318
 2005-07-12 14:03:33 +00:00
Eelco Dolstra fa6570f716 * Use python 2.4. 
svn path=/nixpkgs/trunk/; revision=3235
 2005-06-21 11:49:59 +00:00
Eelco Dolstra b899b28c73 * Oops, 1.15 was not the most recent version (and a very bad one, too). 
svn path=/nixpkgs/trunk/; revision=3202
 2005-06-17 22:06:59 +00:00
Eelco Dolstra e2c30f15e4 * Fix zip (INSTALL variable not defined in the makefile!). 
svn path=/nixpkgs/trunk/; revision=3198
 2005-06-17 17:06:14 +00:00
Eelco Dolstra 0a2f531aea * Don't patch symlinked shared libraries. 
svn path=/nixpkgs/trunk/; revision=3195
 2005-06-17 13:46:04 +00:00
Eelco Dolstra 98761b883a * Build bzip2 shared library. 
svn path=/nixpkgs/trunk/; revision=3194
 2005-06-17 13:39:06 +00:00
Eelco Dolstra a450978f26 * Glibc updated to 2.3.5. 
* GCC 3.4.4 and 3.3.6.
* Other stdenv packages updated.

svn path=/nixpkgs/trunk/; revision=3188
 2005-06-17 10:30:13 +00:00
Eelco Visser 3385ccd1f7 use tetex 
svn path=/nixpkgs/trunk/; revision=3164
 2005-05-31 08:11:54 +00:00
Martin Bravenboer b99065a3d9 * Upgraded Stratego/XT to Stratego/XT 0.14 
* Clean up of SDF attributes in all-package-generic. There is now a
single attribute, called sdf.


svn path=/nixpkgs/trunk/; revision=3062
 2005-05-18 16:50:14 +00:00
Eelco Dolstra 8774874b89 * Gnuplot 4.0 (without X support). 
svn path=/nixpkgs/trunk/; revision=2993
 2005-05-06 08:54:01 +00:00
Eelco Dolstra 4e4ad61aee * Added pygtk. 
* Updated bittorrent to 4.0.1.

svn path=/nixpkgs/trunk/; revision=2879
 2005-04-22 18:26:04 +00:00
Eelco Dolstra 7775caaa35 * Evacuate tarballs. 
svn path=/nixpkgs/trunk/; revision=2527
 2005-04-11 13:09:01 +00:00
Eelco Dolstra 1af17b9d7f * Rename new unzip. 
svn path=/nixpkgs/trunk/; revision=2515
 2005-04-11 08:26:36 +00:00
Eelco Dolstra d8a0bdebf2 * Get rid of the old unzip. 
svn path=/nixpkgs/trunk/; revision=2514
 2005-04-11 08:22:23 +00:00
Armijn Hemel 0aba140013 add gnupg 
svn path=/nixpkgs/trunk/; revision=2436
 2005-03-22 15:23:20 +00:00
Eelco Dolstra 55a02efa5b * Mac needs Unzip 5.52. 
svn path=/nixpkgs/trunk/; revision=2434
 2005-03-21 14:48:48 +00:00
Rob Vermaas 421d6ac92a * mjpegtools 1.6.2 
svn path=/nixpkgs/trunk/; revision=2429
 2005-03-18 08:10:35 +00:00
Eelco Dolstra f6e91bc9c9 * Merge r2396. 
svn path=/nixpkgs/trunk/; revision=2397
 2005-03-14 09:22:26 +00:00
Eelco Dolstra 579b8893a0 * Graphviz 2.2. 
svn path=/nixpkgs/trunk/; revision=2382
 2005-03-11 13:15:16 +00:00
Eelco Dolstra 83ec45304d * Added libexif and the exif frontend utility. 
svn path=/nixpkgs/trunk/; revision=2376
 2005-03-11 10:46:20 +00:00
Eelco Dolstra b701827950 * Added the `file' utility (required by the MonoDevelop build process). 
svn path=/nixpkgs/trunk/; revision=2355
 2005-03-09 17:48:46 +00:00
Eelco Dolstra e6744d0f89 * Merge diff between trunk/pkgs@1646 and branches/nixos-pkgs@2256; 
this contains mostly Armijn's pure stdenv-linux.

* After unpacking the statically linked GCC, patch all store paths to
  /nix/store/ffffffffffffffffffffffffffffffff.  Ugly hack to prevent
  undeclared references but it works.

* We don't need Glib's dynamic libraries in the first bootstrap stage;
  delete them.  Actually the downloaded Glibc binary is only needed
  for building Glibc, since GCC needs a C compiler to build some
  programs in `configure'.  So static linking is fine for that.  Maybe
  it would be better to patch `configure' so that we don't need a
  pre-built Glibc at all.

* Set the svn:executable property on `cp' and `patchelf'.

* In Glibc, revert to LinuxThreads.  Maybe NPTL will work, but TLS
  support is a problem.

* Delete most Glibc patches; they're no longer needed since the branch
  updated it to 20050110.
  
* Some cleanups.

svn path=/nixpkgs/trunk/; revision=2258
 2005-02-21 16:03:34 +00:00
Eelco Dolstra e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a 
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
 2005-02-15 14:44:19 +00:00
Eelco Dolstra ba6f269bf5 * Qt: add optional support for MySQL. 
* MythTV: the setup program works :-).
* Added XmlTV.  This requires a huge number of Perl modules, so...
* Added a generic builder for Perl modules.  I'm lazy so the modules
  are defined directly in all-packages-generic.nix.  The generic
  builder also patches Perl scripts to include a hard-coded Perl
  module search path (i.e., similar to an RPATH in ELF executables).

svn path=/nixpkgs/trunk/; revision=2083
 2005-01-22 00:19:27 +00:00
Armijn Hemel a8d8a8f82c don't install keys. The Nix scripts empty the whole environment, including 
some variables that are used by ssh-keygen.

svn path=/nixpkgs/branches/nixos-pkgs/; revision=2001
 2005-01-10 15:33:43 +00:00
Armijn Hemel 6537afc279 we no longer need this patch 
svn path=/nixpkgs/branches/nixos-pkgs/; revision=1999
 2005-01-10 11:37:56 +00:00
Armijn Hemel baf430cd23 don't let openssh generate a new hostkey when installing, let this be done afterwards by the sysadmin 
svn path=/nixpkgs/branches/nixos-pkgs/; revision=1947
 2004-12-24 14:10:19 +00:00
Armijn Hemel d6702d185a patch for curl 
svn path=/nixpkgs/branches/nixos-pkgs/; revision=1844
 2004-12-09 13:02:44 +00:00
Eelco Dolstra 1d9072670b * Added bsdiff 4.2. Wow, this is even better than zdelta (which in 
turn appears to be better than vdelta).

svn path=/nixpkgs/trunk/; revision=1819
 2004-11-29 21:17:29 +00:00
Eelco Dolstra 9ebbbd25cc * Added zdelta 2.1. 
svn path=/nixpkgs/trunk/; revision=1817
 2004-11-29 19:35:42 +00:00
Martin Bravenboer 09e3335664 Added jing package (RELAX NG validation) and jing-tools for invoking the Java application 
svn path=/nixpkgs/trunk/; revision=1508
 2004-09-26 13:03:59 +00:00
Eelco Dolstra f3193ba5bc * Graphviz updated to 1.12. 
* In all-packages-generic.nix: yacc alias for bison.

svn path=/nixpkgs/trunk/; revision=1488
 2004-09-22 08:49:22 +00:00
Martin Bravenboer 9bdb07a79a Added xsel, a cool command-line tool for using the X clipboard 
svn path=/nixpkgs/trunk/; revision=1485
 2004-09-21 16:27:31 +00:00
Eelco Dolstra 1e323657e5 * Coreutils updated to 5.2.1. 
svn path=/nixpkgs/trunk/; revision=1438
 2004-09-18 17:07:42 +00:00
Eelco Dolstra 1ff00e5516 * GNU tar updated to stable release 1.14. 
svn path=/nixpkgs/trunk/; revision=1437
 2004-09-18 17:07:06 +00:00
Eelco Dolstra 6761e900d6 * GNU awk upgraded to 3.1.4. 
svn path=/nixpkgs/trunk/; revision=1436
 2004-09-18 17:06:39 +00:00
Eelco Dolstra 6dc5ad8a2d * Prevent a retained dependency on coreutils from stdenv. 
svn path=/nixpkgs/trunk/; revision=1435
 2004-09-18 17:06:06 +00:00
Eelco Dolstra d97dd79895 * GNU sed upgraded to 4.1.2. 
svn path=/nixpkgs/trunk/; revision=1434
 2004-09-18 17:04:19 +00:00
Armijn Hemel 4812b512f1 remove the generated keys (good? bad? not sure) and change the permissions of 
the keysign binary. This is because of suid-nix on which the NixOS scripts barf

svn path=/nixpkgs/trunk/; revision=1366
 2004-08-30 13:53:48 +00:00
Martin Bravenboer b3822af769 New release of xpf 
svn path=/nixpkgs/trunk/; revision=1310
 2004-08-21 12:04:18 +00:00
Martin Bravenboer db7289192e Added the first release of xpf, Xml Pipes and Filters. 
svn path=/nixpkgs/trunk/; revision=1308
 2004-08-20 22:06:36 +00:00
Eelco Visser 009cda1fb2 version 0.1 of bibtex-tools 
svn path=/nixpkgs/trunk/; revision=1285
 2004-08-17 11:53:31 +00:00
Eelco Dolstra 92fbc10356 * Bittorrent: latest version (3.4.2). 
svn path=/nixpkgs/trunk/; revision=1264
 2004-08-13 10:11:11 +00:00
Armijn Hemel 2e2bcda7c2 add nmap, commandline version only 
svn path=/nixpkgs/trunk/; revision=1237
 2004-08-06 10:00:53 +00:00
Armijn Hemel f063d8c4db - add mktemp 
- disable tiger, strategoxt, they don't work and give errors
- ftp.nl.kernel.org seems to have some problems, replaced with ftp.de.kernel.org
should be put back eventually

svn path=/nixpkgs/trunk/; revision=1215
 2004-08-03 15:41:08 +00:00
Armijn Hemel ae04cf09b2 add OpenSSH client + server, needs a lot of thorough testing with regards to server configuration, this will be the test case for NixOS. No PAM configs, might need tweaking, etc. 
svn path=/nixpkgs/trunk/; revision=1210
 2004-08-02 11:55:31 +00:00
Armijn Hemel 56c404a7a9 add screen, does complain about getting/setting a config file in /etc 
svn path=/nixpkgs/trunk/; revision=1207
 2004-07-30 16:13:08 +00:00
Armijn Hemel cd4aa37b6b move less from applications to tools 
svn path=/nixpkgs/trunk/; revision=1206
 2004-07-30 15:34:37 +00:00
Eelco Visser e5ee911e2e Hevea is an interpreter for (La)TeX that produces HTML. 
It is written in OCaml.


svn path=/nixpkgs/trunk/; revision=1189
 2004-07-28 10:49:55 +00:00
Eelco Dolstra 0a32c85cb6 * Use a mirror (losser), since gnugrep-2.5.1 has been removed from the 
FSF server.

svn path=/nixpkgs/trunk/; revision=1175
 2004-07-18 21:16:45 +00:00
Eelco Visser be48aa538b - O'Caml compiler for Object CaML 
- hevea is an interpreter for latex producing html

svn path=/nixpkgs/trunk/; revision=1171
 2004-07-16 22:58:15 +00:00
Eelco Dolstra 7226e94466 * Added GNU enscript. 
svn path=/nixpkgs/trunk/; revision=1040
 2004-06-03 17:16:16 +00:00
Eelco Dolstra 163a382727 * Don't use gettext. Also use an internal (GNU) version of getopt. 
This allows it to build on non-glibc platforms (e.g., Mac OS X).

svn path=/nixpkgs/trunk/; revision=970
 2004-04-23 16:29:53 +00:00
Eelco Dolstra 92b3cc5cfb * Working Graphviz / Athena widgets. 
svn path=/nixpkgs/trunk/; revision=891
 2004-04-01 13:36:31 +00:00
Eelco Dolstra 817d1b27ef * Provide a wrapper around `aclocal' (in Automake) that automatically 
adds all directories specified in `ACLOCAL_PATH' to the `aclocal'
  command line as `-I' flags.  Also, it provides a setup hook that
  adds the `.../share/aclocal' directory of every build input to
  `ACLOCAL_PATH'.

* Upgraded Libtool.

* Graphviz requires the X Athena widgets, which in turn requires the X
  miscellaneous utilities library; added those.  However it doesn't
  work yet since libXt is broken.
  

svn path=/nixpkgs/trunk/; revision=888
 2004-03-31 22:47:06 +00:00
Eelco Dolstra 5a4de2c5de * Remove builder attributes. 
* MPlayer: pass stdenv to w32codecs.

svn path=/nixpkgs/trunk/; revision=882
 2004-03-30 15:15:19 +00:00
Eelco Dolstra 04c272508c * Fix brokenness due to automatic transformations. 
svn path=/nixpkgs/trunk/; revision=878
 2004-03-30 12:37:17 +00:00
Eelco Dolstra 12ae5363ea * Remove trivial builders. 
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
 2004-03-29 17:23:01 +00:00
Eelco Dolstra 2fcc5fdb08 * "!isNull x" -> "x != null". Done automatically. Hope nothing 
broke.

svn path=/nixpkgs/trunk/; revision=870
 2004-03-29 10:25:25 +00:00
Eelco Dolstra 5941f66f0e * The stdenv setup script now defines a generic builder that allows 
builders for typical Autoconf-style to be much shorten, e.g.,

    . $stdenv/setup
    genericBuild

  The generic builder does lots of stuff automatically:

  - Unpacks source archives specified by $src or $srcs (it knows about
    gzip, bzip2, tar, zip, and unpacked source trees).
  - Determines the source tree.
  - Applies patches specified by $patches.
  - Fixes libtool not to search for libraries in /lib etc.
  - Runs `configure'.
  - Runs `make'.
  - Runs `make install'.
  - Strips debug information from static libraries.
  - Writes nested log information (in the format accepted by
    `log2xml').

  There are also lots of hooks and variables to customise the generic
  builder.  See `stdenv/generic/docs.txt'.

* Adapted the base packages (i.e., the ones used by stdenv) to use the
  generic builder.

* We now use `curl' instead of `wget' to download files in `fetchurl'.

* Neither `curl' nor `wget' are part of stdenv.  We shouldn't
  encourage people to download stuff in builders (impure!).

* Updated some packages.

* `buildinputs' is now `buildInputs' (but the old name also works).

* `findInputs' in the setup script now prevents inputs from being
  processed multiple times (which could happen, e.g., if an input was
  a propagated input of several other inputs; this caused the size
  variables like $PATH to blow up exponentially in the worst case).

* Patched GNU Make to write nested log information in the format
  accepted by `log2xml'.  Also, prior to writing the build command,
  Make now writes a line `building X' to indicate what is being
  built.  This is unfortunately often obscured by the gigantic tool
  invocations in many Makefiles.  The actual build commands are marked
  `unimportant' so that they don't clutter pages generated by
  `log2html'.


svn path=/nixpkgs/trunk/; revision=845
 2004-03-19 16:53:04 +00:00
Eelco Dolstra de13527000 * Finally got stdenv-nix-linux working again. Still not perfect, 
though.
* libxml2: upgrade to latest.
* octavefront/rna: keep debug info.

svn path=/nixpkgs/trunk/; revision=830
 2004-03-11 17:26:14 +00:00
Eelco Dolstra 73c7b4a111 * Pass parameters correctly. 
svn path=/nixpkgs/trunk/; revision=799
 2004-02-18 08:17:12 +00:00
Eelco Dolstra 90e75450a4 * Added BitTorrent. 
svn path=/nixpkgs/trunk/; revision=797
 2004-02-17 20:03:12 +00:00
Eelco Dolstra d6a58594d2 * User-Mode Linux and GNU Patch. 
svn path=/nixpkgs/trunk/; revision=779
 2004-02-13 14:42:28 +00:00
Eelco Dolstra 9db5df37f9 * Added cksfv, a program for verifying sfv checksum files. 
svn path=/nixpkgs/trunk/; revision=720
 2004-01-25 08:59:20 +00:00
Eelco Visser 02a743eb7a junk 
svn path=/nixpkgs/trunk/; revision=598
 2003-12-23 21:32:25 +00:00
Eelco Visser b4ce40af2b added packages: which, libtool 
aggregation in all-packages-generic: autotools
building strategoxt from svn

not complete yet since autconf cannot find libtool


svn path=/nixpkgs/trunk/; revision=596
 2003-12-23 20:51:58 +00:00
Eelco Dolstra 4b283d3de7 * Added par2cmdline. 
svn path=/nixpkgs/trunk/; revision=583
 2003-12-14 20:36:43 +00:00
Eelco Dolstra 716904fe0c * Added Graphviz. 
svn path=/nixpkgs/trunk/; revision=580
 2003-12-10 09:51:32 +00:00
Eelco Dolstra cd0ad9e00a * Added getopt (because sdf2table needs it). 
svn path=/nixpkgs/trunk/; revision=568
 2003-12-02 12:54:21 +00:00
Eelco Dolstra 7953d11e3a * Added unzip. 
svn path=/nixpkgs/trunk/; revision=541
 2003-11-25 14:40:02 +00:00
Eelco Dolstra 026ff9466a * Rename .fix -> .nix. 
svn path=/nixpkgs/trunk/; revision=511
 2003-11-18 12:12:56 +00:00
Eelco Dolstra 48c3faca51 * Renamed pkgs-ng to pkgs. 
svn path=/nixpkgs/trunk/; revision=502
 2003-11-14 09:59:13 +00:00