philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

4560 commits

Author SHA1 Message Date
Tobias Hammerschmidt ff87b2ffa9 version update 
svn path=/nixpkgs/trunk/; revision=11495
 2008-04-08 18:19:15 +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
Michael Raskin 2b9c9ab559 Added Lazarus IDE for Free Pascal Compiler. 
svn path=/nixpkgs/trunk/; revision=11492
 2008-04-08 15:11:34 +00:00
Michael Raskin 14eeb7fb50 Added Lazarus IDE for Free Pascal Compiler 
svn path=/nixpkgs/trunk/; revision=11491
 2008-04-08 15:10:09 +00:00
Eelco Dolstra 8a60c1726d * Removed some unused files. 
svn path=/nixpkgs/trunk/; revision=11486
 2008-04-08 10:44:06 +00:00
Ludovic Courtès d0d98958d2 Python 2.5: Add GDBM support. 
svn path=/nixpkgs/trunk/; revision=11485
 2008-04-08 07:37:49 +00:00
Ludovic Courtès 1f161a2789 Add GDBM, a key/value database library. 
svn path=/nixpkgs/trunk/; revision=11480
 2008-04-06 23:18:25 +00:00
Ludovic Courtès b5e0ee02aa cvs: Use SHA256 instead of MD5. 
svn path=/nixpkgs/trunk/; revision=11473
 2008-04-06 20:43:39 +00:00
Ludovic Courtès 07e3e56082 cvsps: Add Debian patches. 
svn path=/nixpkgs/trunk/; revision=11472
 2008-04-06 20:04:40 +00:00
Marc Weber 1923d17a7d gegl added (needs recent glibc) 
svn path=/nixpkgs/trunk/; revision=11465
 2008-04-04 20:57:09 +00:00
Eelco Dolstra 15a322f887 * php_unstable: caused nix-env to barf on FreeBSD. 
svn path=/nixpkgs/trunk/; revision=11464
 2008-04-04 18:49:49 +00:00
Eelco Dolstra 6fa8de41fa * Referring to stdenv.coreutils breaks on FreeBSD. 
svn path=/nixpkgs/trunk/; revision=11463
 2008-04-04 18:24:41 +00:00
Wouter den Breejen afc76c65c6 Firefox 3.5beta 
svn path=/nixpkgs/trunk/; revision=11462
 2008-04-04 17:37:57 +00:00
Marc Weber 9e83312bd1 svn path=/nixpkgs/trunk/; revision=11461 2008-04-04 16:58:19 +00:00
Marc Weber b82c4debb8 Added babl (pixel image transformation library usesd by gegl) 
svn path=/nixpkgs/trunk/; revision=11460
 2008-04-04 15:11:27 +00:00
Michael Raskin 359fc13fc6 Looks like needed to build php 
svn path=/nixpkgs/trunk/; revision=11459
 2008-04-03 06:01:08 +00:00
Ludovic Courtès 4a4e9a87f5 Add Bigloo, a fast Scheme compiler. 
svn path=/nixpkgs/trunk/; revision=11458
 2008-04-02 20:54:42 +00:00
Michael Raskin a693c53ec4 Attempts to get LLVM-gcc working are not yet succesful; but builder-defs updates are useful. 
svn path=/nixpkgs/trunk/; revision=11457
 2008-04-02 19:55:40 +00:00
Eelco Dolstra 76b73720da * Sometime LaTeX needs 4 passes. 
svn path=/nixpkgs/trunk/; revision=11456
 2008-04-02 15:10:49 +00:00
Sander van der Burg 99d512a41f Added hacky fetchsvn component which allows users to fetch code over svn+ssh 
svn path=/nixpkgs/trunk/; revision=11455
 2008-04-02 13:28:55 +00:00
Marc Weber d453801a76 added missing dependency gnumake to bigloo 
svn path=/nixpkgs/trunk/; revision=11454
 2008-04-02 12:41:33 +00:00
Marc Weber 0b6e4828cc added php curl support 
svn path=/nixpkgs/trunk/; revision=11446
 2008-04-01 18:16:01 +00:00
Ludovic Courtès 9231ea99d9 hibernate: Fix impurities. 
svn path=/nixpkgs/trunk/; revision=11445
 2008-04-01 17:31:31 +00:00
Michael Raskin bd9b19c180 GNU Fortran from GCC 4.2 works now 
svn path=/nixpkgs/trunk/; revision=11442
 2008-04-01 16:54:05 +00:00
Michael Raskin 9b67b4ba0f Updated MPFR 
svn path=/nixpkgs/trunk/; revision=11441
 2008-04-01 16:53:18 +00:00
Ludovic Courtès 415a837c3d Add `hibernate', an swsusp/Tux-on-Ice convenience script. 
svn path=/nixpkgs/trunk/; revision=11438
 2008-04-01 14:02:54 +00:00
Ludovic Courtès aa720c8431 Add At, the classical Unix command scheduler. 
svn path=/nixpkgs/trunk/; revision=11434
 2008-04-01 09:08:17 +00:00
Armijn Hemel d784268531 abiword 2.6.0 
svn path=/nixpkgs/trunk/; revision=11398
 2008-03-31 21:41:18 +00:00
Sander van der Burg 9dccbcfc55 Resolved issue with hard-corded path to /sbin/stty 
svn path=/nixpkgs/trunk/; revision=11389
 2008-03-31 12:57:12 +00:00
Ludovic Courtès b936188ce8 Add Quack, an Emacs mode for Scheme. 
svn path=/nixpkgs/trunk/; revision=11388
 2008-03-31 12:22:39 +00:00
Ludovic Courtès 2d5d545818 Git: Fix more impurities. 
svn path=/nixpkgs/trunk/; revision=11373
 2008-03-30 22:19:20 +00:00
Ludovic Courtès 1a64758585 Add Linux nfs-utils. 
svn path=/nixpkgs/trunk/; revision=11367
 2008-03-30 17:42:49 +00:00
Ludovic Courtès 553a3af3ce Update GNU Freefont. 
svn path=/nixpkgs/trunk/; revision=11344
 2008-03-29 22:07:15 +00:00
Tobias Hammerschmidt d333c4ee09 added xosd 
svn path=/nixpkgs/trunk/; revision=11340
 2008-03-29 00:49:26 +00:00
Tobias Hammerschmidt 87176f8dd3 doh 
svn path=/nixpkgs/trunk/; revision=11321
 2008-03-28 12:00:48 +00:00
Michael Raskin fa40aa96f5 Added ddrescue 
svn path=/nixpkgs/trunk/; revision=11320
 2008-03-28 11:59:50 +00:00
Tobias Hammerschmidt ff2fe8dce9 version update 
svn path=/nixpkgs/trunk/; revision=11319
 2008-03-28 11:58:36 +00:00
Michael Raskin 58a111421e Added jfsrec - JFS recovery tool 
svn path=/nixpkgs/trunk/; revision=11318
 2008-03-28 11:16:43 +00:00
Tobias Hammerschmidt 62478d6e0e lyx version update, use texLive instead of tetex 
svn path=/nixpkgs/trunk/; revision=11315
 2008-03-27 23:33:10 +00:00
Michael Raskin 112c78fa5c Added JFS utils and XFS progs 
svn path=/nixpkgs/trunk/; revision=11313
 2008-03-27 19:12:14 +00:00
Eelco Dolstra aa2a573225 * Latest unstable version. 
svn path=/nixpkgs/trunk/; revision=11310
 2008-03-27 17:54:17 +00:00
Ludovic Courtès 9ff94543d0 Add `doCheck = true' for GNU libcdio and GNU Idutils. 
svn path=/nixpkgs/trunk/; revision=11308
 2008-03-27 15:27:30 +00:00
Ludovic Courtès e63159998b Add R[345]RS, revisions of the Report on the Algorithmic Language Scheme. 
svn path=/nixpkgs/trunk/; revision=11307
 2008-03-27 14:40:08 +00:00
Eelco Dolstra f19b97924c svn path=/nixpkgs/trunk/; revision=11302 2008-03-27 13:39:23 +00:00
Marc Weber 2a42a77223 using throw instead of abort to not make the buildfarm fail 
svn path=/nixpkgs/trunk/; revision=11301
 2008-03-27 12:23:27 +00:00
Ludovic Courtès 9383efc9ba Add GNU Idutils, a text searching utility. 
svn path=/nixpkgs/trunk/; revision=11300
 2008-03-27 11:09:40 +00:00
Marc Weber 8c3e522f79 gitsvn wrapper adding needed perl libs to environment so that you can use git-svn out of the box 
svn path=/nixpkgs/trunk/; revision=11299
 2008-03-27 10:57:54 +00:00
Eelco Dolstra 67af514783 * Another purity fix: don't check for /usr/include/linux/aio.h. 
svn path=/nixpkgs/trunk/; revision=11298
 2008-03-27 10:22:12 +00:00
Tobias Hammerschmidt 9f0f6cb5ec version update 
svn path=/nixpkgs/trunk/; revision=11297
 2008-03-27 09:46:03 +00:00
Ludovic Courtès 25ea32dc11 Ploticus: Install prefabs and wrapper script. 
svn path=/nixpkgs/trunk/; revision=11295
 2008-03-26 23:42:29 +00:00
Tobias Hammerschmidt 7cc6405859 firefox 2.0.0.13 
svn path=/nixpkgs/trunk/; revision=11294
 2008-03-26 23:25:56 +00:00
Ludovic Courtès c7090b1f60 Ploticus 2.40. 
svn path=/nixpkgs/trunk/; revision=11293
 2008-03-26 22:54:16 +00:00
Ludovic Courtès 62bcc0f821 Add `doCheck' for Guile-Lint and Guile-Library. 
svn path=/nixpkgs/trunk/; revision=11289
 2008-03-26 15:20:25 +00:00
Eelco Dolstra 31bc21974d * Purity fix in fontforge: don't look for /usr/include/libxml. 
svn path=/nixpkgs/trunk/; revision=11288
 2008-03-26 12:57:30 +00:00
Eelco Dolstra 2f79d64089 * Purity fixes in kdelibs/kdebase: configure looks for pkg-config and 
freetype-config in /usr/bin *before* looking $PATH, possibly causing
  it to fail on non-NixOS machines.

svn path=/nixpkgs/trunk/; revision=11287
 2008-03-26 09:53:04 +00:00
Eelco Dolstra b5da9e1d55 * Fixed an impurity in libcap that causes it to fail on non-NixOS 
systems: the makefile determines whether to build with PAM support
  by doing

    PAM_CAP ?= $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)


svn path=/nixpkgs/trunk/; revision=11285
 2008-03-26 09:37:09 +00:00
Tobias Hammerschmidt 26e37033ba version update 
svn path=/nixpkgs/trunk/; revision=11283
 2008-03-26 07:41:36 +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
Marc Weber 1c36a32ce7 added jwm expression provided by tachermourir (mailinglist) 
svn path=/nixpkgs/trunk/; revision=11281
 2008-03-25 09:50:54 +00:00
Marc Weber c150dc2cf3 ignoring config option servicesProposal (is checked in upstart-jobs/default.nix) 
svn path=/nixpkgs/trunk/; revision=11278
 2008-03-24 23:47:40 +00:00
Michael Raskin 57f29aca82 all-packages.nix changes for all previous commits.. 
svn path=/nixpkgs/trunk/; revision=11276
 2008-03-24 19:40:15 +00:00
Michael Raskin 4ec702d2ab Added generic functionality for custom kernels. 
svn path=/nixpkgs/trunk/; revision=11275
 2008-03-24 19:39:42 +00:00
Michael Raskin 0dfa801a82 Updated builderDefs style. Now more things are overridable. Needed to fix build with custom kernels. 
svn path=/nixpkgs/trunk/; revision=11274
 2008-03-24 19:39:12 +00:00
Michael Raskin 4eaf33cc7a Allow to skip non-existent modules. For custom kernels. 
svn path=/nixpkgs/trunk/; revision=11273
 2008-03-24 19:38:18 +00:00
Eelco Dolstra 71d50c6b25 * Purity: nss_ldap build failed when /etc/ldap.conf did not exist. 
svn path=/nixpkgs/trunk/; revision=11271
 2008-03-24 16:00:22 +00:00
Marc Weber 438f35dac0 removed wmii includeUnpack hack having been used to support old and new setup script 
svn path=/nixpkgs/trunk/; revision=11270
 2008-03-23 16:52:27 +00:00
Michael Raskin 32bc662263 Zenmap - nmap graphical interface - now works 
svn path=/nixpkgs/trunk/; revision=11269
 2008-03-22 20:56:23 +00:00
Tobias Hammerschmidt 0592ed6a11 version update 
svn path=/nixpkgs/trunk/; revision=11268
 2008-03-22 20:49:15 +00:00
Michael Raskin 712ba6a25c Updated nmap 
svn path=/nixpkgs/trunk/; revision=11267
 2008-03-22 19:52:11 +00:00
Michael Raskin 3001f31b44 Fixed my stupid mistake.. 
svn path=/nixpkgs/trunk/; revision=11266
 2008-03-22 19:51:19 +00:00
Michael Raskin 58a31ca341 Fixes to OpenFire 
svn path=/nixpkgs/trunk/; revision=11263
 2008-03-22 17:53:27 +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 3bcb0f794f still a missing piece 
svn path=/nixpkgs/trunk/; revision=11256
 2008-03-21 18:11:55 +00:00
Marc Weber 43172fcb6a forgotten to commit this change (location fix documentation/hs2hs -> misc/hsc2hs) 
svn path=/nixpkgs/trunk/; revision=11255
 2008-03-21 18:07:02 +00:00
Marc Weber 5a78bbfc9f hash updated (hasktags) 
svn path=/nixpkgs/trunk/; revision=11254
 2008-03-21 16:24:04 +00:00
Marc Weber 94113ffd61 hsc2hs moved to the right place 
svn path=/nixpkgs/trunk/; revision=11249
 2008-03-21 03:54:50 +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
Eelco Dolstra 2cf0055092 * lcov 1.6. 
svn path=/nixpkgs/trunk/; revision=11245
 2008-03-20 18:51:07 +00:00
Eelco Dolstra cb01d8b23b * Oops! Fixed an accidental commit. 
svn path=/nixpkgs/trunk/; revision=11244
 2008-03-20 18:49:33 +00:00
Michael Raskin 71fe97475a Updated template for composing builder 
svn path=/nixpkgs/trunk/; revision=11237
 2008-03-20 15:56:17 +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
Ludovic Courtès 95f0e6a1a7 Differentiate between longDescription' and description'. 
svn path=/nixpkgs/trunk/; revision=11230
 2008-03-20 14:35:03 +00:00
Marc Weber 91dd7e2b86 fix: tunctl is build again (also added check) 
svn path=/nixpkgs/trunk/; revision=11222
 2008-03-20 11:36:31 +00:00
Michael Raskin 9d05eb2f2c Removed glibc reference 
svn path=/nixpkgs/trunk/; revision=11219
 2008-03-20 10:22:53 +00:00
Michael Raskin b0eb7aaa4b all-packages.nix changes for previous commits 
svn path=/nixpkgs/trunk/; revision=11217
 2008-03-20 09:52:40 +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
Michael Raskin c251639ab1 Committed xneur expression by justbeingglad 
svn path=/nixpkgs/trunk/; revision=11215
 2008-03-20 09:51:05 +00:00
Michael Raskin b97b16534e Added Psi 
svn path=/nixpkgs/trunk/; revision=11214
 2008-03-20 09:50:31 +00:00
Michael Raskin a3ea4c135b Newer flex. 
svn path=/nixpkgs/trunk/; revision=11213
 2008-03-20 09:50:15 +00:00
Marc Weber ae475a72bf renamed subversion-<version>-svnmerge to svmerge-version (fixed my breakage of nixos-checkout : nix-env -i subversion) 
svn path=/nixpkgs/trunk/; revision=11211
 2008-03-19 22:32:00 +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
Ludovic Courtès 420506d752 Guile: Add various fixes allowing the test suite to run. 
svn path=/nixpkgs/trunk/; revision=11196
 2008-03-19 08:42:30 +00:00
Eelco Dolstra 3a05713cb7 svn path=/nixpkgs/trunk/; revision=11189 2008-03-18 21:14:02 +00:00
Marc Weber 2514c86033 reverted diff r11163-11164 (rgb not needed for tightvnc) 
svn path=/nixpkgs/trunk/; revision=11188
 2008-03-18 19:45:31 +00:00
Eelco Dolstra 5fe1cb8a0c svn path=/nixpkgs/trunk/; revision=11185 2008-03-18 15:05:46 +00:00
Eelco Dolstra cc07ee1c77 * Install RPMs without the --notriggers and --nodeps options in order 
to construct an image that better approximates the Linux
  distribution in question.

svn path=/nixpkgs/trunk/; revision=11184
 2008-03-18 14:56:47 +00:00
Arie Middelkoop f7e6441399 Nix expression for EHC 
to install:
nix-env -i ehc-svn

to run:
ehc-100 <your-haskell-file.hs>

svn path=/nixpkgs/trunk/; revision=11183
 2008-03-18 13:44:27 +00:00
Eelco Dolstra fd2a77eeb0 * Put all the RPM/Debian images in an attribute set `diskImage'. 
svn path=/nixpkgs/trunk/; revision=11181
 2008-03-18 12:54:21 +00:00
Eelco Dolstra 113fafd778 * buildRPM: print out the RPMs in the image. 
svn path=/nixpkgs/trunk/; revision=11168
 2008-03-17 17:29:07 +00:00
Eelco Dolstra 195c3788ed * Cleanup. 
svn path=/nixpkgs/trunk/; revision=11166
 2008-03-17 17:08:40 +00:00
Eelco Dolstra 0301a74bf0 * Use SCSI instead of IDE, much faster. 
svn path=/nixpkgs/trunk/; revision=11165
 2008-03-17 16:12:19 +00:00
Marc Weber 2a20ef9694 Added xlibs (rgb) to tightvnc as dependency (I still get error "Couldnt add screen") 
svn path=/nixpkgs/trunk/; revision=11164
 2008-03-17 14:32:08 +00:00
Ludovic Courtès 6085bc8147 nss-mdns: Fix typo. 
svn path=/nixpkgs/trunk/; revision=11163
 2008-03-17 13:59:34 +00:00
Eelco Dolstra 26a152653d * Adde xpra. Doesn't quite work yet. 
* Removed python_alts.

svn path=/nixpkgs/trunk/; revision=11161
 2008-03-17 13:45:50 +00:00
Ludovic Courtès a47057c615 Add nss-mdns', an NSS plug-in for the .local' domain, using mDNS. 
svn path=/nixpkgs/trunk/; revision=11160
 2008-03-17 13:41:54 +00:00
Arie Middelkoop 85f6478f93 Almost working nix-expression for EHC 
(it installs EHC but is not able to produce code)

svn path=/nixpkgs/trunk/; revision=11158
 2008-03-17 11:59:12 +00:00
Arie Middelkoop 33cd1691a6 Removed some of the buildInputs for the LLVM nix-expression that are not required. 
svn path=/nixpkgs/trunk/; revision=11157
 2008-03-17 11:28:52 +00:00
Arie Middelkoop c65d00efeb LLVM compiler 
Low Level Virtual Machine
http://www.llvm.org/

svn path=/nixpkgs/trunk/; revision=11156
 2008-03-17 11:18:21 +00:00
Eelco Dolstra 3ee0b9bb74 * makeInitrd, makeModulesClosure: moved from NixOS. 
* Use sh from klibc in the initrd.

svn path=/nixpkgs/trunk/; revision=11154
 2008-03-17 10:40:47 +00:00
Eelco Dolstra ed9107e33c * kernelscripts: seems to be obsolete. 
svn path=/nixpkgs/trunk/; revision=11151
 2008-03-17 09:44:14 +00:00
Eelco Dolstra 84d55847d2 * Clean up indentation (expanded tabs etc.). 
svn path=/nixpkgs/trunk/; revision=11150
 2008-03-17 09:41:28 +00:00
Michael Raskin 7698f380a0 Added x2vnc, a tool to control physically close but formally remote VNC display as an extension of local one. 
svn path=/nixpkgs/trunk/; revision=11148
 2008-03-17 06:29:32 +00:00
Michael Raskin 5204d562cc Keynav fix 
svn path=/nixpkgs/trunk/; revision=11147
 2008-03-17 06:28:22 +00:00
Tobias Hammerschmidt 572e6a28c6 version update 
svn path=/nixpkgs/trunk/; revision=11145
 2008-03-16 12:38:59 +00:00
Michael Raskin 14d5fa0ca8 Fixed relfs_grant 
svn path=/nixpkgs/trunk/; revision=11143
 2008-03-16 10:31:17 +00:00
Michael Raskin 064045cfcd version updates 
svn path=/nixpkgs/trunk/; revision=11142
 2008-03-16 08:01:31 +00:00
Ludovic Courtès d9fb721e1a Add `makePortmap' function, for use by NixOS. 
svn path=/nixpkgs/trunk/; revision=11139
 2008-03-15 23:39:18 +00:00
Ludovic Courtès fa2f6c5272 Add portmap, an ONC RPC directory service. 
svn path=/nixpkgs/trunk/; revision=11138
 2008-03-15 22:51:46 +00:00
Ludovic Courtès 76ac9b3b86 tcp-wrapper: Install header files. 
svn path=/nixpkgs/trunk/; revision=11137
 2008-03-15 22:51:05 +00:00
Ludovic Courtès ac2f2f6cc5 Add `tcp-wrapper'. 
svn path=/nixpkgs/trunk/; revision=11136
 2008-03-15 22:41:31 +00:00
Eelco Dolstra 8a72053717 svn path=/nixpkgs/trunk/; revision=11135 2008-03-15 22:30:01 +00:00
Eelco Dolstra 9f4d91df34 * Aangifte 2007. 
svn path=/nixpkgs/trunk/; revision=11134
 2008-03-15 21:45:57 +00:00
Ludovic Courtès 2788bf2902 Git: Wrap `gitk' so that it finds Tcl/Tk. 
svn path=/nixpkgs/trunk/; revision=11133
 2008-03-15 20:52:21 +00:00
Michael Raskin f87e85c2a8 Added LinuxDC++. Claimed to support newer protocol - claim is by valknut team.. 
svn path=/nixpkgs/trunk/; revision=11132
 2008-03-15 06:11:45 +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
Arie Middelkoop f0729c16e9 Fixed a tiny mistake in the ghc-6.6 and ghc-6.8 wrapper generation. 
It worked without the fix.
Hopefully it still works with the fix.

svn path=/nixpkgs/trunk/; revision=11128
 2008-03-14 14:49:17 +00:00
Eelco Dolstra 44fa8e3e0f * Also moved to Nixpkgs. 
svn path=/nixpkgs/trunk/; revision=11127
 2008-03-14 13:51:43 +00:00
Eelco Dolstra bf5db34927 * Move to Nixpkgs: support for building in VMs is more generally 
useful, probably.

svn path=/nixpkgs/trunk/; revision=11126
 2008-03-14 13:51:01 +00:00
Eelco Dolstra 4624c8bc3f * klibShrunk: just the klibc binaries without header files etc; useful 
for installation in initrds.

svn path=/nixpkgs/trunk/; revision=11125
 2008-03-14 13:46:47 +00:00
Eelco Dolstra 5f683794c2 * Set admindir to /var/lib/dpkg. 
svn path=/nixpkgs/trunk/; revision=11124
 2008-03-14 13:44:58 +00:00
Ludovic Courtès c02aea1925 ISC DHCP: Add a proper wrapper for dhclient-script' so that it finds hostname' 
and friends; add a patch so that "make install" doesn't try to
"mkdir /var/run"; add `meta' attribute.

svn path=/nixpkgs/trunk/; revision=11123
 2008-03-14 13:40:32 +00:00
Arie Middelkoop 6aa42a8021 New hash for uuagc. 
svn path=/nixpkgs/trunk/; revision=11114
 2008-03-14 08:49:24 +00:00
Michael Raskin 1275775baf Reverted unneeded setting of NIX_LDFLAGS. 
svn path=/nixpkgs/trunk/; revision=11112
 2008-03-14 06:44:01 +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
Ludovic Courtès 9433120f1f Guile: Disable `doCheck' for now. 
svn path=/nixpkgs/trunk/; revision=11107
 2008-03-13 21:04:07 +00:00
Andres Löh d1ea08359e * added a preliminary nix expression for EHC, *DOESN'T WORK YET* 
svn path=/nixpkgs/trunk/; revision=11104
 2008-03-13 18:02:48 +00:00
Andres Löh 03a9016049 * added a preliminary nix expression for EHC, *DOESN'T WORK YET* 
svn path=/nixpkgs/trunk/; revision=11103
 2008-03-13 18:02:29 +00:00
Eelco Dolstra 842eda63f8 * Nasty hacks to get dpkg to set the architecture correctly. 
svn path=/nixpkgs/trunk/; revision=11100
 2008-03-13 14:58:17 +00:00
Ludovic Courtès c1389c4f36 Guile: Run the test suite. 
Warning: This makes `nix-worker' hang at the very end of the process,
once "make install" has completed and all installed files have been
scanned for references.

svn path=/nixpkgs/trunk/; revision=11099
 2008-03-13 14:18:29 +00:00
Eelco Dolstra d8745d57b2 * mirror://debian: stripped the /pool part; there are other Debian 
files that can be useful.
* mirror://ubuntu.

svn path=/nixpkgs/trunk/; revision=11097
 2008-03-13 13:31:39 +00:00
Ludovic Courtès fdf6a69b3a Add CVSps, needed for instance by `git-cvsimport'. 
svn path=/nixpkgs/trunk/; revision=11094
 2008-03-13 10:02:57 +00:00
Ludovic Courtès ee5789b266 CVS: Depend on GNU Nano rather than Vim. 
The former is a more reasonable dependency, and a standard one.

svn path=/nixpkgs/trunk/; revision=11093
 2008-03-13 10:01:21 +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 9d5e5ddc9e yap prolog system added 
svn path=/nixpkgs/trunk/; revision=11090
 2008-03-13 01:13:53 +00:00
Eelco Dolstra 6ea7522ba2 * Added dpkg. 
svn path=/nixpkgs/trunk/; revision=11088
 2008-03-12 20:46:47 +00:00
Ludovic Courtès a8bc9e0fe4 Git 1.5.4.4 with Info documentation for real! 
svn path=/nixpkgs/trunk/; revision=11084
 2008-03-12 15:21:45 +00:00
Ludovic Courtès 2d75587897 Docbook2X: Fix --to-stdout' option of docbook2texi', fix Perl dependencies 
of all the perl scripts, add dependency on Texinfo since `makeinfo' can be
invoked directly by `docbook2texi --info'.

svn path=/nixpkgs/trunk/; revision=11083
 2008-03-12 15:19:54 +00:00
Marc Weber be448d64fe takusen added 
svn path=/nixpkgs/trunk/; revision=11078
 2008-03-12 11:47:54 +00:00
Marc Weber 8939f24475 added svnmerge.py contrib tool 
svn path=/nixpkgs/trunk/; revision=11075
 2008-03-12 10:36:15 +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 ce75fe523a fixed missing fcgi 
svn path=/nixpkgs/trunk/; revision=11069
 2008-03-11 22:34:17 +00:00
Marc Weber bc76a1574e added missing sqlite on trunk 
svn path=/nixpkgs/trunk/; revision=11067
 2008-03-11 22:24:05 +00:00
Michael Raskin ae7274413b Changed port in test-suite to avoid OpenFire port conflict during build. 
svn path=/nixpkgs/trunk/; revision=11066
 2008-03-11 20:58:29 +00:00
Marc Weber eb06f31203 roadsend now supports fcgi 
svn path=/nixpkgs/trunk/; revision=11064
 2008-03-11 17:24:27 +00:00
Marc Weber b35897972a hasktags now supports literate haskell files 
svn path=/nixpkgs/trunk/; revision=11063
 2008-03-11 17:17:12 +00:00
Eelco Dolstra 54a46e4c50 * Samba updated to 3.0.28a. Removed the static config file. 
svn path=/nixpkgs/trunk/; revision=11062
 2008-03-11 17:01:55 +00:00
Eelco Dolstra 8c092a1940 * Support setting the path to smbd (we can't put it in /usr/sbin/smbd 
on NixOS).

svn path=/nixpkgs/trunk/; revision=11061
 2008-03-11 16:50:53 +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
Ludovic Courtès 59708608cb Git: Fix caller. 
svn path=/nixpkgs/trunk/; revision=11059
 2008-03-11 14:19:54 +00:00
Eelco Dolstra 90e3e57995 svn path=/nixpkgs/trunk/; revision=11058 2008-03-11 14:11:48 +00:00
Ludovic Courtès 03b5ac1b6c Git: Build documentation. 
svn path=/nixpkgs/trunk/; revision=11057
 2008-03-11 14:07:58 +00:00
Ludovic Courtès 498f57b9a8 AsciiDoc: Fix `CONF_DIR' in the executables. 
svn path=/nixpkgs/trunk/; revision=11056
 2008-03-11 14:06:52 +00:00
Tobias Hammerschmidt 3d2fe2382f updated eclipse to version 3.3.2 -- do we really need a special nix expression for jdt in development/eclipse? 
svn path=/nixpkgs/trunk/; revision=11055
 2008-03-11 13:40:27 +00:00
Michael Raskin 8ec59864b2 Unfortunately needed here on NixOS... 
svn path=/nixpkgs/trunk/; revision=11054
 2008-03-11 12:37:22 +00:00
Eelco Dolstra a35566af2b * stdenv doesn't have an attribute named bash on FreeBSD (maybe it 
should).

svn path=/nixpkgs/trunk/; revision=11053
 2008-03-11 10:26:50 +00:00
Marc Weber 7e436db74d updated bigloo (no longer requires hack) 
svn path=/nixpkgs/trunk/; revision=11052
 2008-03-11 10:08:19 +00:00
Ludovic Courtès 92246defa5 Add docbook2x. 
svn path=/nixpkgs/trunk/; revision=11051
 2008-03-11 09:34:17 +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
Ludovic Courtès f528309936 Remove dependencies on stdenv' components from xmlto'. 
svn path=/nixpkgs/trunk/; revision=11049
 2008-03-11 09:16:12 +00:00
Ludovic Courtès d195542ac3 Add `xmlto', a front-end to an XSL toolchain. 
svn path=/nixpkgs/trunk/; revision=11048
 2008-03-11 08:44:22 +00:00
Ludovic Courtès 2d15d4c269 Augment `libxml2' setup hook to add XSL stylesheets to XML catalogs. 
This allows, for instance, `docbook_xsl' to be visible (as part of
`$XML_CATALOG_FILES') by packages that use it as a build input.

svn path=/nixpkgs/trunk/; revision=11047
 2008-03-11 08:42:26 +00:00
Marc Weber 6a3f5200a7 Added a comment on how to get help about mkDerivationByConfiguration in all-packages.nix 
svn path=/nixpkgs/trunk/; revision=11046
 2008-03-11 08:11:06 +00:00
Marc Weber 8b7d3bff69 corrected nonsense sentence in my comment 
svn path=/nixpkgs/trunk/; revision=11045
 2008-03-10 20:47:26 +00:00
Armijn Hemel c16b552bac update liboil to 0.3.13 (and add some (new) missing deps) 
add schroedinger, a free codec (might be moved to its own category instead of libs)

svn path=/nixpkgs/trunk/; revision=11043
 2008-03-10 20:13:44 +00:00
Marc Weber c88710749b fixed two typos 
svn path=/nixpkgs/trunk/; revision=11042
 2008-03-10 19:29:40 +00:00
Ludovic Courtès bd361daf06 Add AsciiDoc. 
svn path=/nixpkgs/trunk/; revision=11039
 2008-03-10 15:57:14 +00:00
Eelco Dolstra bc8eb14767 * Hack to get KVM to build again. 
svn path=/nixpkgs/trunk/; revision=11038
 2008-03-10 15:24:42 +00:00
Ludovic Courtès bd680bfc0b wrapFirefox: Use GNU Gnash as the default Flash player, allow use of Adobe Flash 
through the `firefox.enableAdobeFlash' Nixpkgs config attribute.

svn path=/nixpkgs/trunk/; revision=11037
 2008-03-10 15:13:06 +00:00
Ludovic Courtès d35b3240fd Gnash: Add libXext' to the RPATH' of `gtk-gnash'. 
svn path=/nixpkgs/trunk/; revision=11036
 2008-03-10 15:05:32 +00:00
Marc Weber af43b8a024 missing part 
svn path=/nixpkgs/trunk/; revision=11035
 2008-03-10 15:02:29 +00:00
Ludovic Courtès 00e0e9ac37 Gnash: Install Mozilla plug-in. 
svn path=/nixpkgs/trunk/; revision=11034
 2008-03-10 13:24:11 +00:00
Tobias Hammerschmidt 8c5c656fb5 fixed skype, wesnoth updated to version 1.4 
svn path=/nixpkgs/trunk/; revision=11033
 2008-03-10 13:09:47 +00:00
Ludovic Courtès 7c7639a888 GNU Gnash 0.8.2, Agg 2.5. 
svn path=/nixpkgs/trunk/; revision=11030
 2008-03-10 09:48:17 +00:00
Wouter den Breejen d2c93e47a7 svn path=/nixpkgs/trunk/; revision=11028 2008-03-09 20:07:03 +00:00
Wouter den Breejen f9998954b8 New Ext3cow version with some bugs resolved. Updated ext3cow kernel-patch, e3cfsprogs and ext3cow-tools 
svn path=/nixpkgs/trunk/; revision=11027
 2008-03-09 20:06:42 +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
Armijn Hemel 7c39433e7b 2.6.9 -> 3.0.0 
svn path=/nixpkgs/trunk/; revision=11020
 2008-03-08 16:36:27 +00:00
Marc Weber 227e6aa8a4 Commented ghcLibraryWrapper68 
svn path=/nixpkgs/trunk/; revision=11019
 2008-03-08 08:07:32 +00:00
Eelco Dolstra ac8f511b88 * Fix dietlibc on x86_64. 
svn path=/nixpkgs/trunk/; revision=11014
 2008-03-07 15:36:21 +00:00
Michael Raskin 40a9071596 Another location for Snd sound editor. 
svn path=/nixpkgs/trunk/; revision=11011
 2008-03-07 10:48:54 +00:00
Ludovic Courtès d8bcaa4398 Add rsnapshot, an rsync-based remote backup tool. 
svn path=/nixpkgs/trunk/; revision=11009
 2008-03-07 09:33:51 +00:00
Michael Raskin 07cad2fc45 Now Dictd dictionary collection works to full extent. 
svn path=/nixpkgs/trunk/; revision=11007
 2008-03-07 07:30:56 +00:00
Michael Raskin b20aba1d92 Updated: RelFS. Added DictDB aggregation. 
svn path=/nixpkgs/trunk/; revision=11006
 2008-03-07 06:11:08 +00:00
Michael Raskin 7786a5ad1e Some updates to dict dictionaries. 
svn path=/nixpkgs/trunk/; revision=11005
 2008-03-07 05:54:54 +00:00
Michael Raskin 8b48a5c731 Fixed e2fsprogs - install libs needed for testdisk 
svn path=/nixpkgs/trunk/; revision=11004
 2008-03-07 05:51:59 +00:00
Nicolas Pierron aec4356a10 * Add swi-prolog without any options. 
svn path=/nixpkgs/trunk/; revision=11003
 2008-03-06 21:53:54 +00:00
Marc Weber ddda0112e5 renamed bleeding_edge_* and createGhcWrapper -> ghc-wrapper 
svn path=/nixpkgs/trunk/; revision=11001
 2008-03-06 19:48:55 +00:00
Ludovic Courtès 95c977a008 Remove gettext' dependency from e2fsprogsDiet'. 
svn path=/nixpkgs/trunk/; revision=10998
 2008-03-06 17:06:59 +00:00
Ludovic Courtès d1ed48981c Avahi: Make Qt4 support optional and configurable. 
svn path=/nixpkgs/trunk/; revision=10997
 2008-03-06 16:42:34 +00:00
Eelco Dolstra 2d948fed46 * Remove unused old versions. 
svn path=/nixpkgs/trunk/; revision=10996
 2008-03-06 16:42:25 +00:00
Eelco Dolstra f41df276c6 e2fsprogs: drop the gettext dependency. 
svn path=/nixpkgs/trunk/; revision=10992
 2008-03-06 16:10:01 +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 e75e52f61f * HAL 0.5.10. 
svn path=/nixpkgs/trunk/; revision=10985
 2008-03-06 13:06:32 +00:00
Eelco Dolstra f2f87036ce * Revert to DBus 1.0.2; 1.1.20 is broken, it kills the X server when 
you restart the daemon (http://bugs.gentoo.org/show_bug.cgi?id=206509).

svn path=/nixpkgs/trunk/; revision=10984
 2008-03-06 13:02:04 +00:00
Sander van der Burg 7c266891be Fixed typo 
svn path=/nixpkgs/trunk/; revision=10983
 2008-03-06 12:39:38 +00:00
Sander van der Burg 7eb1759d37 Upgraded WebDSL 
svn path=/nixpkgs/trunk/; revision=10982
 2008-03-06 12:31:39 +00:00
Eelco Dolstra 282c8421d5 * e2fsprogs 1.40.7. 
svn path=/nixpkgs/trunk/; revision=10981
 2008-03-06 12:08:19 +00:00
Eelco Dolstra f210ada337 * NVIDIA driver 169.12. 
svn path=/nixpkgs/trunk/; revision=10980
 2008-03-06 12:07:50 +00:00
Michael Raskin 7b6c7dd65f Made entries for a few dictd dictionaries 
svn path=/nixpkgs/trunk/; revision=10979
 2008-03-06 12:02:10 +00:00
Michael Raskin 003a6d10b5 Added CDDA support to MPlayer 
svn path=/nixpkgs/trunk/; revision=10978
 2008-03-06 09:34:36 +00:00
Michael Raskin a463854cd7 Commented out work in progress 
svn path=/nixpkgs/trunk/; revision=10977
 2008-03-06 04:44:46 +00:00
Michael Raskin 3b2f272341 Added dict and working on adding dictionaries 
svn path=/nixpkgs/trunk/; revision=10976
 2008-03-06 04:39:05 +00:00
Marc Weber a277b420ee annotatedDerivation removed 
svn path=/nixpkgs/trunk/; revision=10975
 2008-03-06 02:48:09 +00:00
Marc Weber 1b51b70317 - fetchdarcs supports now partial 
- fetchdarcs_2pre added
- flapjax added
- no longer used : annotatedDerivations
- added bleeding edge repos with a tiny nix repository manager which dowloads and
  updates repostiries, then creates tar.gz dist files which are used by bleeding_edge_source
  (darcs tested only by now)
- added experimental my_environment with example

svn path=/nixpkgs/trunk/; revision=10974
 2008-03-06 02:46:29 +00:00
Marc Weber 64652c5dfc modified launch script so that you can copy the whole eclipse store directory to be able to use the update manager - maybe there is a better way? 
svn path=/nixpkgs/trunk/; revision=10972
 2008-03-06 00:49:31 +00:00
Ludovic Courtès f6fc5661b8 Add PAM support to lsh. 
svn path=/nixpkgs/trunk/; revision=10970
 2008-03-05 16:49:51 +00:00
Eelco Dolstra f212e0380e svn path=/nixpkgs/trunk/; revision=10964 2008-03-05 14:37:41 +00:00
Eelco Dolstra c65fa45df9 * Fix building when /var/lib/dbus doesn't exist. 
svn path=/nixpkgs/trunk/; revision=10963
 2008-03-05 14:37:06 +00:00
Ludovic Courtès ddb9d11f1c Add libcddb and GNU libcdio. 
svn path=/nixpkgs/trunk/; revision=10960
 2008-03-05 09:10:23 +00:00
Ludovic Courtès 8b34b723f7 Add GCC-UPC, a compiler for the UPC distributed shared memory language. 
svn path=/nixpkgs/trunk/; revision=10956
 2008-03-04 16:20:11 +00:00
Wouter den Breejen cfe56735b0 SNix update. 
svn path=/nixpkgs/trunk/; revision=10950
 2008-03-04 14:23:33 +00:00
Wouter den Breejen 7dcca76e91 SNix update 
svn path=/nixpkgs/trunk/; revision=10949
 2008-03-04 14:23:29 +00:00
Eelco Dolstra 167aa686ee * DBus 1.1.20. 
svn path=/nixpkgs/trunk/; revision=10945
 2008-03-04 13:30:34 +00:00
Eelco Dolstra 0a8f71fb9c * Linux 2.6.23.17. 
svn path=/nixpkgs/trunk/; revision=10943
 2008-03-04 11:07:37 +00:00
Eelco Dolstra 72097d9aea * Don't strip the NVIDIA programs (like nvidia-settings), it breaks 
them (NIXPKGS-85).

svn path=/nixpkgs/trunk/; revision=10941
 2008-03-04 10:06:21 +00:00
Michael Raskin 7001d91ba7 Added seccureUser, uild variant that does not lock memory. 
svn path=/nixpkgs/trunk/; revision=10938
 2008-03-03 23:32:50 +00:00
Armijn Hemel 1be3f71528 update to 2.5.2 
svn path=/nixpkgs/trunk/; revision=10934
 2008-03-03 23:15:15 +00:00
Armijn Hemel 27540fd36e update to 0.8.14 (warning: triggers OOo rebuild :-P ) 
svn path=/nixpkgs/trunk/; revision=10933
 2008-03-03 22:07:25 +00:00
Armijn Hemel bde6dd8990 new powertop 
svn path=/nixpkgs/trunk/; revision=10932
 2008-03-03 21:44:17 +00:00
Armijn Hemel 635b721180 update to 1.4.1 
svn path=/nixpkgs/trunk/; revision=10931
 2008-03-03 21:37:55 +00:00
Michael Raskin 9f393398e2 Added Shamir Secret Sharing Scheme and bmrsa. Fixed libgcrypt 
svn path=/nixpkgs/trunk/; revision=10928
 2008-03-03 12:30:39 +00:00
Eelco Dolstra f30f36104b * Added Audacious, a fork of beep-media-player (which doesn't seem to 
work very well after the Glibc update), plus its dependencies.

  TODO: make an audacious-wrapper that lets Audacious find its plugins
  automatically.  Currently you have to install audacious-plugins and
  symlink ~/.nix-profile/lib/audacious/* in
  ~/.local/share/audacious/Plugins.

svn path=/nixpkgs/trunk/; revision=10927
 2008-03-03 10:55:20 +00:00
Michael Raskin 25f81f6438 Added SECCURE - Elliptic Curve Cryptography zero-configuration command-line tool. Note: needs to be setuid, because loves to lock memory. 
svn path=/nixpkgs/trunk/; revision=10926
 2008-03-03 10:48:29 +00:00
Armijn Hemel 70ac99975d update to 0.11.1 
svn path=/nixpkgs/trunk/; revision=10925
 2008-03-03 00:06:23 +00:00
Armijn Hemel 93c37882a5 update to 2.4.0 
svn path=/nixpkgs/trunk/; revision=10924
 2008-03-02 22:54:49 +00:00
Armijn Hemel 2b8ec976cf update to 2.4.5, Python ImportError still in there. 
svn path=/nixpkgs/trunk/; revision=10923
 2008-03-02 22:24:21 +00:00
Armijn Hemel 73051b79b7 force a build without X for now. This should be made an option...soon. 
svn path=/nixpkgs/trunk/; revision=10921
 2008-03-02 22:12:27 +00:00
Sander van der Burg ad0f90ccc0 Updated to the stable 2.0.0 
svn path=/nixpkgs/trunk/; revision=10920
 2008-03-02 22:11:19 +00:00
Michael Raskin 74aba16126 Added FontForge with X11 interface 
svn path=/nixpkgs/trunk/; revision=10918
 2008-03-02 22:02:28 +00:00
Michael Raskin 9ee09f4a55 Added JUnicode 
svn path=/nixpkgs/trunk/; revision=10917
 2008-03-02 21:59:32 +00:00
Marc Weber 4d6eef7a28 eclipse from source expression 
svn path=/nixpkgs/trunk/; revision=10916
 2008-03-02 21:17:23 +00:00
Michael Raskin 7d5ddd88a9 Added UCS-fonts 
svn path=/nixpkgs/trunk/; revision=10915
 2008-03-02 19:19:34 +00:00
Michael Raskin 71f8e0911a Added src to meta for builderDefs-based packages. 
svn path=/nixpkgs/trunk/; revision=10913
 2008-03-02 18:49:31 +00:00
Michael Raskin 5ed88513ef Added template to use deb-package wrapper. 
svn path=/nixpkgs/trunk/; revision=10911
 2008-03-02 18:41:32 +00:00
Michael Raskin 10daad7e97 Added ttmkfdir - program to create fonts.scale for TTF fonts 
svn path=/nixpkgs/trunk/; revision=10910
 2008-03-02 18:40:42 +00:00