alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
17490 commits 217 branches 121 tags 4.5 GiB
Commit graph

2106 commits

Author SHA1 Message Date
Michael Raskin 946458d4f9 Fixing tarball build 
svn path=/nixpkgs/trunk/; revision=28873
 2011-08-29 10:31:10 +00:00
Michael Raskin 04e84c2c13 Adding netboot 
svn path=/nixpkgs/trunk/; revision=28872
 2011-08-29 10:16:36 +00:00
Russell O'Connor c7e097251c Updating Encfs to 1.7.4 
svn path=/nixpkgs/trunk/; revision=28854
 2011-08-28 00:16:43 +00:00
Eelco Dolstra b44f2c7ad3 * Add polkit-kde-agent to the channel. 
svn path=/nixpkgs/trunk/; revision=28847
 2011-08-27 15:19:05 +00:00
Shea Levy 4d70ba6cc9 Merge from trunk up through r28790 
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
 2011-08-24 19:16:43 +00:00
Ludovic Courtès 60f13a191a Add dvgrab. 
svn path=/nixpkgs/trunk/; revision=28789
 2011-08-24 14:55:48 +00:00
Lluís Batlle i Rossell a9ce52e01a Updating dos2unix, that now includes also unix2dos. 
svn path=/nixpkgs/trunk/; revision=28788
 2011-08-24 07:48:02 +00:00
Michael Raskin e9a5a5d819 Fix xmacro build 
svn path=/nixpkgs/trunk/; revision=28787
 2011-08-23 17:52:05 +00:00
Marco Maggesi 495bae62a0 (Ooops!) Remove debug instruction in fdupes derivation 
svn path=/nixpkgs/trunk/; revision=28776
 2011-08-23 11:59:31 +00:00
Marco Maggesi 42469337d7 Update fdupes to version 1.50-RC2 
svn path=/nixpkgs/trunk/; revision=28775
 2011-08-23 11:52:38 +00:00
Ludovic Courtès f62b53ee19 GNU Xnee 3.10. 
svn path=/nixpkgs/trunk/; revision=28754
 2011-08-22 17:38:53 +00:00
Ludovic Courtès 152a2612ae GNU Parallel 20110822. 
svn path=/nixpkgs/trunk/; revision=28753
 2011-08-22 17:38:49 +00:00
Ludovic Courtès 097f8d1daa GnuPG 2.0.18. 
svn path=/nixpkgs/trunk/; revision=28752
 2011-08-22 17:38:45 +00:00
Ludovic Courtès 4b509b7eac GNU Xorriso 1.1.4. 
svn path=/nixpkgs/trunk/; revision=28751
 2011-08-22 17:38:37 +00:00
Eelco Dolstra e12337604a * Remove unused dependency. 
svn path=/nixpkgs/trunk/; revision=28740
 2011-08-22 15:25:26 +00:00
Eelco Dolstra 62049ecfb1 * Added super. 
svn path=/nixpkgs/trunk/; revision=28739
 2011-08-22 15:24:24 +00:00
Eelco Dolstra 631ba2a5f0 svn path=/nixpkgs/trunk/; revision=28716 2011-08-21 00:10:12 +00:00
Rob Vermaas 25fd505136 update ec2-ami-tools hash 
svn path=/nixpkgs/trunk/; revision=28672
 2011-08-19 02:41:23 +00:00
Rob Vermaas ddd5cb7d29 update ec2-api-tools hash 
svn path=/nixpkgs/trunk/; revision=28671
 2011-08-19 02:40:51 +00:00
Michael Raskin eb92b14435 Update Linux Containers userspace tools 
svn path=/nixpkgs/trunk/; revision=28665
 2011-08-18 15:01:53 +00:00
Yury G. Kudryashov 0466e94091 Add polkit-kde-agent 
Move pinentry and polkit-gnome to tools/security.

svn path=/nixpkgs/trunk/; revision=28656
 2011-08-18 12:52:50 +00:00
David Guibert 565cdcc3e1 unzip: add support for file greater than 2 GB (unix only) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=28622
 2011-08-16 18:21:05 +00:00
Peter Simons 21b26aef25 Updated Haskell package meta sections. 
svn path=/nixpkgs/trunk/; revision=28583
 2011-08-15 11:27:02 +00:00
Eelco Dolstra a97b8b191c * Added s3cmd. 
svn path=/nixpkgs/trunk/; revision=28530
 2011-08-13 11:49:23 +00:00
Peter Simons 468c5dbc5c The 'random' library is no longer a core library in GHC 7.2.1. For older 
versions of the compiler, haskell-packages.nix provides a null attribute.

svn path=/nixpkgs/trunk/; revision=28500
 2011-08-12 00:18:56 +00:00
David Guibert f9200097ae add bup: backup system based on the git packfile format 
[1] https://github.com/apenwarr/bup

Signed-off-by: David Guibert <david.guibert@gmail.com>

svn path=/nixpkgs/trunk/; revision=28497
 2011-08-11 16:33:47 +00:00
Peter Simons dbce2ffd0f Generated neater meta.description strings. 
svn path=/nixpkgs/trunk/; revision=28492
 2011-08-11 13:03:51 +00:00
Peter Simons b1ef3e6e36 Last batch of Haskell expression updates. 
* haskell-mkcabal: updated to version 1.0.0
 * haskell-ghc-syb-utils: updated to version 0.2.1.0
 * haskell-darcs: updated to version 2.5.2

svn path=/nixpkgs/trunk/; revision=28449
 2011-08-10 00:35:08 +00:00
David Guibert 1e4cb4f0eb sshfs: link sshfs to mount.sshfs 
mount.fuse is not able to find sshfs.
So calling
  $ mount -t sshfs user@host:path mount/point
will search for mount.sshfs to do the mount.

svn path=/nixpkgs/trunk/; revision=28443
 2011-08-09 20:38:55 +00:00
David Guibert b97136492e isync: add recursive imap patch 
svn path=/nixpkgs/trunk/; revision=28438
 2011-08-09 20:09:17 +00:00
Eelco Dolstra 9049a3000d * Update nixUnstable. 
svn path=/nixpkgs/trunk/; revision=28403
 2011-08-08 19:55:14 +00:00
Karn Kallio a233ebf891 Switch to forward compatibility of kde45 on kde_baseapps. 
svn path=/nixpkgs/trunk/; revision=28217
 2011-08-07 01:45:26 +00:00
Karn Kallio 6a2f1f3d72 Remove kdebase as input to kdiff3. 
Seems not to be needed and gives evaluation error when with kde4.7

svn path=/nixpkgs/trunk/; revision=28197
 2011-08-06 18:01:56 +00:00
Lluís Batlle i Rossell c10bdc23cd Simple packaging of bacula. 
svn path=/nixpkgs/trunk/; revision=28182
 2011-08-05 19:18:02 +00:00
Peter Simons 7d651a8ec3 syslog-ng: the build doesn't find "glib" on platforms other than Linux 
Glib is a buildInput, and it does work fine on Linux, but on other
platforms Hydra reports a build failure:

 | checking for GLIB - version >= 2.10.1... no
 | *** Could not run GLIB test program, checking why...
 | *** The test program failed to compile or link. See the file config.log for the
 | *** exact error that occured. This usually means GLIB is incorrectly installed.
 | configure: error: Cannot find GLIB version >= 2.10.1: is pkg-config in path?

I can't debug that problem, so opted to just disable those builds that
fail anyway.

svn path=/nixpkgs/trunk/; revision=28156
 2011-08-04 15:59:21 +00:00
Peter Simons 9f834cb8bd syslog-ng: moved package from tools/misc to tools/system 
svn path=/nixpkgs/trunk/; revision=28155
 2011-08-04 15:59:14 +00:00
Eelco Dolstra fda7c24c2b * Added aws-mturk-clt, the Amazon Mechanical Turk command-line tools. 
svn path=/nixpkgs/trunk/; revision=28150
 2011-08-04 12:13:53 +00:00
Eelco Dolstra fcce78c0f4 * Sync with the trunk. 
svn path=/nixpkgs/branches/kde-4.7/; revision=28144
 2011-08-03 22:00:49 +00:00
Michael Raskin 451f7818a5 Adding The Sleuth Kit 
svn path=/nixpkgs/trunk/; revision=28130
 2011-08-02 20:06:09 +00:00
Lluís Batlle i Rossell 71dc3b87eb Adding mairix 
svn path=/nixpkgs/trunk/; revision=28122
 2011-08-02 14:26:47 +00:00
Sander van der Burg 034fb4fa11 Bumped midnight commander to version 4.7.5.3 
svn path=/nixpkgs/trunk/; revision=28106
 2011-08-01 10:24:14 +00:00
Shea Levy e861fb2bcd Remove unzip 5.52, make unzip 6.0 default 
As per TODO in all-packages.nix comments

svn path=/nixpkgs/branches/stdenv-updates/; revision=28101
 2011-08-01 04:53:21 +00:00
Shea Levy 6e06060c33 zip: Make it actually install something 
svn path=/nixpkgs/trunk/; revision=28050
 2011-08-01 01:11:01 +00:00
Shea Levy 3a74fd3f3b zip: Bump to 3.0 
svn path=/nixpkgs/trunk/; revision=28049
 2011-08-01 01:10:52 +00:00
Shea Levy 92e792f17b zip: Change formatting 
svn path=/nixpkgs/trunk/; revision=28048
 2011-08-01 01:10:44 +00:00
Shea Levy 6a34912bfb zip: Folded builder into derivation 
svn path=/nixpkgs/trunk/; revision=28047
 2011-08-01 01:10:36 +00:00
Eelco Dolstra 1b427fe052 * Sync with the trunc. 
* Fixed the hash in PulseAudio: I updated the name/version, but forgot
  to update the hash.  So secretly it was still building the old
  version.  Also, now that we've realised that the PulseAudio server
  and library don't need to be the same build, disable some
  dependencies by default (avahi and bluez).

svn path=/nixpkgs/branches/kde-4.7/; revision=28023
 2011-07-31 19:44:58 +00:00
Peter Simons de4c559ce9 tree: configure build for BSD Unix 
svn path=/nixpkgs/trunk/; revision=27948
 2011-07-25 17:24:49 +00:00
Peter Simons 486ff3ff40 tree: configure build for Cygwin 
svn path=/nixpkgs/trunk/; revision=27947
 2011-07-25 17:19:37 +00:00
Peter Simons 31d1abd4a1 tree: OBJS+=... doesn't work on the make command line, use EXTRA_OBJS variable instead 
svn path=/nixpkgs/trunk/; revision=27919
 2011-07-24 19:36:03 +00:00
Peter Simons 3415f0f088 tree: the tool ought to compile everywhere, so let's give it a try 
svn path=/nixpkgs/trunk/; revision=27918
 2011-07-24 19:15:09 +00:00
Peter Simons e0e42141d9 tree: blind attempt to fix the build on Darwin 
svn path=/nixpkgs/trunk/; revision=27917
 2011-07-24 19:15:03 +00:00
Peter Simons 7743596401 all-packages.nix: added the 'tree' utility 
svn path=/nixpkgs/trunk/; revision=27916
 2011-07-24 09:57:06 +00:00
Eelco Dolstra 982a83aa2e * Added udisks, the replacement of the disk management bits of HAL 
(which is obsolete).
* lvm2: updated to 2.02.86.  Also install the pkgconfig files and
  build liblvm2app.
* Added libatasmart (udisks dependency for querying ATA SMART status).
* Updated sg3_utils to 1.31.

svn path=/nixpkgs/branches/kde-4.7/; revision=27908
 2011-07-23 01:29:51 +00:00
Eelco Dolstra 9379248ef3 * Update kdeadmin and kdegames. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27898
 2011-07-22 01:28:09 +00:00
Eelco Dolstra a75f9edd10 svn path=/nixpkgs/branches/kde-4.7/; revision=27897 2011-07-21 22:18:52 +00:00
Eelco Dolstra f9320cb33a * Update system-config-printer to 1.3.4. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27896
 2011-07-21 22:18:41 +00:00
Peter Simons 62eab9e44a pdsh: updated to version 2.26 
svn path=/nixpkgs/trunk/; revision=27858
 2011-07-20 18:58:34 +00:00
Peter Simons b9d382c2dd libtorrent: use sha256 hash returned by nix-prefetch-url 
svn path=/nixpkgs/trunk/; revision=27827
 2011-07-18 15:23:03 +00:00
Peter Simons 7c19a3a691 rtorrent: updated to version 0.8.9 
svn path=/nixpkgs/trunk/; revision=27824
 2011-07-18 14:34:46 +00:00
Peter Simons 21691b47d7 libtorrent: updated to version 0.12.9 
svn path=/nixpkgs/trunk/; revision=27823
 2011-07-18 14:34:33 +00:00
Eelco Dolstra 4cc476fa52 * Update nixUnstable. 
svn path=/nixpkgs/trunk/; revision=27782
 2011-07-14 17:16:00 +00:00
Peter Simons 7049b34b10 glxinfo: updated to version 8.0.1 
svn path=/nixpkgs/trunk/; revision=27779
 2011-07-14 12:23:03 +00:00
Peter Simons dc31e088c0 Added archivemount-0.6.1, a FUSE-based file system for mounting tar archives. 
svn path=/nixpkgs/trunk/; revision=27758
 2011-07-13 12:33:54 +00:00
Peter Simons 132b87eced nbd: updated to 2.9.23 
svn path=/nixpkgs/trunk/; revision=27675
 2011-07-08 16:01:59 +00:00
Sander van der Burg 84be287f40 bumped disnixos 
svn path=/nixpkgs/trunk/; revision=27673
 2011-07-08 14:42:13 +00:00
Peter Simons 8e79697a84 smartmontools: updated to version 5.41 
svn path=/nixpkgs/trunk/; revision=27671
 2011-07-08 10:51:18 +00:00
Ludovic Courtès e7e3bea7bf Update Nix unstable. 
svn path=/nixpkgs/trunk/; revision=27596
 2011-07-04 14:44:46 +00:00
Ludovic Courtès ce954e5a5a GNU Parallel 20110622. 
svn path=/nixpkgs/trunk/; revision=27591
 2011-07-04 11:52:44 +00:00
Ludovic Courtès 3e0fbce76b GNU xorriso 1.1.0pl01. 
svn path=/nixpkgs/trunk/; revision=27590
 2011-07-04 11:52:41 +00:00
Ludovic Courtès 328dc1f386 GNU mtools 4.0.17. 
svn path=/nixpkgs/trunk/; revision=27589
 2011-07-04 11:52:37 +00:00
Ludovic Courtès f710ffff12 GNU FreeIPMI 1.0.5. 
svn path=/nixpkgs/trunk/; revision=27588
 2011-07-04 11:52:34 +00:00
Karn Kallio cbb0e62780 Advance lftp to version 4.3.1 
svn path=/nixpkgs/trunk/; revision=27579
 2011-07-02 19:19:48 +00:00
Michael Raskin b2ec2c245a Fix wrong attribute reference addition 
svn path=/nixpkgs/trunk/; revision=27574
 2011-07-01 13:39:02 +00:00
Michael Raskin 9ee4b2ceab Updating graphviz and adding an old version 
svn path=/nixpkgs/trunk/; revision=27573
 2011-07-01 13:29:42 +00:00
Michael Raskin c1686c051d Adding Welkin RDF visualizer 
svn path=/nixpkgs/trunk/; revision=27567
 2011-07-01 07:26:38 +00:00
Michael Raskin e9d66565d7 Adding wavemon 
svn path=/nixpkgs/trunk/; revision=27557
 2011-06-29 09:53:35 +00:00
Ludovic Courtès f45f45544e Seeks 0.3.3. 
svn path=/nixpkgs/trunk/; revision=27556
 2011-06-29 07:52:27 +00:00
Sander van der Burg 24e3b3a58b Added opkg package 
svn path=/nixpkgs/trunk/; revision=27554
 2011-06-28 09:45:51 +00:00
Lluís Batlle i Rossell 0486e0218a Updating duplicity. 
svn path=/nixpkgs/trunk/; revision=27532
 2011-06-23 07:20:42 +00:00
Sander van der Burg 3496c064d8 Bumped DisnixOS which has no longer issues with the new nixos-build-vms 
svn path=/nixpkgs/trunk/; revision=27530
 2011-06-22 22:27:42 +00:00
Florian Friesdorf edd3c49119 mjpegtool 2.0.0 + more dependencies 
svn path=/nixpkgs/trunk/; revision=27520
 2011-06-22 19:01:14 +00:00
Lluís Batlle i Rossell 0f1bf98034 gparted was not building. I updated it and made it build (it only likes parted 2.x). 
Report by 'brainwash@freenode'


svn path=/nixpkgs/trunk/; revision=27515
 2011-06-21 18:00:23 +00:00
Yury G. Kudryashov 4484bbfdd8 lftp-4.2.3, use tar.xz 
svn path=/nixpkgs/trunk/; revision=27443
 2011-06-13 22:14:06 +00:00
Ludovic Courtès 2943c2eb78 GNU GRUB 1.99. 
svn path=/nixpkgs/trunk/; revision=27440
 2011-06-13 20:52:32 +00:00
Ludovic Courtès 79a7f578ec GNU fdisk 1.2.5. 
svn path=/nixpkgs/trunk/; revision=27438
 2011-06-13 20:52:19 +00:00
Eelco Dolstra d9abbc710a * AEFS updated to 0.3pre288. 
svn path=/nixpkgs/trunk/; revision=27424
 2011-06-11 22:23:43 +00:00
Michael Raskin 51fa598ba1 Fix 64-bit cuneiform build 
svn path=/nixpkgs/trunk/; revision=27402
 2011-06-09 08:23:58 +00:00
Michael Raskin 8e1984b852 Fix DMTX build 
svn path=/nixpkgs/trunk/; revision=27391
 2011-06-08 08:11:24 +00:00
Yury G. Kudryashov c5481bb1d8 pinentry: make gtk UI really optional 
svn path=/nixpkgs/trunk/; revision=27381
 2011-06-07 21:50:12 +00:00
Michael Raskin 4157b77097 Adding siege HTTP load tester 
svn path=/nixpkgs/trunk/; revision=27368
 2011-06-07 16:15:05 +00:00
Michael Raskin 812a94c8b0 Adding IOping 
svn path=/nixpkgs/trunk/; revision=27367
 2011-06-07 15:56:50 +00:00
Rob Vermaas d60ed7e1d1 add parted 2.3 for packages that are incompatible with 3.0 
svn path=/nixpkgs/trunk/; revision=27349
 2011-06-06 13:06:08 +00:00
Ludovic Courtès f03362d8c7 GNU Parted: Add Check as a dependency. 
svn path=/nixpkgs/trunk/; revision=27345
 2011-06-04 21:46:16 +00:00
Ludovic Courtès 8bfb02d945 GNU Sharutils 4.11.1. 
svn path=/nixpkgs/trunk/; revision=27320
 2011-05-30 21:48:50 +00:00
Ludovic Courtès 71bc026ba4 GNU Parallel 20110522. 
svn path=/nixpkgs/trunk/; revision=27319
 2011-05-30 21:48:43 +00:00
Ludovic Courtès bdc6f02ed0 GNU Parted 3.0. 
svn path=/nixpkgs/trunk/; revision=27318
 2011-05-30 21:48:37 +00:00
Peter Simons 47452c351b nbd: updated to version 2.9.22 
svn path=/nixpkgs/trunk/; revision=27316
 2011-05-30 20:08:18 +00:00
Michael Raskin 3e005d363a Update nmap 
svn path=/nixpkgs/trunk/; revision=27315
 2011-05-30 06:25:38 +00:00
Lluís Batlle i Rossell 074ef3fd85 Updating lrzip 
svn path=/nixpkgs/trunk/; revision=27304
 2011-05-25 22:19:53 +00:00
Russell O'Connor aaa09472bc Update bitcoin to 0.3.21 
svn path=/nixpkgs/trunk/; revision=27275
 2011-05-17 11:34:18 +00:00
Peter Simons bfa7c9791a nbd: disable test suite to avoid failures on Hydra (NixOS) 
svn path=/nixpkgs/trunk/; revision=27251
 2011-05-13 18:30:36 +00:00
Sander van der Burg e2897bdd52 Bumped versions of disnix and disnixos to deal with recent NixOS changes 
svn path=/nixpkgs/trunk/; revision=27248
 2011-05-13 13:23:13 +00:00
Eelco Dolstra 80d963dee0 * OpenSSH 5.8p2. 
svn path=/nixpkgs/trunk/; revision=27223
 2011-05-11 13:44:18 +00:00
Peter Simons faf10f25b5 nbd: enable doCheck 
The test suite runs fine on my Linux machine, but let's wait and see what Hydra
has to say about that.

svn path=/nixpkgs/trunk/; revision=27221
 2011-05-11 12:28:23 +00:00
Peter Simons c2e197e11b nbd: updated to 2.9.21a 
svn path=/nixpkgs/trunk/; revision=27220
 2011-05-11 12:28:18 +00:00
Peter Simons 455d173010 nbd: updated to 2.9.21 
svn path=/nixpkgs/trunk/; revision=27207
 2011-05-10 07:15:58 +00:00
Lluís Batlle i Rossell 4c6c2a0684 Adding a dependency of rtmpdump that was missing for it to build. 
svn path=/nixpkgs/trunk/; revision=27186
 2011-05-08 20:18:20 +00:00
Michael Raskin 683cc5634c Create needed symlink 
svn path=/nixpkgs/trunk/; revision=27185
 2011-05-08 18:46:55 +00:00
Michael Raskin 23bb7fa94e Update LXC 
svn path=/nixpkgs/trunk/; revision=27184
 2011-05-08 18:40:10 +00:00
Yury G. Kudryashov 24545fd218 obexd-0.40 
svn path=/nixpkgs/trunk/; revision=27183
 2011-05-08 11:33:59 +00:00
Lluís Batlle i Rossell e169ba953d Updating openvpn 
svn path=/nixpkgs/trunk/; revision=27153
 2011-05-04 18:58:53 +00:00
Shea Levy cc87dee3d8 Bump grub 1.9x to 1.99~rc2 
svn path=/nixpkgs/trunk/; revision=27150
 2011-05-04 18:27:26 +00:00
Eelco Dolstra 36b8f37e0f * Blueman: propagate obex-data-server to the user environment so that 
dbus can find its service file.

svn path=/nixpkgs/trunk/; revision=27146
 2011-05-04 14:10:17 +00:00
Eelco Dolstra ae4ea00df0 * obex-data-server updated to 0.4.6. 
svn path=/nixpkgs/trunk/; revision=27145
 2011-05-04 14:09:44 +00:00
Lluís Batlle i Rossell db287c1b38 Updating rrdtool. 
svn path=/nixpkgs/trunk/; revision=27096
 2011-05-02 17:03:05 +00:00
Michael Raskin 3827d28f27 Update nixCustom for all the dependencies of latest SVN Nix 
svn path=/nixpkgs/trunk/; revision=27084
 2011-05-02 08:29:01 +00:00
Ludovic Courtès 163c51f299 GNU mtools 4.0.16. 
svn path=/nixpkgs/trunk/; revision=27045
 2011-04-28 20:58:27 +00:00
Ludovic Courtès 159fead4c5 GNU Parallel 20110422. 
svn path=/nixpkgs/trunk/; revision=27044
 2011-04-28 20:58:20 +00:00
Ludovic Courtès dc4df7b3b4 GNU Xorriso 1.0.8. 
svn path=/nixpkgs/trunk/; revision=27043
 2011-04-28 20:58:15 +00:00
Ludovic Courtès f5041e03d9 GNU FreeIPMI 1.0.4. 
svn path=/nixpkgs/trunk/; revision=27042
 2011-04-28 20:58:10 +00:00
Lluís Batlle i Rossell 68cb3535e1 Making openssh cross-build. And making linux-pam almost cross-build, I think. 
This allows me to put sftp-server in the nanonote and use it through dropbear.


svn path=/nixpkgs/trunk/; revision=26971
 2011-04-25 15:41:32 +00:00
Lluís Batlle i Rossell 06c5e48804 Now yes allowing the sftp server path in dropbear. I commit too early, clearly. 
svn path=/nixpkgs/trunk/; revision=26970
 2011-04-25 15:04:56 +00:00
Lluís Batlle i Rossell a5923a2e13 Allow overriding the sftp server path. 
svn path=/nixpkgs/trunk/; revision=26969
 2011-04-25 15:03:13 +00:00
Lluís Batlle i Rossell 43c4e65c66 Now I patch dropbear properly for it to inherit the PATH. 
svn path=/nixpkgs/trunk/; revision=26968
 2011-04-25 14:57:46 +00:00
Lluís Batlle i Rossell e1a78aa1a0 Making dropbear sessions inherit the PATH 
svn path=/nixpkgs/trunk/; revision=26967
 2011-04-25 14:40:10 +00:00
Lluís Batlle i Rossell 89d42f7b57 Now yes, I commit properly the xbursttools update. Not to the master HEAD, as 
it fails to build. But to the lastest version I manage to build.


svn path=/nixpkgs/trunk/; revision=26965
 2011-04-25 13:24:51 +00:00
Lluís Batlle i Rossell 3642e1a505 Updating xburst-tools to a recent version, that should not have the bug about 
overwriting nand blocks beyond the pages specified.


svn path=/nixpkgs/trunk/; revision=26964
 2011-04-25 13:10:35 +00:00
Lluís Batlle i Rossell 1a83a07123 Updating pv 
svn path=/nixpkgs/trunk/; revision=26937
 2011-04-23 20:58:15 +00:00
Lluís Batlle i Rossell ee8b05eb70 Adding 'wakelan', to use UDP wake on lan on ethernet. 
svn path=/nixpkgs/trunk/; revision=26912
 2011-04-20 20:55:46 +00:00
Evgeny Egorochkin 8db68032a6 Tor: version bump 
svn path=/nixpkgs/trunk/; revision=26899
 2011-04-20 09:25:50 +00:00
Lluís Batlle i Rossell 167912d19e Adding xdotool 
svn path=/nixpkgs/trunk/; revision=26896
 2011-04-19 20:51:40 +00:00
Eelco Dolstra b2c4b433b4 * Added libpar2 and nzbget. 
svn path=/nixpkgs/trunk/; revision=26895
 2011-04-19 20:35:24 +00:00
Nicolas Pierron fec06f7196 davfs2: 
- Use previous version of neon library.
- Add patch to find ISDIR macros.

svn path=/nixpkgs/trunk/; revision=26865
 2011-04-17 08:27:29 +00:00
Nicolas Pierron 2cab2ce885 Fuppes: Fix support of faad2, backward compatibility macros were not 
expanded in strings.

svn path=/nixpkgs/trunk/; revision=26864
 2011-04-17 08:27:22 +00:00
Nicolas Pierron ebc8642aec Add colordiff package. 
svn path=/nixpkgs/trunk/; revision=26860
 2011-04-17 08:26:56 +00:00
Russell O'Connor a42b81d33d Updating optipng to 0.6.5 
svn path=/nixpkgs/trunk/; revision=26857
 2011-04-16 20:42:01 +00:00
Eelco Dolstra 03ef305478 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=26851
 2011-04-15 13:39:44 +00:00
Lluís Batlle i Rossell f4b6ea9ebc the hpn-ssh needs -lgcc_s, because of its pthread_cancel at the end. 
svn path=/nixpkgs/trunk/; revision=26833
 2011-04-13 20:44:17 +00:00
Lluís Batlle i Rossell 49a08c4f97 Updating the hpn-ssh patch. 
svn path=/nixpkgs/trunk/; revision=26831
 2011-04-13 20:24:06 +00:00
Cillian de Roiste bbde150183 Adding rockbox-utility, for installing/updating the rockbox firmware on mp3 players 
svn path=/nixpkgs/trunk/; revision=26817
 2011-04-13 08:38:13 +00:00
Karn Kallio 422455271c GnuTLS now introduces a dependency on gmp. 
-- also removed poorly considered earlier individual patches.

svn path=/nixpkgs/trunk/; revision=26810
 2011-04-12 16:59:52 +00:00
Karn Kallio e88ae7fa7d Pass libgcrypt and gmp to network manager. 
svn path=/nixpkgs/trunk/; revision=26808
 2011-04-12 16:31:51 +00:00
Ludovic Courtès 2473f8ee79 GNU FreeIPMI 1.0.3. 
svn path=/nixpkgs/trunk/; revision=26792
 2011-04-12 08:05:27 +00:00
Ludovic Courtès c21ed255d7 GNU Xorriso 1.0.6. 
svn path=/nixpkgs/trunk/; revision=26791
 2011-04-12 08:05:23 +00:00
Eelco Dolstra 4f3f7bd4ad * Memtest86+ updated to 4.20. 
svn path=/nixpkgs/trunk/; revision=26785
 2011-04-11 18:24:31 +00:00
Lluís Batlle i Rossell 240801542a Restoring grub 1.98 from svn, and adding it as a package apart. This allows 
easy using package overrides in nixos to use grub 1.98.

I found 1.98 can boot from /dev/md* devices, while 1.99rc1 cannot due to some
upstream problem. Once it works, we can remove this 1.98 again.


svn path=/nixpkgs/trunk/; revision=26761
 2011-04-09 09:25:06 +00:00
Michael Raskin 07fde1ab81 Fix BitTornado 
svn path=/nixpkgs/trunk/; revision=26757
 2011-04-08 14:59:29 +00:00
Lluís Batlle i Rossell 83556d37e9 Adding inadyn, a dynamic dns client. 
svn path=/nixpkgs/trunk/; revision=26743
 2011-04-07 20:26:26 +00:00
Russell O'Connor 78f9628037 wicd should no longer write into the nix store. 
But it doesn't compile optimized bytecode. :(  I would be good if someone who actually knew python could give this package some love.

svn path=/nixpkgs/trunk/; revision=26742
 2011-04-07 15:39:53 +00:00
Eelco Dolstra 687c2ccc17 * wicd updated to 1.7.1b2, which is compatible with Python 2.7. 
svn path=/nixpkgs/trunk/; revision=26727
 2011-04-06 22:06:00 +00:00
Eelco Dolstra 20a5c4d74a * ssmtp updated to 2.64. Also get rid of the cyclic symlink $out/lib/sendmail. 
svn path=/nixpkgs/trunk/; revision=26711
 2011-04-06 11:41:36 +00:00
Lluís Batlle i Rossell e15ce33404 Updating pdf2djvu 
svn path=/nixpkgs/trunk/; revision=26705
 2011-04-05 20:56:05 +00:00
Eelco Dolstra f99c0dd302 * Sync with the trunk. 
svn path=/nixpkgs/branches/modular-python/; revision=26678
 2011-04-04 13:36:05 +00:00
Peter Simons 4eab75bb92 pdsh: updated to 2.25 
svn path=/nixpkgs/trunk/; revision=26675
 2011-04-04 09:28:00 +00:00
Eelco Dolstra 601aeb1aa8 * Make sure that dhclient properly sets the hostname after reboots. 
svn path=/nixpkgs/branches/modular-python/; revision=26659
 2011-04-01 15:04:20 +00:00
Shea Levy d2cc005e67 Move system binaries to /sbin instead of /bin 
svn path=/nixpkgs/trunk/; revision=26656
 2011-04-01 14:12:53 +00:00
Lluís Batlle i Rossell f00bdb6f15 Adding a skeleton for a fsfs expression, but it still does not build. 
svn path=/nixpkgs/trunk/; revision=26631
 2011-03-31 21:08:50 +00:00
Eelco Dolstra 02b20395d5 * Added vlan, which provides the vconfig command. 
svn path=/nixpkgs/branches/modular-python/; revision=26624
 2011-03-31 11:10:00 +00:00
Lluís Batlle i Rossell 6aa761ab3b Removing a superfluous argument in upx 
svn path=/nixpkgs/trunk/; revision=26621
 2011-03-31 10:04:52 +00:00
Lluís Batlle i Rossell 56acf8aeb0 Updating upx (and I tried to make it use fine lzma and ucl) 
svn path=/nixpkgs/trunk/; revision=26620
 2011-03-31 09:49:54 +00:00
Eelco Dolstra 83b4c9cd8f * Provide an old version of Boto for euca2ools. 
svn path=/nixpkgs/branches/modular-python/; revision=26608
 2011-03-30 14:42:20 +00:00
Eelco Dolstra 45159cdc89 * Added euca2ools. 
svn path=/nixpkgs/branches/modular-python/; revision=26607
 2011-03-30 14:37:53 +00:00
Eelco Dolstra 8df32943a0 * ec2-api-tools updated to 1.4.2.2. 
svn path=/nixpkgs/branches/modular-python/; revision=26606
 2011-03-30 14:17:26 +00:00
Michael Raskin 4f65f33e11 Adding XDaliClock 
svn path=/nixpkgs/trunk/; revision=26591
 2011-03-29 10:32:49 +00:00
Eelco Dolstra 1439ae44be * Sync with the trunk. 
svn path=/nixpkgs/branches/modular-python/; revision=26586
 2011-03-28 20:22:30 +00:00
Eelco Dolstra 641834ddf6 * Bazaar: update to 2.3.1. 
svn path=/nixpkgs/branches/modular-python/; revision=26573
 2011-03-28 15:47:50 +00:00
Eelco Dolstra f119c267de * getmail: don't use pythonFull. 
svn path=/nixpkgs/branches/modular-python/; revision=26566
 2011-03-28 13:13:15 +00:00
Lluís Batlle i Rossell 08341727ae Updating gpt (patch by Shea Levy) 
svn path=/nixpkgs/trunk/; revision=26545
 2011-03-27 14:02:51 +00:00
Evgeny Egorochkin ac951a6469 coreutils: add SELinux support 
svn path=/nixpkgs/trunk/; revision=26543
 2011-03-27 04:46:25 +00:00
Evgeny Egorochkin 804bb9c8d1 polkit-gnome: packaged 
svn path=/nixpkgs/trunk/; revision=26527
 2011-03-26 18:18:39 +00:00
Evgeny Egorochkin 27c14e39b7 nm-applet: packaged 
svn path=/nixpkgs/trunk/; revision=26526
 2011-03-26 18:18:32 +00:00
Evgeny Egorochkin 4e512751ae knetworkmanager: fix license 
svn path=/nixpkgs/trunk/; revision=26525
 2011-03-26 18:14:28 +00:00
Eelco Dolstra a3fb3b00ce * ndisc6: use /var for rdnssd. 
svn path=/nixpkgs/trunk/; revision=26495
 2011-03-24 16:03:43 +00:00
Eelco Dolstra 6080181882 * dnssort requires Perl. 
svn path=/nixpkgs/trunk/; revision=26494
 2011-03-24 15:26:11 +00:00
Eelco Dolstra be0d0b8a13 * Added ndisc6 (which contains IPv6 related commands such as ndisc6, 
rdisc6 and rdnssd).

svn path=/nixpkgs/trunk/; revision=26492
 2011-03-24 14:30:06 +00:00
Ludovic Courtès 0333bc298d GNU Parallel 20110322. 
svn path=/nixpkgs/trunk/; revision=26481
 2011-03-23 21:55:59 +00:00
Lluís Batlle i Rossell 34deb53fd7 Adding the efibootmgr, patch sent by Shea Levy. 
svn path=/nixpkgs/trunk/; revision=26456
 2011-03-22 13:21:24 +00:00
Eelco Dolstra 7cbb426eae * dhclient: don't flush IPv6 addresses/routes. 
svn path=/nixpkgs/trunk/; revision=26455
 2011-03-22 12:55:55 +00:00
Lluís Batlle i Rossell 4fce3aceb0 Adding xbindkeys (now with all the files) 
svn path=/nixpkgs/trunk/; revision=26448
 2011-03-21 18:10:20 +00:00
Andres Löh 83f99d0c38 lhs2tex version bump. 
svn path=/nixpkgs/trunk/; revision=26425
 2011-03-18 15:03:01 +00:00
Michael Raskin 23f8f4d7b6 Update x11vnc 
svn path=/nixpkgs/trunk/; revision=26405
 2011-03-17 21:08:01 +00:00
Eelco Dolstra b3667a1e8f * Sync with the trunk. 
svn path=/nixpkgs/branches/modular-python/; revision=26347
 2011-03-16 09:39:40 +00:00
Yury G. Kudryashov db3b157ff6 gnokii-0.6.30, add ical and gtk support 
svn path=/nixpkgs/trunk/; revision=26334
 2011-03-15 23:09:14 +00:00
Yury G. Kudryashov a9eb45ae18 Add bluedevil 
svn path=/nixpkgs/trunk/; revision=26333
 2011-03-15 23:09:07 +00:00
Eelco Dolstra f208edd1a5 * Merge the x-updates branch. 
svn path=/nixpkgs/trunk/; revision=26330
 2011-03-15 18:29:27 +00:00
Lluís Batlle i Rossell 1573081b61 Adding gptfdisk (patch by Shea Levy). 
I add him in the maintainers list.
I changed slightly the indentation of the expressions.


svn path=/nixpkgs/trunk/; revision=26304
 2011-03-14 21:13:35 +00:00
Eelco Dolstra 3e3eac2e30 * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26303
 2011-03-14 18:26:46 +00:00
Andres Löh 3e0ac9b040 Major Haskell packages overhaul. 
Several changes, some highlights:

  * Structure of haskell-packages.nix updated. It's now easier to
    select different default versions of packages for different
    versions of GHC.

  * GHC 7.0.2 is now default.

  * Haskell Platform 2011.2.0.0 has been added and is now default.

  * Several packages have been updated
    (gtk2hs, gitit, xmonad, darcs, ...).

  * Some old packages have been removed.

svn path=/nixpkgs/trunk/; revision=26288
 2011-03-12 17:28:15 +00:00
Lluís Batlle i Rossell 587a175abf Updating duplicity. I think this may correct https://bugs.launchpad.net/duplicity/+bug/579958 . 
svn path=/nixpkgs/trunk/; revision=26269
 2011-03-11 09:11:02 +00:00
Ludovic Courtès 06c2608697 GNU Xorriso 1.0.4. 
svn path=/nixpkgs/trunk/; revision=26262
 2011-03-10 16:27:48 +00:00
Ludovic Courtès ed248647e0 GNU Xorriso 1.0.2. 
svn path=/nixpkgs/trunk/; revision=26254
 2011-03-10 14:53:36 +00:00
Eelco Dolstra 8dc531a5b7 * dnsmasq updated to 2.57. 
svn path=/nixpkgs/trunk/; revision=26249
 2011-03-10 13:35:19 +00:00
Eelco Dolstra cc3d1e1c09 * Sync with trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26243
 2011-03-10 08:48:14 +00:00
Karn Kallio 400a5b054a Remove unnecessary postInstall added to grub expression in r26239, 
as pointed out by Shea Levy.

svn path=/nixpkgs/trunk/; revision=26240
 2011-03-09 19:41:51 +00:00
Karn Kallio f5eba6cc5d Fix grub error "cp cannot stat .... unicode.pf2 
-- change postPatch hook to prePatch (postPatch is not run with empty patchset)
-- make the share/grub directory and copy unicode.pf2 there

svn path=/nixpkgs/trunk/; revision=26239
 2011-03-09 18:58:09 +00:00
Ludovic Courtès 430228c30f GRUB-EFI: Use throw' instead of abort'. 
svn path=/nixpkgs/trunk/; revision=26219
 2011-03-09 10:30:56 +00:00
Ludovic Courtès 6e69b4dbd0 GNU GRUB 1.9 for UEFI. 
Based on a patch by Shea Levy <shea@shealevy.com>.

svn path=/nixpkgs/trunk/; revision=26216
 2011-03-08 23:26:41 +00:00
Ludovic Courtès 499b5ca40a GNU GRUB 1.99~rc1. 
svn path=/nixpkgs/trunk/; revision=26215
 2011-03-08 23:26:35 +00:00
Eelco Dolstra f16a2dc2f6 * Sync with the trunk. Remove glib_2_28 because the branch already 
has it.

svn path=/nixpkgs/branches/x-updates/; revision=26189
 2011-03-07 12:17:12 +00:00
Yury G. Kudryashov c8f0c74ecc Add vorbisgain - replaygain for ogg/vorbis 
svn path=/nixpkgs/trunk/; revision=26176
 2011-03-06 16:07:37 +00:00
Yury G. Kudryashov ecf4f6b4e2 Add mkcue (an optional dep of abcde) 
svn path=/nixpkgs/trunk/; revision=26175
 2011-03-06 16:07:31 +00:00
Eelco Dolstra eb4b1e8b04 * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26141
 2011-03-03 12:02:50 +00:00
Ludovic Courtès 99a303b0dc GNU Coreutils 8.10. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=26117
 2011-02-25 15:28:22 +00:00
Ludovic Courtès ca1aa628b9 GNU FreeIPMI 1.0.2. 
svn path=/nixpkgs/trunk/; revision=26084
 2011-02-23 21:24:37 +00:00
Ludovic Courtès 20111bb05a GNU Source-Highlight 3.1.4. 
svn path=/nixpkgs/trunk/; revision=26079
 2011-02-23 17:36:32 +00:00
Ludovic Courtès f1f647e6fc GNU Xnee 3.09. 
svn path=/nixpkgs/trunk/; revision=26078
 2011-02-23 17:36:28 +00:00
Eelco Dolstra d47cf5a35e * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26054
 2011-02-22 10:00:18 +00:00
Eelco Dolstra 33b5637b37 * Added radvd, the Router Advertisement Daemon. 
svn path=/nixpkgs/trunk/; revision=26032
 2011-02-19 16:04:34 +00:00
Michael Raskin 1ff642f723 Adding SMBNetFS 
svn path=/nixpkgs/trunk/; revision=26030
 2011-02-19 09:56:35 +00:00
Sander van der Burg 293caf43c4 Updated Disnix to use disnix-0.2 release packages 
svn path=/nixpkgs/trunk/; revision=26027
 2011-02-18 15:58:08 +00:00
Eelco Dolstra d6c6f9f0e0 * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26018
 2011-02-17 16:33:39 +00:00
Eelco Dolstra 0970ed2f9b * Bump. 
svn path=/nixpkgs/trunk/; revision=26016
 2011-02-17 15:25:54 +00:00
Eelco Dolstra 1062dbd1b0 * Bump. 
svn path=/nixpkgs/trunk/; revision=26012
 2011-02-17 13:37:48 +00:00
Ludovic Courtès ad5adaca9e GNU recutils 1.3. 
svn path=/nixpkgs/trunk/; revision=26002
 2011-02-16 22:50:06 +00:00
Eelco Dolstra 9b6dfe840a * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=25993
 2011-02-16 15:14:04 +00:00
Florian Friesdorf 4621178b75 aircrack-1.0-rc2 -> 1.1-1859 (current trunk) 
latest stable does not compile with gcc 4.5

svn path=/nixpkgs/trunk/; revision=25972
 2011-02-14 22:40:51 +00:00
Eelco Dolstra 8df800d92c * nbd: fix build. 
svn path=/nixpkgs/branches/x-updates/; revision=25952
 2011-02-14 10:24:18 +00:00
Eelco Dolstra a3f620c3cc * Graphviz: fix the build and update it to 2.26.3. 
svn path=/nixpkgs/branches/x-updates/; revision=25947
 2011-02-14 10:01:58 +00:00
Yury G. Kudryashov dae53e0ea6 Make gdmap compile with newer gtk 
svn path=/nixpkgs/branches/x-updates/; revision=25922
 2011-02-12 20:16:08 +00:00
Karn Kallio ad303411cc Advance lftp to current release version 4.1.3 
svn path=/nixpkgs/trunk/; revision=25912
 2011-02-11 18:05:35 +00:00
Sander van der Burg cd2df27b1c Bumped Disnix versions and added them to release.nix 
svn path=/nixpkgs/trunk/; revision=25899
 2011-02-11 12:53:23 +00:00
Eelco Dolstra 6ca6fd8fc6 * Use Nix with SQLite in NixOS by default. Cross fingers. 
svn path=/nixpkgs/trunk/; revision=25898
 2011-02-11 12:45:19 +00:00
Eelco Dolstra dd3d477d74 * DHCP 4.1.2. 
svn path=/nixpkgs/trunk/; revision=25897
 2011-02-11 12:24:24 +00:00
Michael Raskin 9a9d97642a Pass SQLite to nix-custom 
svn path=/nixpkgs/trunk/; revision=25887
 2011-02-10 17:13:48 +00:00
Ludovic Courtès 1b4e4b398f GNU sharutils 4.11. 
svn path=/nixpkgs/trunk/; revision=25876
 2011-02-09 21:36:39 +00:00
Ludovic Courtès 2752fe91b8 GNU recutils 1.2. 
svn path=/nixpkgs/trunk/; revision=25875
 2011-02-09 21:36:34 +00:00
Ludovic Courtès af2df2369e GNU Parallel 20110205. 
svn path=/nixpkgs/trunk/; revision=25874
 2011-02-09 21:36:28 +00:00
Eelco Dolstra 209939f6f2 * OpenSSH 5.8. 
svn path=/nixpkgs/trunk/; revision=25808
 2011-02-08 13:13:34 +00:00
Lluís Batlle i Rossell 65968c289a Adding isync 
svn path=/nixpkgs/trunk/; revision=25798
 2011-02-07 23:07:21 +00:00
Peter Simons de867f283d pkgs/tools/networking/nbd: updated to version 2.9.20 
svn path=/nixpkgs/trunk/; revision=25769
 2011-02-03 12:36:19 +00:00
Eelco Dolstra e9584a8f91 * Updated AEFS. 
svn path=/nixpkgs/trunk/; revision=25763
 2011-02-02 15:12:15 +00:00
David Guibert 1af9963d76 update keychain to 2.7.1 
svn path=/nixpkgs/trunk/; revision=25734
 2011-01-31 09:42:44 +00:00
Nicolas Pierron 08fd6e32c9 Add fuppes-0.660: UPnP A/V Media Server. 
svn path=/nixpkgs/trunk/; revision=25728
 2011-01-30 16:45:42 +00:00
Ludovic Courtès 4a5c37a70f GNU Xnee 3.08. 
svn path=/nixpkgs/trunk/; revision=25726
 2011-01-30 16:11:36 +00:00
Rob Vermaas e3e13aaeb7 unshield, use latest svn version 
svn path=/nixpkgs/trunk/; revision=25725
 2011-01-30 15:30:22 +00:00
Ludovic Courtès 5fab1d50c4 GnuPG 2.0.17. 
svn path=/nixpkgs/trunk/; revision=25705
 2011-01-27 20:12:37 +00:00
Ludovic Courtès 932da79eca GNU Parallel 20110125. 
svn path=/nixpkgs/trunk/; revision=25704
 2011-01-27 20:12:33 +00:00
Ludovic Courtès e49a8a1807 Add GNU xorriso, which supersedes GNU mkisofs. 
svn path=/nixpkgs/trunk/; revision=25703
 2011-01-27 20:12:28 +00:00
Ludovic Courtès 8fb2edb85e GNU Parallel 20110122. 
svn path=/nixpkgs/trunk/; revision=25684
 2011-01-24 22:29:25 +00:00
Ludovic Courtès 7e9aa0366f GNU ddrescue 1.14. 
svn path=/nixpkgs/trunk/; revision=25683
 2011-01-24 22:29:19 +00:00
Michael Raskin f863b73829 Adding FreeIPMI 
svn path=/nixpkgs/trunk/; revision=25679
 2011-01-24 07:06:17 +00:00
Rob Vermaas 24c9b1f3b9 added dmg2img-1.6.2 
svn path=/nixpkgs/trunk/; revision=25667
 2011-01-22 12:28:59 +00:00
Rob Vermaas c04dac0923 added vfdecrypt 
svn path=/nixpkgs/trunk/; revision=25666
 2011-01-22 12:14:25 +00:00
Michael Raskin 618e45c0f3 Adding ipmiutil 
svn path=/nixpkgs/trunk/; revision=25660
 2011-01-21 19:15:10 +00:00
Ludovic Courtès f0345dd48c Seeks 0.3.1. 
svn path=/nixpkgs/trunk/; revision=25638
 2011-01-19 22:56:31 +00:00
Sander van der Burg 45f6a2587f bump disnixos 
svn path=/nixpkgs/trunk/; revision=25629
 2011-01-19 13:46:13 +00:00
Sander van der Burg a4877e2d33 Bumped disnix activation scripts 
svn path=/nixpkgs/trunk/; revision=25620
 2011-01-18 23:08:40 +00:00
Sander van der Burg a9db6a68c2 Bumped versions of Disnix packages, which all have less technical debt 
svn path=/nixpkgs/trunk/; revision=25607
 2011-01-17 22:32:43 +00:00
Rob Vermaas b7f536027d enable lzma support in squashfs-tools 
svn path=/nixpkgs/trunk/; revision=25602
 2011-01-17 19:41:05 +00:00