JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
236,603 Commits 2 Branches 0 Tags 13 GiB
faa5c2d47a
Commit Graph

4802 Commits

Author SHA1 Message Date
Marc Weber
075f9712f2 fix soappy by using trunk version 
svn path=/nixpkgs/trunk/; revision=16790
 2009-08-20 20:19:04 +00:00
Eelco Dolstra
0fa5cdc251 * Remove some trace calls. 
svn path=/nixpkgs/trunk/; revision=16705
 2009-08-13 08:37:00 +00:00
Michael Raskin
caede3beb5 Update LinuxWacom driver 
svn path=/nixpkgs/trunk/; revision=16565
 2009-08-03 14:15:22 +00:00
Marc Weber
c3ddc9df62 cdtenv: also store PATH and PKG_CONFIG_PATH 
svn path=/nixpkgs/trunk/; revision=16478
 2009-07-27 16:05:36 +00:00
Andres Löh
5164d2ec62 Added lhs2TeX support to LaTeX builder. 
svn path=/nixpkgs/trunk/; revision=16439
 2009-07-23 14:13:09 +00:00
Eelco Dolstra
04cc6b721a * Made findLaTeXIncludes pure. Previously find-includes.pl looked 
outside of the Nix store for the dependencies of the root source
  file, which is impure.  That's why it needed the
  `builtins.currentTime' hack to force a rebuild.  It also didn't work
  in a chroot.  Now find-includes.pl only scans the source file at
  hand, and we use builtins.genericClosure to find all includes
  recursively.

svn path=/nixpkgs/trunk/; revision=16414
 2009-07-17 15:10:01 +00:00
Marc Weber
62eccd21d4 updating bleeding edge source file info for nix-repository-manager 
svn path=/nixpkgs/trunk/; revision=16349
 2009-07-14 12:31:37 +00:00
Eelco Dolstra
46db02a5e3 * Fix xrefs and callouts that refer to xml:ids (rather than ids). 
Will send upstream.

svn path=/nixpkgs/trunk/; revision=16312
 2009-07-10 12:09:58 +00:00
Marc Weber
25a1533d9a removing old haskell stuff. I was using my own branch for a long time. 
It will be replaced by something else anyway.
Some of those patches may still be of interest (?)

svn path=/nixpkgs/trunk/; revision=16298
 2009-07-09 22:24:08 +00:00
Marc Weber
676f4c4e2d haskellPackages: adding bytestring, networkBytestring, getOptions, ghcSyb, hslogger, tar 
svn path=/nixpkgs/trunk/; revision=16296
 2009-07-09 22:24:02 +00:00
Marc Weber
6abf8471fb fix sourceWithTagsDerivation, myhasktags now based on current haskell derivations 
svn path=/nixpkgs/trunk/; revision=16263
 2009-07-09 03:50:47 +00:00
Rob Vermaas
5c13747775 dblatex 0.2.11 
svn path=/nixpkgs/trunk/; revision=16246
 2009-07-08 13:12:27 +00:00
Marc Weber
5ef46894e0 adding cdtEnv symlinking deps into one $out/cdt-env/{lib,include} directory 
and collection which let's you install and update a set of derivations at once

svn path=/nixpkgs/trunk/; revision=16224
 2009-07-07 20:53:16 +00:00
Eelco Dolstra
d3f5d94ac7 * Fix some attributes that now make nix-env -q --meta barf. 
svn path=/nixpkgs/trunk/; revision=16134
 2009-07-02 09:08:01 +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
Eelco Dolstra
83c3123617 * Wine 1.1.23. 
svn path=/nixpkgs/trunk/; revision=15886
 2009-06-07 19:48:49 +00:00
Sander van der Burg
ec871e6400 Upgraded DOSBox to 0.73 and removed glibc fixes which are obsolete now 
svn path=/nixpkgs/trunk/; revision=15786
 2009-05-29 12:14:56 +00:00
Ludovic Courtès
f3706471e8 GNU Ghostscript: Add pointers to the URW++ font files in the fontmap. 
svn path=/nixpkgs/trunk/; revision=15780
 2009-05-28 22:11:02 +00:00
Sander van der Burg
5990b0d95f Added VICE emulator package 
svn path=/nixpkgs/trunk/; revision=15776
 2009-05-28 19:22:00 +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
52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry 
svn path=/nixpkgs/trunk/; revision=15662
 2009-05-19 23:25:58 +00:00
Sander van der Burg
c0605f9d3c Added desktop item to DOSBox 
svn path=/nixpkgs/trunk/; revision=15599
 2009-05-14 11:17:41 +00:00
Eelco Dolstra
d78a404063 * Removed some assertions that rely on pointer equality. (It's kind 
of unfortunate that consitency checks like "httpd.apr == apr" don't
  really work.  Perhaps equality tests on derivations should just
  compare the drvPath or outPath attributes.)

svn path=/nixpkgs/trunk/; revision=15569
 2009-05-12 12:50:07 +00:00
Michael Raskin
d8e3181425 Update URLs for TeXLive 
svn path=/nixpkgs/trunk/; revision=15544
 2009-05-10 23:26:19 +00:00
Marc Weber
90344f9e1e use svn sources for ctgas. 
The last release has a bug. I got "no end of file expected" while tagging

svn path=/nixpkgs/trunk/; revision=15501
 2009-05-07 18:28:19 +00:00
Eelco Dolstra
f0e8c6aaef * Updated dblatex. 
svn path=/nixpkgs/trunk/; revision=15495
 2009-05-07 13:18:35 +00:00
Eelco Dolstra
b5e67e699b * CUPS 1.3.10. 
svn path=/nixpkgs/trunk/; revision=15472
 2009-05-06 14:05:32 +00:00
Marc Weber
94a01668a1 cleaned up and fixed autofs v5 
svn path=/nixpkgs/trunk/; revision=15419
 2009-05-01 05:42:32 +00:00
Eelco Dolstra
2d1bcbeacf * Electric Sheep, a screensaver. 
svn path=/nixpkgs/trunk/; revision=15415
 2009-04-30 17:41:19 +00:00
Marc Weber
cd9c9a2431 fix broken myEnv 
svn path=/nixpkgs/trunk/; revision=15382
 2009-04-28 16:52:36 +00:00
Ludovic Courtès
2dc368f084 GNU Ghostscript 8.64.0. 
svn path=/nixpkgs/trunk/; revision=15334
 2009-04-27 10:19:59 +00:00
Marc Weber
829e0da0e5 topgit update 
there is now a tg push command pushing branch and its base optionally
including all dependency

svn path=/nixpkgs/trunk/; revision=15328
 2009-04-27 01:18:07 +00:00
Eelco Dolstra
5a2284ac61 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15313
 2009-04-25 22:45:32 +00:00
Lluís Batlle i Rossell
1e8fff0915 Updating Wine. 
svn path=/nixpkgs/trunk/; revision=15308
 2009-04-25 16:22:08 +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
6e32a4cea8 svn path=/nixpkgs/branches/stdenv-updates/; revision=15273 2009-04-23 12:46:14 +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
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
Sander van der Burg
883eb4371c Fixed dosbox expression 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15220
 2009-04-21 18:30:54 +00:00
Lluís Batlle i Rossell
98f6f77709 Adding a folding-at-home client. 
svn path=/nixpkgs/trunk/; revision=15122
 2009-04-17 20:36:54 +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
7ae8544b4c * ntfs-3g updated to 2009.4.4. The old version has disappeared 
anyway.

svn path=/nixpkgs/trunk/; revision=14915
 2009-04-07 16:03:30 +00:00
Eelco Dolstra
d27514cb28 * Sync with the trunk once more. 
* Turn on everything in Hydra.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14806
 2009-03-31 15:30:47 +00:00
Marc Weber
5af6ba01fd doh (forgotten to update name) 
svn path=/nixpkgs/trunk/; revision=14782
 2009-03-30 14:21:18 +00:00
Marc Weber
0be7534b0f maven-2 version bump to 2.1.0 
svn path=/nixpkgs/trunk/; revision=14781
 2009-03-30 14:20:05 +00:00
Marc Weber
27db9f1dfd updated synergy cvs source 
svn path=/nixpkgs/trunk/; revision=14772
 2009-03-30 10:32:44 +00:00
Eelco Dolstra
58ae185001 * Latest ntfs-3g, FUSE. 
svn path=/nixpkgs/trunk/; revision=14696
 2009-03-25 10:55:40 +00:00
Eelco Dolstra
f3815e7ad5 * Fixed ntfsprogs. 
svn path=/nixpkgs/trunk/; revision=14695
 2009-03-25 10:55:28 +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
808f12e369 * Dosbox 0.72. 
svn path=/nixpkgs/trunk/; revision=14556
 2009-03-16 12:22:47 +00:00
Eelco Dolstra
2ae9a1c947 * Doh. 
svn path=/nixpkgs/trunk/; revision=14498
 2009-03-10 20:04:08 +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
Eelco Dolstra
0175270bf9 * Wine 1.1.15. 
svn path=/nixpkgs/trunk/; revision=14273
 2009-02-27 12:52:55 +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
Marc Weber
5778dd836d mend 
svn path=/nixpkgs/trunk/; revision=14035
 2009-02-11 16:12:14 +00:00
Marc Weber
944d6221df my-env: add some hackish support for zsh 
svn path=/nixpkgs/trunk/; revision=14034
 2009-02-11 16:12:12 +00:00
Eelco Dolstra
ca5e6b9624 svn path=/nixpkgs/trunk/; revision=14033 2009-02-11 14:53:17 +00:00
Tobias Hammerschmidt
b7f9c33989 version bump 
svn path=/nixpkgs/trunk/; revision=13999
 2009-02-06 20:18:08 +00:00
Eelco Dolstra
f45ed4b74e * Remove obsolete comment. 
svn path=/nixpkgs/trunk/; revision=13977
 2009-02-03 22:15:02 +00:00
Eelco Dolstra
c584bb878a * Sync with trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13903
 2009-01-29 16:33:02 +00:00
Marc Weber
0ad62a0edb adding gitAttr 
now containing qgit, stgit, topGit, hg2git
updating gitGit (git dev version), adding qgit-git (dev version)

svn path=/nixpkgs/trunk/; revision=13816
 2009-01-20 22:15:42 +00:00
Eelco Dolstra
e7a94d6fef * Ghostscript: build the CUPS filter. This allows CUPS to print to 
non-Postscript printers.

svn path=/nixpkgs/trunk/; revision=13793
 2009-01-17 13:08:51 +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
Eelco Dolstra
5689d7338e * Support LaTeX documents that have multiple bibliographies (using the 
multibib package).

svn path=/nixpkgs/trunk/; revision=13723
 2009-01-08 09:54:04 +00:00
Marc Weber
e4a6036ca9 adding cvs zsh version because it has better hg, tg completion support 
svn path=/nixpkgs/trunk/; revision=13670
 2008-12-22 18:36: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
9ed6e06b38 * Wine 1.1.10. 
svn path=/nixpkgs/trunk/; revision=13625
 2008-12-12 23:00:15 +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
Marc Weber
90b53dcccc bleeding edge octave version (without docs) 
svn path=/nixpkgs/trunk/; revision=13561
 2008-12-02 22:55:45 +00:00
Eelco Dolstra
2ffc686b67 * Latest Wine, Thunderbird. 
svn path=/nixpkgs/trunk/; revision=13527
 2008-12-01 00:06:14 +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
Eelco Dolstra
6c107b6706 * CUPS 1.3.9. 
svn path=/nixpkgs/trunk/; revision=13217
 2008-11-07 13:36:57 +00:00
Michael Raskin
89c807afc1 Wine update 
svn path=/nixpkgs/trunk/; revision=13128
 2008-10-28 07:28:39 +00:00
Marc Weber
ea22df581b added hg2git 
svn path=/nixpkgs/trunk/; revision=13096
 2008-10-18 21:08:42 +00:00
Wouter den Breejen
a4cc4210b5 NTFS-3g version update (tested for compilation) 
svn path=/nixpkgs/trunk/; revision=13095
 2008-10-18 18:31:10 +00:00
Marc Weber
5a4a28e437 added cinelerra (video editing application) 
svn path=/nixpkgs/trunk/; revision=13068
 2008-10-14 14:01:50 +00:00
Marc Weber
3d90901798 update my_env. Hopefully does a better job now 
svn path=/nixpkgs/trunk/; revision=13037
 2008-10-09 22:57:20 +00:00
Ludovic Courtès
7874b9a379 TeXLive/PGF 2.00. 
svn path=/nixpkgs/trunk/; revision=13019
 2008-10-09 12:44:11 +00:00
Eelco Dolstra
fe89cbbe7c * PGF 2.00 (keeping the old one so that I can still build old documents). 
svn path=/nixpkgs/trunk/; revision=12999
 2008-10-08 14:03:44 +00:00
Eelco Dolstra
74669a825c * Latest ntfs-3g. 
svn path=/nixpkgs/trunk/; revision=12871
 2008-09-17 12:52:46 +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
Marc Weber
e75a56c88e updated repo versions of ghc cabal and http package 
svn path=/nixpkgs/trunk/; revision=12682
 2008-08-21 11:07:58 +00:00
Marc Weber
c4270fb9b8 moved hasktags to ghc68executables, updated url to new location 
svn path=/nixpkgs/trunk/; revision=12680
 2008-08-21 11:07:44 +00:00
Marc Weber
d4cf308de6 haxml_darcs updated (it can now parse xhtml dtd) 
svn path=/nixpkgs/trunk/; revision=12678
 2008-08-21 11:07:16 +00:00
Marc Weber
9d181d621f updated nixRepositoryManager 
now you can use specify another source file for testing in a nix way

svn path=/nixpkgs/trunk/; revision=12662
 2008-08-19 13:31:52 +00:00
Marc Weber
9075ea2218 moved nix-repository-manager to add additional feature automatically updating given bleeding-edge-fetch-infos.nix 
svn path=/nixpkgs/trunk/; revision=12658
 2008-08-19 12:36:00 +00:00
Marc Weber
ba6c703918 jackaudio connection kit (jackd) is back 
svn path=/nixpkgs/trunk/; revision=12649
 2008-08-18 16:03:04 +00:00
Eelco Dolstra
813c7e87f6 * Wine updated to 1.1.2. 
svn path=/nixpkgs/trunk/; revision=12638
 2008-08-15 21:54:19 +00:00
Marc Weber
468c075ecc added storable vector 
svn path=/nixpkgs/trunk/; revision=12527
 2008-08-06 21:21:54 +00:00
Marc Weber
ec717200c8 ghc68extralibraries: tidied up, no longer many small files, nicer indentation (at least same level now) 
svn path=/nixpkgs/trunk/; revision=12517
 2008-08-06 16:56:05 +00:00
Marc Weber
7608d6f063 update ghc stuff (hsp is now supported as well except hsp-xml) 
svn path=/nixpkgs/trunk/; revision=12509
 2008-08-06 11:41:17 +00:00
Marc Weber
407b3e2e0d added bleeding-edge source info file 
svn path=/nixpkgs/trunk/; revision=12469
 2008-08-03 17:05:19 +00:00
Eelco Dolstra
c32f7569dc * ntfs-3g: install sbin/mount.ntfs-3g. Don't pass FUSE as 
a dependency (ntfs-3g has its own copy of FUSE).

svn path=/nixpkgs/trunk/; revision=12416
 2008-07-24 13:11:02 +00:00
Eelco Dolstra
839eb46cda * Fix installing the Ghostscript fonts. 
svn path=/nixpkgs/trunk/; revision=12408
 2008-07-23 14:40:16 +00:00
Eelco Dolstra
8734e020db * ghostscript: force the use of the -fpic flag, otherwise it doesn't 
build on x86_64-linux.

svn path=/nixpkgs/trunk/; revision=12380
 2008-07-18 14:52:20 +00:00
Ludovic Courtès
483cd039af GNU Ghostscript 8.62.0. 
In addition, install `libgs.so' and its header files, as well as the
man pages and HTML documentation.  Use the GS fonts provided at
ftp.gnu.org under the `ghostscript' directory.

svn path=/nixpkgs/trunk/; revision=12374
 2008-07-17 19:37:18 +00:00
Michael Raskin
c040ab4293 Updated ntfs-3g 
svn path=/nixpkgs/trunk/; revision=12369
 2008-07-17 04:40:50 +00:00
Eelco Dolstra
be77e6f99f * Wine 1.1.1. 
svn path=/nixpkgs/trunk/; revision=12352
 2008-07-13 21:42:10 +00:00
Michael Raskin
e8d58c83f9 Now TeXLive builds and seems to work without /var/tmp 
svn path=/nixpkgs/trunk/; revision=12322
 2008-07-08 18:22:33 +00:00
Peter Simons
8ff43a1636 xautolock: updated to version 2.2 
svn path=/nixpkgs/trunk/; revision=12314
 2008-07-07 23:11:43 +00:00
Peter Simons
100b902bd5 Added xautolock 2.1. 
Xautolock can be used to fire up a screen saver like xautolock after a certain
period of inactivity. The tool probably doesn't belong into misc/screensavers,
but I had no better idea.

svn path=/nixpkgs/trunk/; revision=12305
 2008-07-07 11:54:25 +00:00
Michael Raskin
5245bad31a Updated texlive-extra source 
svn path=/nixpkgs/trunk/; revision=12293
 2008-07-07 05:53:21 +00:00
Wouter den Breejen
a480dfbb51 Version bump 
svn path=/nixpkgs/trunk/; revision=12279
 2008-07-06 16:55:29 +00:00
Eelco Dolstra
d051b20a39 * Graphviz updated to 2.20.2. Now built with fontconfig, gd and pango 
support.
* New function makeFontsConf to generate a fontconfig configuration
  file.  Moved from NixOS.
* dot2pdf: use makeFontsConf to generate a fonts.conf containing just
  the Ghostscript fonts (see NIXPKGS-29).
* dot2pdf: generate PDF directly, don't go through PS.  Note that this
  and using fontconfig changes the interpretation of "fontname"
  attributes in dot graphs.

svn path=/nixpkgs/trunk/; revision=12251
 2008-07-03 14:27:19 +00:00
Michael Raskin
dcb7d72481 Wine update 
svn path=/nixpkgs/trunk/; revision=12226
 2008-07-01 03:44:26 +00:00
Eelco Dolstra
aab9aee56e * Wine 1.0. ZOMG! 
svn path=/nixpkgs/trunk/; revision=12142
 2008-06-18 07:23:53 +00:00
Marc Weber
74b5040479 forgetten to appply this patch 
svn path=/nixpkgs/trunk/; revision=12098
 2008-06-15 12:00:00 +00:00
Marc Weber
51651a4ec0 put all source with tags stuff into its own file, now appends tag files to TAG_FILES env var using nix-support 
updated myEnvFun


svn path=/nixpkgs/trunk/; revision=12097
 2008-06-15 11:54:22 +00:00
Eelco Dolstra
7219a09001 * ioquake: updated to 1.34rc3. 
* rss-glx: fixed the build.
* Removed the OpenGL wrapper stuff, it's no longer needed (thanks to
  the RUNPATH you just need to put the appropriate libGL.so in the
  LD_LIBRARY_PATH). 

svn path=/nixpkgs/trunk/; revision=12093
 2008-06-14 20:55:48 +00:00
Eelco Dolstra
02f18d5743 * Wine 1.0rc4. 
svn path=/nixpkgs/trunk/; revision=12079
 2008-06-13 15:34:44 +00:00
Marc Weber
60a651413a added freestyle (non photorealistic renderer) and dependencies libQGLViewer, lib3ds 
svn path=/nixpkgs/trunk/; revision=12009
 2008-06-08 03:56:32 +00:00
Marc Weber
18d227c98d added GetOptions, tar, unix-compat ghc haskell libraries 
svn path=/nixpkgs/trunk/; revision=11940
 2008-05-30 22:37:58 +00:00
Eelco Dolstra
eeb82eb2df * Wine 1.0rc2. 
svn path=/nixpkgs/trunk/; revision=11932
 2008-05-29 15:36:15 +00:00
Eelco Dolstra
80e0fbb261 * Raise the dpi. 
svn path=/nixpkgs/trunk/; revision=11854
 2008-05-20 11:57:40 +00:00
Eelco Dolstra
374ccd290b * runLaTeX: added an option to copy the collected TeX inputs to $out 
(useful when you need to send TeX sources for a paper to a third
  party).

svn path=/nixpkgs/trunk/; revision=11837
 2008-05-16 11:48:46 +00:00
Eelco Dolstra
3042994875 * ImageMagick: don't need to keep old versions I guess. 
* texFunctions.simpleTexToPNG: purity (use our own ImageMagick).

svn path=/nixpkgs/trunk/; revision=11836
 2008-05-16 11:26:23 +00:00
Marc Weber
95dd111ba8 leksah doesnt build yet 
svn path=/nixpkgs/trunk/; revision=11825
 2008-05-14 09:34:08 +00:00
Marc Weber
29fb522f0a missing fetch info 
svn path=/nixpkgs/trunk/; revision=11821
 2008-05-13 13:53:02 +00:00
Marc Weber
c59433ffda updated ghc stuff (added WashNGo, readded support for using local package db) 
svn path=/nixpkgs/trunk/; revision=11819
 2008-05-13 08:40:57 +00:00
Marc Weber
e17c96c881 Support for profiling (all libraries) enabled by custom config 
moved flapjax to ghcExecutables
added haskelldb mysql
added ghc darcs build (left in comments)

svn path=/nixpkgs/trunk/; revision=11742
 2008-04-28 22:27:03 +00:00
Michael Raskin
c9027b1cba Added ConTEXt; cyrillic seems to be fundamentally broken... 
svn path=/nixpkgs/trunk/; revision=11735
 2008-04-28 00:25:42 +00:00
Marc Weber
675af79fb8 hsql updated 
svn path=/nixpkgs/trunk/; revision=11731
 2008-04-27 21:28:00 +00:00
Tobias Hammerschmidt
3490452490 corrected site-lisp directory 
svn path=/nixpkgs/trunk/; revision=11687
 2008-04-22 20:28:25 +00:00
Tobias Hammerschmidt
4e57926353 wine 0.9.60 
svn path=/nixpkgs/trunk/; revision=11659
 2008-04-18 21:08:38 +00:00
Marc Weber
7e2bedae24 +tagsoup hxt libraries, patch for hsql to support new time library 
svn path=/nixpkgs/trunk/; revision=11651
 2008-04-17 15:27:08 +00:00
Marc Weber
f6b653238c added polyparse 
svn path=/nixpkgs/trunk/; revision=11649
 2008-04-16 08:45:50 +00:00
Eelco Dolstra
ec8d275ded * Commented out some stuff that breaks the Nixpkgs release (missing 
files: pg_darcsone.nix and xmonad.nix).

svn path=/nixpkgs/trunk/; revision=11607
 2008-04-12 10:18:48 +00:00
Marc Weber
b9e87b09aa updated cabal version 
svn path=/nixpkgs/trunk/; revision=11576
 2008-04-11 15:39:27 +00:00
Marc Weber
05ebf87bbf missing files previous patch 
svn path=/nixpkgs/trunk/; revision=11565
 2008-04-11 10:22:52 +00:00
Marc Weber
772fd74b99 Updated my ghc stuff. 
New is the file containing executables (such as alex/ happy)
some new libraries
The wrapper no longer installs tags by default. You have to add it to your config
So I'm ready to start merging

svn path=/nixpkgs/trunk/; revision=11554
 2008-04-11 00:40:10 +00:00
Michael Raskin
44644a059f Updated TeXLive source URLs. Converted everything to mirror://debian, switched to dfsg.1.orig where orig unavailable 
svn path=/nixpkgs/trunk/; revision=11493
 2008-04-08 18:00:47 +00:00
Eelco Dolstra
76b73720da * Sometime LaTeX needs 4 passes. 
svn path=/nixpkgs/trunk/; revision=11456
 2008-04-02 15:10:49 +00:00
Tobias Hammerschmidt
d333c4ee09 added xosd 
svn path=/nixpkgs/trunk/; revision=11340
 2008-03-29 00:49:26 +00:00
Tobias Hammerschmidt
402126b350 changed tex dependency of auctex from tetex to texLive 
svn path=/nixpkgs/trunk/; revision=11282
 2008-03-25 11:33:20 +00:00
Tobias Hammerschmidt
0592ed6a11 version update 
svn path=/nixpkgs/trunk/; revision=11268
 2008-03-22 20:49:15 +00:00
Michael Raskin
b7ee7d1999 TeXLive. Now more configurable, and more options included. Beamer class for conference slides added. Before asking questions, look in configurations/misc/raskin.nix or in all-packages.nix . 
svn path=/nixpkgs/trunk/; revision=11257
 2008-03-22 13:04:04 +00:00
Marc Weber
1061800db4 added hsc2hs (makes interfacing C -> haskell easier) 
svn path=/nixpkgs/trunk/; revision=11248
 2008-03-21 01:24:43 +00:00
Michael Raskin
f272e7780b TeXLive. Russian checked - OK 
svn path=/nixpkgs/trunk/; revision=11247
 2008-03-20 20:39:00 +00:00
Marc Weber
df0825351f added wxhaskell (wx,wxcore libs) 
svn path=/nixpkgs/trunk/; revision=11246
 2008-03-20 19:29:52 +00:00
Michael Raskin
5f2bcdbdb6 Some refactorings in builderDefs. Psi is a simple showcase. TeXLive now works as far as English is concerned, and it is also updated up to newest builderDefs. 
svn path=/nixpkgs/trunk/; revision=11235
 2008-03-20 15:40:26 +00:00
Michael Raskin
9d05eb2f2c Removed glibc reference 
svn path=/nixpkgs/trunk/; revision=11219
 2008-03-20 10:22:53 +00:00
Michael Raskin
77d61d38b5 Added TeXLive; still some troubles with texmf; just not to break nix-env -qas * 
svn path=/nixpkgs/trunk/; revision=11216
 2008-03-20 09:52:08 +00:00
Tobias Hammerschmidt
1e2a4064f4 fixed references to /bin/mount and /bin/umount 
svn path=/nixpkgs/trunk/; revision=11204
 2008-03-19 13:08:11 +00:00
Tobias Hammerschmidt
597536e494 version update 
svn path=/nixpkgs/trunk/; revision=11201
 2008-03-19 12:32:44 +00:00
Tobias Hammerschmidt
572e6a28c6 version update 
svn path=/nixpkgs/trunk/; revision=11145
 2008-03-16 12:38:59 +00:00
Marc Weber
eb058a54b3 updated nixRepositoryManager - now supports CVS as well 
svn path=/nixpkgs/trunk/; revision=11131
 2008-03-15 04:45:53 +00:00
Marc Weber
acf8a34a9a used bleeding edge source for synergy. Got different hash from cvs checkout. 
svn path=/nixpkgs/trunk/; revision=11130
 2008-03-15 04:35:29 +00:00
Marc Weber
5695543482 added 2 repos and renamed ghc_68_extra to ghc68extraLibs 
svn path=/nixpkgs/trunk/; revision=11109
 2008-03-13 22:55:18 +00:00
Marc Weber
68e08a006a updated ghc pakcages (now contains gtk2hs and hdbc-postgresql) 
introduced .meta.sourceWithTags (insteod of .passthru.sourceWithTags)
hack to get back all tags :-)

svn path=/nixpkgs/trunk/; revision=11092
 2008-03-13 09:46:12 +00:00
Marc Weber
be448d64fe takusen added 
svn path=/nixpkgs/trunk/; revision=11078
 2008-03-12 11:47:54 +00:00
Tobias Hammerschmidt
5693576572 wine 0.9.57 
svn path=/nixpkgs/trunk/; revision=11071
 2008-03-12 09:50:36 +00:00
Marc Weber
7ad7fe870e now db lib takusen can be used as well 
svn path=/nixpkgs/trunk/; revision=11060
 2008-03-11 15:50:20 +00:00
Marc Weber
d36558d45a moved all the haskell packages within it's own file to keep all-packages smaller (suggested by niksnut) 
svn path=/nixpkgs/trunk/; revision=11050
 2008-03-11 09:18:14 +00:00
Marc Weber
af43b8a024 missing part 
svn path=/nixpkgs/trunk/; revision=11035
 2008-03-10 15:02:29 +00:00
Marc Weber
bad0d45562 jdk updated to 1.5.0.15 
updated bleeding edge stuff (should now work for the bulidfarm as well because
  dist files are stored on my server)
moved experimental my_env into its own file

svn path=/nixpkgs/trunk/; revision=11026
 2008-03-09 00:08:45 +00:00
Eelco Dolstra
f0d8899756 * Remove texinfo/texi2html from tetex (not needed). 
svn path=/nixpkgs/trunk/; revision=10991
 2008-03-06 15:35:47 +00:00
Eelco Dolstra
e410f78c90 * Allow xlock to work with PAM and shadow passwords by passing the 
"--enable-bad-pam" option (this suggests that there is a better way,
  but I haven't found it, except of course not using shadow passwords).

svn path=/nixpkgs/trunk/; revision=10986
 2008-03-06 13:50:01 +00:00
Eelco Dolstra
f212e0380e svn path=/nixpkgs/trunk/; revision=10964 2008-03-05 14:37:41 +00:00
Tobias Hammerschmidt
ff283876db wine 0.9.56 
svn path=/nixpkgs/trunk/; revision=10855
 2008-02-25 19:54:31 +00:00
Ludovic Courtès
cc3ab45e92 Add XLockmore, a screen locker for X11. 
Currently, password authentication doesn't work.

svn path=/nixpkgs/trunk/; revision=10701
 2008-02-15 10:40:20 +00:00
Eelco Dolstra
6e3afdf7da * Wine 0.9.55. 
svn path=/nixpkgs/trunk/; revision=10663
 2008-02-13 19:22:41 +00:00
Eelco Dolstra
960f599215 * Wine 0.9.54. 
svn path=/nixpkgs/trunk/; revision=10554
 2008-02-08 13:12:13 +00:00
Yury G. Kudryashov
5bca69ac34 Nix-expr style review 
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
 2008-01-30 17:20:48 +00:00
Yury G. Kudryashov
2dcb0fa635 ntfs-3g upgraded to 1.1104 
svn path=/nixpkgs/trunk/; revision=10317
 2008-01-28 19:31:32 +00:00
Eelco Dolstra
a5e0e39cdb * makeWrapper: option --run <CMD> to run a command from the wrapper. 
This is so that the Unison wrapper can be generated with
  makeWrapper.
* Use makeWrapper as a buildInput everywhere.
* Updated BitTorrent, cvs2svn.

svn path=/nixpkgs/trunk/; revision=10213
 2008-01-18 11:28:41 +00:00
Eelco Dolstra
777826925d * \input{foo} should look for foo.tex by default. 
svn path=/nixpkgs/trunk/; revision=10176
 2008-01-16 13:28:54 +00:00
Wouter den Breejen
8dd525ab17 Updated wine to 0.9.53. I have tested that it builds. 
svn path=/nixpkgs/trunk/; revision=10144
 2008-01-14 22:33:05 +00:00
Armijn Hemel
12de734949 update to 0.995 
svn path=/nixpkgs/trunk/; revision=10035
 2008-01-01 00:15:19 +00:00
Marc Weber
5a0d090ace maven 2 binary (don't have time for source built right now) 
svn path=/nixpkgs/trunk/; revision=9953
 2007-12-19 00:17:40 +00:00
Marc Weber
9948a92f69 fix provided by Tobias Hammerschmidt to make it compile again 
svn path=/nixpkgs/trunk/; revision=9862
 2007-12-05 12:21:45 +00:00
Marc Weber
ad537e4c85 ntfs progs added 
svn path=/nixpkgs/trunk/; revision=9766
 2007-11-20 22:29:24 +00:00
Wouter den Breejen
8e25a7d6c9 Updated wine to 9.49 
svn path=/nixpkgs/trunk/; revision=9747
 2007-11-17 16:12:39 +00:00
Michael Raskin
43b208bbb9 Fixed synaptics; Added GOCR (not that it is a good OCR); reverted MarcWeber's update to setup-new-2.sh (he has no time to use it in nearest future; later I hope it will be irrelevant) 
svn path=/nixpkgs/trunk/; revision=9613
 2007-11-09 13:54:02 +00:00
Michael Raskin
a8db1746a5 Fixed log nesting; added Qi. 
svn path=/nixpkgs/trunk/; revision=9601
 2007-11-08 14:34:54 +00:00
Eelco Dolstra
a31f7e3a49 * Added dblatex, a DocBook -> PS/PDF/DVI converter. 
svn path=/nixpkgs/trunk/; revision=9569
 2007-11-01 14:37:23 +00:00
Eelco Dolstra
08f647a5e6 * Added a telnet client. 
svn path=/nixpkgs/trunk/; revision=9431
 2007-10-09 09:56:39 +00:00
Marc Weber
a6f18fb565 jack added - compiles - haven't done any testing yet 
svn path=/nixpkgs/trunk/; revision=9403
 2007-10-03 22:38:09 +00:00
Michael Raskin
1bfaf17b14 Bumped Wine version 
svn path=/nixpkgs/trunk/; revision=9393
 2007-10-02 20:06:24 +00:00
Michael Raskin
13551216b3 Corrected synaptics. 
svn path=/nixpkgs/trunk/; revision=9365
 2007-09-24 08:59:29 +00:00
Wouter den Breejen
b67ce21440 Added auctex from mailing list 
svn path=/nixpkgs/trunk/; revision=9345
 2007-09-20 11:32:20 +00:00
Eelco Dolstra
511519f031 * Latest ntfs-3g. 
svn path=/nixpkgs/trunk/; revision=9319
 2007-09-12 21:32:16 +00:00
Marc Weber
088a6817db added: 
dnsmasq, uisp, fltk libixp_for_wmii, acerhk kernel module, reiserfsprogs, radeontools, msmtp,
procmail, pstree, gxemul

changed:
umlutilities to also support building tunctl optionally (needing kernel header files)
wmii updated and wmiimenu added                                                 

svn path=/nixpkgs/trunk/; revision=9242
 2007-09-03 12:10:57 +00:00
Yury G. Kudryashov
045764d028 ntfs-3g added 
svn path=/nixpkgs/trunk/; revision=9234
 2007-09-01 18:15:19 +00:00
Eelco Dolstra
44690411ef * Add fontconfig to Wine's RPATH. 
svn path=/nixpkgs/trunk/; revision=9228
 2007-08-31 12:14:36 +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
Andres Löh
1cb9fc74b7 * added propagated-user-env-packages for lhs2tex and polytable 
svn path=/nixpkgs/trunk/; revision=9195
 2007-08-24 20:15:00 +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
Eelco Dolstra
c9bd5b7397 * Add Wine to the channel. 
svn path=/nixpkgs/trunk/; revision=9191
 2007-08-24 11:37:07 +00:00
Eelco Dolstra
2f21c59a3f * Use FontForge to give Wine better fonts. 
svn path=/nixpkgs/trunk/; revision=9181
 2007-08-21 12:31:33 +00:00
Eelco Dolstra
0481f172f6 * Assert Linux. 
svn path=/nixpkgs/trunk/; revision=9179
 2007-08-21 10:16:34 +00:00
Eelco Dolstra
3a3a9183a1 * Patch to fix Baldur's Gate 2 and other programs. See 
http://bugs.winehq.org/show_bug.cgi?id=6975 and
  http://bugs.winehq.org/show_bug.cgi?id=2398.
  Based on http://bugs.winehq.org/attachment.cgi?id=5708.

svn path=/nixpkgs/trunk/; revision=9178
 2007-08-21 09:10:20 +00:00
Eelco Dolstra
38ace454e9 * Wine locates a lot of libraries dynamically through dlopen(). Add 
them to the RPATH so that the user doesn't have to set them in
  LD_LIBRARY_PATH.

svn path=/nixpkgs/trunk/; revision=9177
 2007-08-21 00:00:23 +00:00
Eelco Dolstra
a8bd020fe0 * Get Wine to work (basically) by linking it against Glibc 2.6 with 
NPTL.  Apparently Wine doesn't work with Glibc 2.5 + LinuxThreads.

svn path=/nixpkgs/trunk/; revision=9165
 2007-08-18 23:58:30 +00:00
Michael Raskin
a00cf21e28 Added broken wine expression. Builds, segfaults. 
svn path=/nixpkgs/trunk/; revision=9080
 2007-08-09 16:39:04 +00:00
Armijn Hemel
dafec33ae9 for some reason the GNU version had some changes, without a version bump. Grmbl. 
svn path=/nixpkgs/trunk/; revision=9074
 2007-08-08 23:51:33 +00:00
Michael Raskin
4d54140043 Various.. Added ircd-hybrid. Added USB support in SANE. Added Xsane. Added gt68xx firmware support. 
svn path=/nixpkgs/trunk/; revision=9070
 2007-08-08 20:33:36 +00:00
Michael Raskin
42f841bcab Added some descriptions. 
svn path=/nixpkgs/trunk/; revision=8920
 2007-06-26 11:49:45 +00:00
Michael Raskin
e342415a12 Added synaptics 
svn path=/nixpkgs/trunk/; revision=8901
 2007-06-20 10:30:03 +00:00
Eelco Dolstra
0f98d91357 * Latest Generator. 
svn path=/nixpkgs/trunk/; revision=8856
 2007-06-09 20:45:01 +00:00
Armijn Hemel
2930ebada7 8.54 -> 8.56 
svn path=/nixpkgs/trunk/; revision=8664
 2007-05-13 19:21:11 +00:00
Eelco Dolstra
473997f01c * Work around a bad Perl interpreter path. 
svn path=/nixpkgs/trunk/; revision=8553
 2007-04-09 23:29:00 +00:00
Eelco Dolstra
5298c1f4c2 * Some disgusting DESTDIR hacking to make sure that state ends up 
under /var instead of $out/var.

svn path=/nixpkgs/trunk/; revision=8533
 2007-04-02 17:30:11 +00:00
Eelco Dolstra
f5daf2b700 * Latest CUPS. 
svn path=/nixpkgs/trunk/; revision=8532
 2007-04-02 16:22:10 +00:00
Eelco Dolstra
a7d27b2201 * Move nix to tools/package-management, and use the latest unstable 
release.

svn path=/nixpkgs/trunk/; revision=8477
 2007-03-29 09:24:14 +00:00
Eelco Dolstra
19d0e47320 * Print a warning if files cannot be found. 
svn path=/nixpkgs/trunk/; revision=8476
 2007-03-29 09:23:47 +00:00
Eelco Dolstra
68d80ff094 * Get rid of the old UML, move uml-utilities to os-specific/linux. 
svn path=/nixpkgs/trunk/; revision=8424
 2007-03-27 11:15:10 +00:00
Eelco Dolstra
7603cb1eba * Latest unstable Nix. 
svn path=/nixpkgs/trunk/; revision=8366
 2007-03-19 22:02:55 +00:00
Eelco Dolstra
1c65a5b328 * A function `simpleTeXToPNG' that typesets a piece of LaTeX code 
(e.g., a file containing something like `$x^2 + y^2 = z^2$') and
  converts it to a PNG image with no unnecessary surrounding
  whitespace.  Useful when you want to include TeX stuff in webpages /
  other documents.

  This currently calls /usr/bin/convert, so we should add ImageMagick.

svn path=/nixpkgs/trunk/; revision=8269
 2007-03-12 18:06:31 +00:00
Eelco Dolstra
ead48be229 * runLaTeX: support generation of Postscript. 
* findLaTeXIncludes: handle the case where the input is already in the
  Nix store, and allow a different prefix to be used for searching
  included files.

svn path=/nixpkgs/trunk/; revision=8268
 2007-03-12 17:55:08 +00:00
Eelco Dolstra
c9c70b8d75 * Don't propagate the teTeX dependency. 
svn path=/nixpkgs/trunk/; revision=8262
 2007-03-12 12:56:06 +00:00
Eelco Dolstra
cf04579cc5 * Added pgf/tikz. 
* runLaTeX: allow additional TeX packages to be specified.
* teTeX setup hook: TEXMFNIX doesn't seem to work, use TEXINPUTS.

svn path=/nixpkgs/trunk/; revision=8261
 2007-03-10 23:51:59 +00:00
Eelco Dolstra
c467d6e5e6 * Doh doh doh. 
svn path=/nixpkgs/trunk/; revision=8138
 2007-03-01 15:50:14 +00:00
Eelco Dolstra
56e0e2fbea * Latest unstable Nix. Add OpenSSL as a dependency. 
svn path=/nixpkgs/trunk/; revision=8137
 2007-03-01 15:44:23 +00:00
Eelco Dolstra
e0ab9dda82 svn path=/nixpkgs/trunk/; revision=8089 2007-02-28 00:46:17 +00:00
Eelco Dolstra
f36270a522 svn path=/nixpkgs/trunk/; revision=8027 2007-02-22 21:11:12 +00:00
Eelco Dolstra
870762bc75 svn path=/nixpkgs/trunk/; revision=8024 2007-02-22 17:53:55 +00:00
Eelco Dolstra
8f6878f7ee * Latest unstable Nix. 
svn path=/nixpkgs/trunk/; revision=8017
 2007-02-22 14:55:18 +00:00
Eelco Dolstra
9767f074c4 svn path=/nixpkgs/trunk/; revision=7861 2007-02-06 14:28:40 +00:00
Eelco Dolstra
4a3bff8a19 svn path=/nixpkgs/trunk/; revision=7816 2007-01-30 14:39:01 +00:00
Eelco Dolstra
7863e1a2be * Latest unstable Nix. 
svn path=/nixpkgs/trunk/; revision=7785
 2007-01-23 19:09:13 +00:00
Eelco Dolstra
617abe91e8 * Latest unstable Nix. 
svn path=/nixpkgs/trunk/; revision=7695
 2007-01-16 14:11:20 +00:00
Eelco Dolstra
6eaa664a97 * Latest unstable Nix. 
svn path=/nixpkgs/trunk/; revision=7670
 2007-01-15 11:57:24 +00:00
Armijn Hemel
044b8aa637 1.2.2.1 
1.3.1

svn path=/nixpkgs/trunk/; revision=7530
 2007-01-01 19:41:53 +00:00
Eelco Dolstra
bbe62e266b * Remove references to dontMakeInstall. 
svn path=/nixpkgs/trunk/; revision=7500
 2006-12-27 18:24:26 +00:00
Eelco Dolstra
b0bb9f21ee * Add some stuff to the channel. 
* Latest unstable Nix.

svn path=/nixpkgs/trunk/; revision=7389
 2006-12-18 17:58:50 +00:00
Eelco Dolstra
e7304dcf48 * Use the latest unstable release. 
svn path=/nixpkgs/trunk/; revision=7329
 2006-12-13 11:22:34 +00:00
Eelco Dolstra
3a4312f263 * Latest unstable version. 
svn path=/nixpkgs/trunk/; revision=7274
 2006-12-07 22:50:15 +00:00
Eelco Dolstra
9485d4a320 * Support \pgfimage. 
svn path=/nixpkgs/trunk/; revision=7087
 2006-11-22 07:06:10 +00:00
Eelco Dolstra
265c313feb * Revive nixUnstable. 
svn path=/nixpkgs/trunk/; revision=7060
 2006-11-17 12:49:46 +00:00
Eelco Dolstra
769c44da98 * Get User Mode Linux to compile again: 
- Hack to make it work with the latest host kernel headers
    (2.6.18.1).
  - Don't call depmod impurily, rather use oldskool modutils.
  - modutils: use the final version, and use GCC 3.4 to compile it
    (4.1 doesn't work).

svn path=/nixpkgs/trunk/; revision=6908
 2006-10-30 13:45:48 +00:00
Eelco Dolstra
203c8a1f3c * Disable transformers, strace; they don't build anymore. 
svn path=/nixpkgs/trunk/; revision=6900
 2006-10-29 00:36:17 +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
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
7d16a56b6f * Nix: no longer need a builder, use an external bzip2, removed 
nix-unstable.

svn path=/nixpkgs/trunk/; revision=6702
 2006-10-11 15:31:52 +00:00
Eelco Dolstra
29a457c5b0 * Use Nix 0.10.1. 
svn path=/nixpkgs/trunk/; revision=6695
 2006-10-11 12:25:40 +00:00
Armijn Hemel
22dbea9161 upgrade to 0.10 
svn path=/nixpkgs/trunk/; revision=6679
 2006-10-08 22:04:44 +00:00
Armijn Hemel
0f68b0c9e1 new unstable Nix 
svn path=/nixpkgs/trunk/; revision=6630
 2006-10-01 14:13:08 +00:00
Eelco Dolstra
8b7597ea85 * rss-glx 0.8.1. 
svn path=/nixpkgs/trunk/; revision=6623
 2006-09-29 10:27:20 +00:00
Eelco Dolstra
4287f142bb * Testing for release. 
svn path=/nixpkgs/trunk/; revision=6614
 2006-09-27 11:22:22 +00:00
Armijn Hemel
1e435ca929 bump version 
svn path=/nixpkgs/trunk/; revision=6603
 2006-09-24 22:08:53 +00:00
Eelco Dolstra
af3721de0a * Slightly evil: compress the log file to prevent TeX output from 
retaining a dependency on teTeX.

svn path=/nixpkgs/trunk/; revision=6559
 2006-09-19 12:13:37 +00:00
Armijn Hemel
0e0bc82f76 update nix-unstable to the latest successful build from teh buildfarm. Mooh! 
svn path=/nixpkgs/trunk/; revision=6475
 2006-09-08 11:58:52 +00:00
Armijn Hemel
992a3da5e2 update to 0.10pre6453 
svn path=/nixpkgs/trunk/; revision=6454
 2006-09-04 17:57:06 +00:00
Eelco Dolstra
51ca4a6a91 * Various purity fixes for Ghostscript. 
svn path=/nixpkgs/trunk/; revision=6452
 2006-09-04 11:01:37 +00:00
Eelco Dolstra
059b3f0669 * Grmbl grmbl. 
svn path=/nixpkgs/trunk/; revision=6451
 2006-09-04 10:10:21 +00:00
Armijn Hemel
cdfc9e4b0c build more tools 
svn path=/nixpkgs/trunk/; revision=6270
 2006-08-27 13:07:25 +00:00
Armijn Hemel
ab1557ee96 update to a new version 
svn path=/nixpkgs/trunk/; revision=6212
 2006-08-23 15:53:28 +00:00
Eelco Dolstra
76eb096fac * Another (better) Atari emulator. It doesn't quite work out of the 
box yet because for some reason it needs libX11 and libXext in the
  LD_LIBRARY_PATH...

svn path=/nixpkgs/trunk/; revision=6114
 2006-08-14 09:26:53 +00:00
Eelco Dolstra
37832b3af0 * Atari800 - an 8-bit Atari emulator. 
svn path=/nixpkgs/trunk/; revision=6110
 2006-08-12 22:33:51 +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
6742ffca0f update to 0.10pre6069 
svn path=/nixpkgs/trunk/; revision=6070
 2006-08-07 20:46:17 +00:00
Armijn Hemel
e7bf53481a add a few more config options 
svn path=/nixpkgs/trunk/; revision=6061
 2006-08-06 23:52:55 +00:00
Armijn Hemel
154aac88de make x86 the default right now. Add a configuration for x86, that builds enough tools for NixOS 
svn path=/nixpkgs/trunk/; revision=6060
 2006-08-06 22:24:48 +00:00
Armijn Hemel
68e7009fcc update to pre6052, remove patches, since these are in Nix now 
svn path=/nixpkgs/trunk/; revision=6053
 2006-08-05 09:44:26 +00:00
Armijn Hemel
0345f37f1c update to nix-0.10pre6047, remove patch, since it is no longer needed 
svn path=/nixpkgs/trunk/; revision=6050
 2006-08-05 00:28:06 +00:00
Armijn Hemel
b60bc10218 prepare for having configs for different architectures 
svn path=/nixpkgs/trunk/; revision=6040
 2006-08-03 22:23:08 +00:00
Armijn Hemel
604ca29bf0 add patches: 
* nix-0.10pre5896-paths.patch :: this path adds coreutils to the searchpath,
so nix-prefetch-url can find "basename"
* nix-0.10pre5896-chroot-once.patch :: unsets NIX_ROOT in various scripts,
to prevent that when NIX_ROOT is set and one of the nix tools is called that
chroot() is performed once more

svn path=/nixpkgs/trunk/; revision=6023
 2006-08-02 20:44:17 +00:00
Armijn Hemel
d3370dfb36 workaround for problem with "date" not being in the path when using manifests on NixOS...better solution would be to switch to the Perl equivalent of "date" 
svn path=/nixpkgs/trunk/; revision=6020
 2006-08-02 16:56:34 +00:00
Armijn Hemel
db8288bf5b only nuke references to glibc in the statically linked binaries, not the 
references to perl, nix, and so on in the scripts.

TODO: statically link the bzip2/bunzip2/etc. tools in $nix/libexec

svn path=/nixpkgs/trunk/; revision=6018
 2006-08-02 11:05:04 +00:00
Armijn Hemel
2f5ec262a8 nuke references to glibc...this should become a generic function somewhere... 
svn path=/nixpkgs/trunk/; revision=6017
 2006-08-02 10:52:32 +00:00
Armijn Hemel
aefc9586ec statically linked Nix. This should come in handy for installers...I hope... 
svn path=/nixpkgs/trunk/; revision=6016
 2006-08-02 10:43:27 +00:00
Armijn Hemel
0ac74d23dc some NIX_ROOT fixes 
svn path=/nixpkgs/trunk/; revision=6015
 2006-08-01 18:32:24 +00:00
Armijn Hemel
9ef3ae26c7 use latest nix unstable release 
svn path=/nixpkgs/trunk/; revision=6009
 2006-08-01 10:40:09 +00:00
Armijn Hemel
4dca405b3d 1.0.17 -> 1.0.18 
hotplug -> udev

svn path=/nixpkgs/trunk/; revision=6001
 2006-07-31 13:29:02 +00:00
Armijn Hemel
452c3350d8 new version of nix-unstable, commit 5700! 
svn path=/nixpkgs/trunk/; revision=5700
 2006-07-13 15:14:43 +00:00
Armijn Hemel
9c4f2df76b bugfix version 
svn path=/nixpkgs/trunk/; revision=5664
 2006-07-08 10:45:08 +00:00
Armijn Hemel
90b7d18c5d add expression for busybox 1.2, good config is still missing 
svn path=/nixpkgs/trunk/; revision=5663
 2006-07-08 10:07:57 +00:00
Armijn Hemel
6a2707c075 config is not portable, restructure 
svn path=/nixpkgs/trunk/; revision=5662
 2006-07-08 10:03:35 +00:00
Armijn Hemel
805c2e221d bugfix release of busybox 
svn path=/nixpkgs/trunk/; revision=5661
 2006-07-08 09:59:09 +00:00
Armijn Hemel
9ebca86ec6 add new ghostscript 
svn path=/nixpkgs/trunk/; revision=5660
 2006-07-08 09:54:44 +00:00
Armijn Hemel
563624911c update to pre5609 
svn path=/nixpkgs/trunk/; revision=5653
 2006-07-07 13:14:07 +00:00
Armijn Hemel
febd8ffe69 * update nixUnstable to nix-0.10pre5529 
* remove patch for 0.9.2, because it is ancient history!

svn path=/nixpkgs/trunk/; revision=5605
 2006-07-06 10:15:25 +00:00
Eelco Dolstra
a4d3fde9d5 * Follow \bibliographystyle to find .bst files. 
svn path=/nixpkgs/trunk/; revision=5590
 2006-07-05 13:39:22 +00:00
Armijn Hemel
6d5a7bd6df update to a newer unstable Nix 
svn path=/nixpkgs/trunk/; revision=5578
 2006-07-04 18:42:58 +00:00
Eelco Dolstra
6121806948 * Follow \usepackage. 
svn path=/nixpkgs/trunk/; revision=5436
 2006-06-14 10:11:21 +00:00
Eelco Dolstra
285756b5b0 * Latest version. 
svn path=/nixpkgs/trunk/; revision=5247
 2006-05-01 19:16:12 +00:00
Armijn Hemel
b44c8726c7 add an expression for the latest and greatest version of Nix 
svn path=/nixpkgs/trunk/; revision=5232
 2006-04-28 12:34:54 +00:00
Roy van den Broek
6860ccf4b9 Make sure Trac is built on a Linux machine, since it requires a 
lot of patching (and therefore doesn't work) on OS X.


svn path=/nixpkgs/trunk/; revision=5201
 2006-04-24 16:17:32 +00:00
Roy van den Broek
3c8a7d98b0 * Added ClearSilver 0.10.3. 
* Added SQLite 3.3.
* Added PySQLite 2.2.2.
* Added Trac 0.9.5. To get you started; a new project environment is
  created by executing:

    $ trac-admin /path/to/trac_project_env initenv

  Running the server can be done by executing:

    $ tracd --port 8000 /path/to/projectenv

  Trac is then available at http://localhost:8000/projectenv. More
  information available at http://www.edgewall.com/trac/.


svn path=/nixpkgs/trunk/; revision=5195
 2006-04-22 18:08:37 +00:00
Eelco Visser
00bdbb7fff dot2ps 
svn path=/nixpkgs/trunk/; revision=5152
 2006-04-11 13:27:01 +00:00
Roy van den Broek
1b9e08ee8e D'oh! Only download one version of the maven-axis-plugin... 
svn path=/nixpkgs/trunk/; revision=5139
 2006-04-04 09:30:09 +00:00
Roy van den Broek
6d47926bad By default install the axis-maven and jira-soap plugin. This should probably 
be done with some sort of wrapper, such that the plugins aren't installed
by default.


svn path=/nixpkgs/trunk/; revision=5133
 2006-04-02 17:12:52 +00:00
Roy van den Broek
de468583ce Added Maven 1.0.2. 
svn path=/nixpkgs/trunk/; revision=5132
 2006-03-31 12:44:06 +00:00
Roy van den Broek
9bd2e741a9 Added Maven 2.0.3. 
svn path=/nixpkgs/trunk/; revision=5131
 2006-03-31 12:10:20 +00:00
Eelco Dolstra
acf47a1bb8 * Prevent unnecessary LaTeX runs. 
svn path=/nixpkgs/trunk/; revision=5082
 2006-03-23 14:34:17 +00:00
Armijn Hemel
36e57ebead add busybox, a small replacement for most Unix utilities, often used on 
embedded systems and installation CDs. Hopefully this will decrease the size
of things we use on the NixOS installation CD. Only tested in a cross-compile
for MIPS so far.

svn path=/nixpkgs/trunk/; revision=4968
 2006-03-02 18:05:21 +00:00
Eelco Dolstra
321e4da7e8 * Copy more files. 
svn path=/nixpkgs/trunk/; revision=4646
 2006-01-31 16:37:40 +00:00
Armijn Hemel
0d3400daf9 add udev rules, but make them optional (default == off) 
svn path=/nixpkgs/trunk/; revision=4643
 2006-01-31 16:00:05 +00:00
Armijn Hemel
761dceaaae fix a comparison in the test 
svn path=/nixpkgs/trunk/; revision=4642
 2006-01-31 15:53:58 +00:00
Armijn Hemel
0c6fa511b9 add linuxwacom. Now, this is still without the driver for X (even though 
I don't know how that has to be used in X)

svn path=/nixpkgs/trunk/; revision=4640
 2006-01-31 15:18:27 +00:00
Armijn Hemel
13398fe348 remove some assertions 
svn path=/nixpkgs/trunk/; revision=4634
 2006-01-31 13:01:58 +00:00
Armijn Hemel
3ce62c7a5e add hotplugging stuff conditionally 
svn path=/nixpkgs/trunk/; revision=4633
 2006-01-31 12:59:06 +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
Armijn Hemel
9cb897da18 update to 1.0.17, put some stuff in place for hotplugging support... 
svn path=/nixpkgs/trunk/; revision=4620
 2006-01-30 15:29:26 +00:00
Eelco Dolstra
3ba77c1b40 * Get the Unreal Tournament 2004 demo to work with the new scheme for 
handling OpenGL.

svn path=/nixpkgs/trunk/; revision=4616
 2006-01-30 11:44:39 +00:00
Eelco Dolstra
105150e281 * Added rss-glx, a collection of nice OpenGL screensavers. 
svn path=/nixpkgs/trunk/; revision=4614
 2006-01-28 02:10:26 +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
088688e47e download locations should not move... 
svn path=/nixpkgs/trunk/; revision=4538
 2006-01-11 18:58:58 +00:00
Eelco Dolstra
82e678362f * "." -> "source". 
svn path=/nixpkgs/trunk/; revision=4335
 2005-12-05 14:11:09 +00:00
Eelco Dolstra
b13100fbdc * Added Dosbox, a DOS (x86) emulator. 
svn path=/nixpkgs/trunk/; revision=4331
 2005-12-03 02:32:02 +00:00
Eelco Dolstra
b6befed50e * Updated SDL, NASM and Generator to the latest versions. 
* Moved Generator to the misc/emulators directory.

svn path=/nixpkgs/trunk/; revision=4330
 2005-12-03 01:33:18 +00:00
Eelco Dolstra
d68e567fe3 * Enable option to compress multiple spaces in the index. 
svn path=/nixpkgs/trunk/; revision=4314
 2005-11-28 14:19:46 +00:00
Armijn Hemel
c2732d31c7 add sane-backends 
svn path=/nixpkgs/trunk/; revision=4208
 2005-11-03 17:20:38 +00:00
Armijn Hemel
d5b2a3cfe2 add cups. This is not complete, it misses PAM, SSL and a lot of other support... 
svn path=/nixpkgs/trunk/; revision=4113
 2005-10-21 13:06:08 +00:00
Armijn Hemel
696f46f737 add a patch to correctly use coreutils to create a profile. This is needed for NixOS, where we might not know our PATH in advance. 
svn path=/nixpkgs/trunk/; revision=4066
 2005-10-11 17:29:37 +00:00
Eelco Dolstra
e11a1e014c * Also copy the generated bibliography (*.bbl) to $out. 
svn path=/nixpkgs/trunk/; revision=3992
 2005-10-02 15:49:09 +00:00
Eelco Dolstra
ce5beb6a35 * Nix updated to 0.9.2. 
svn path=/nixpkgs/trunk/; revision=3961
 2005-09-29 12:36:49 +00:00
Eelco Dolstra
7fccd83384 * Support \pgfdeclareimage. 
svn path=/nixpkgs/trunk/; revision=3771
 2005-09-02 15:50:55 +00:00
Eelco Dolstra
e468256879 * X11 support in Ghostscript. 
svn path=/nixpkgs/trunk/; revision=3751
 2005-08-30 13:50:14 +00:00
Eelco Dolstra
860e14cd3d * Support references to parent directories, e.g., \input{../../macros.ltx}. 
svn path=/nixpkgs/trunk/; revision=3748
 2005-08-30 13:10:30 +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
Eelco Dolstra
8c1905ce5b * Print the page count. 
svn path=/nixpkgs/trunk/; revision=3592
 2005-08-16 21:53:46 +00:00
Eelco Dolstra
b40cfcf0f5 * Suppress most of that crap TeX spews over your screen. Print a 
summary of the under/overfull boxes and undefined
  references/citations.  The full log output is still written to
  $out/log.

svn path=/nixpkgs/trunk/; revision=3590
 2005-08-16 20:59:39 +00:00
Eelco Dolstra
f0d6ad6071 * Use sourceforge (more stable). 
svn path=/nixpkgs/trunk/; revision=3326
 2005-07-13 07:23:55 +00:00
Eelco Dolstra
b5a41376a7 * Don't use `seq'. 
svn path=/nixpkgs/trunk/; revision=3281
 2005-07-01 20:16:56 +00:00
Eelco Dolstra
d33693c438 * Support PNG files. 
svn path=/nixpkgs/trunk/; revision=3258
 2005-06-27 16:48:00 +00:00
Eelco Dolstra
6ea37d567f * A function for dot animation. 
svn path=/nixpkgs/trunk/; revision=3255
 2005-06-27 09:44:27 +00:00
Eelco Dolstra
1751b6481d * Process \includegraphics{filename}. 
svn path=/nixpkgs/trunk/; revision=3237
 2005-06-21 20:34:15 +00:00
Eelco Dolstra
3919b35495 * Add a dot2pdf function. 
svn path=/nixpkgs/trunk/; revision=3232
 2005-06-20 22:43:35 +00:00
Eelco Dolstra
fe0981babd * Scan for BibTeX files included by \bibliography. 
* Automatically run BibTeX when necessary (i.e., when there are
  \citations in the aux file).

svn path=/nixpkgs/trunk/; revision=3222
 2005-06-20 15:20:37 +00:00
Eelco Dolstra
6ce80304a5 * Handle subdirectories (e.g., \input{foo/bar.tex}). We don't yet 
handle relative paths to parent directories (../foo/bar.tex).  This
  can be handled as was done in
  https://svn.cs.uu.nl:12443/repos/trace/nix/trunk/make/lib/compile-c.sh.
  The `copy-includes.pl' script is generic (not LaTeX specific), so it
  should eventually replace most of compile-c.sh and any future
  builders that have to set up a tree of symlinks to simulate the
  original directory hierarchy of the sources.

svn path=/nixpkgs/trunk/; revision=3220
 2005-06-20 15:06:58 +00:00
Eelco Dolstra
2cc66184ce * Oops. 
svn path=/nixpkgs/trunk/; revision=3218
 2005-06-20 14:26:07 +00:00
Eelco Dolstra
6b35cefbf8 * Find LaTeX document dependencies automatically by scanning for 
\input and \documentclass.  Copied from Maak
  (https://svn.cs.uu.nl:12443/repos/pkgs/texwrappers/trunk/chase-latex-inputs.pl).

  TODO: support \bibliography, \usepackage, \includegraphics, etc.

svn path=/nixpkgs/trunk/; revision=3217
 2005-06-20 14:25:50 +00:00
Eelco Dolstra
6fcee91442 * Macros for building LaTeX documents using Nix. 
svn path=/nixpkgs/trunk/; revision=3216
 2005-06-20 13:51:48 +00:00
Eelco Dolstra
01cc75d092 * Added GPL Ghostscript 8.15. 
svn path=/nixpkgs/trunk/; revision=2941
 2005-04-29 13:23:15 +00:00
Eelco Dolstra
d6a1bfe1dc * Added teTeX 3.0. Sure, it may take up 267M of disk space, but it 
contains everything you could possibly need, including beamer ;-)

  This teTeX has been built without X11 support, meaning that xdvi is
  not included.

svn path=/nixpkgs/trunk/; revision=2931
 2005-04-28 21:10:33 +00:00
Eelco Dolstra
09cea66748 * Nix updated to 0.8.1. 
svn path=/nixpkgs/trunk/; revision=2558
 2005-04-16 11:37:56 +00:00
Eelco Dolstra
3edb5db85d * Doh! 
svn path=/nixpkgs/trunk/; revision=2548
 2005-04-12 13:51:20 +00:00
Eelco Dolstra
23c1cac94d * Nix updated to 0.8. 
svn path=/nixpkgs/trunk/; revision=2547
 2005-04-12 13:49:34 +00:00
Eelco Dolstra
ce52a3635d * Nix updated to 0.7. 
svn path=/nixpkgs/trunk/; revision=2300
 2005-02-25 12:05:16 +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
8a8b28a87b * Nix updated to 0.6. 
svn path=/nixpkgs/trunk/; revision=1899
 2004-12-17 13:49:08 +00:00
Eelco Dolstra
9da3f23a89 * UML updated to 2.4.27-1. 
svn path=/nixpkgs/trunk/; revision=1845
 2004-12-09 19:48:40 +00:00
Eelco Dolstra
50d021364a * Build UML with gcc 3.3, since gcc 3.4 makes it crash at startup. 
svn path=/nixpkgs/trunk/; revision=1524
 2004-09-27 19:50:58 +00:00
Eelco Dolstra
92c40ea0d8 * Nix updated to 0.6pre1465. 
svn path=/nixpkgs/trunk/; revision=1480
 2004-09-21 15:25:50 +00:00
Eelco Dolstra
dde13d1ada * Remove patch arguments. 
svn path=/nixpkgs/trunk/; revision=1462
 2004-09-19 10:34:01 +00:00
Eelco Dolstra
b9b9e8b29e * UML 2.4.24-2 is less buggy. 
svn path=/nixpkgs/trunk/; revision=1209
 2004-07-31 17:29:10 +00:00
Eelco Dolstra
b63ec4b441 * UML 2.4.25. 
svn path=/nixpkgs/trunk/; revision=1197
 2004-07-29 20:20:59 +00:00
Eelco Dolstra
73ad8265a8 * Ugh. Typo. 
svn path=/nixpkgs/trunk/; revision=959
 2004-04-21 11:12:45 +00:00
Eelco Dolstra
7a1b8bfb71 * Upgrade to 0.5pre957 and pass `--disable-init-state'. 
svn path=/nixpkgs/trunk/; revision=958
 2004-04-21 11:08:36 +00:00
Eelco Dolstra
11f838c363 * Add dependency on Curl. 
svn path=/nixpkgs/trunk/; revision=931
 2004-04-08 14:17:47 +00:00
Eelco Dolstra
f1d1900a92 * Upgraded Nix to the latest version. 
svn path=/nixpkgs/trunk/; revision=929
 2004-04-08 13:50:29 +00:00
Eelco Dolstra
5c9232e063 * Fix UML - poorly. 
svn path=/nixpkgs/trunk/; revision=901
 2004-04-01 20:12:54 +00:00
Eelco Dolstra
0376334dde * New Nix release. 
svn path=/nixpkgs/trunk/; revision=886
 2004-03-31 10:19:01 +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
08dbd48e8d * Newer version. 
svn path=/nixpkgs/trunk/; revision=808
 2004-02-19 16:24:43 +00:00
Eelco Dolstra
cd0e06b9ef * Added the UML utilities (in particular for tunctl). mconsole is 
not built since it requires readline, which we don't have right now.

svn path=/nixpkgs/trunk/; revision=804
 2004-02-18 16:22:31 +00:00
Eelco Dolstra
5eea59c2cd * Use separate Berkeley DB and ATerm. 
svn path=/nixpkgs/trunk/; revision=793
 2004-02-16 16:54:01 +00:00
Eelco Dolstra
d113da8bab * Added a Nix expression for Nix. 
svn path=/nixpkgs/trunk/; revision=790
 2004-02-16 15:40:55 +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