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

1997 commits

Author SHA1 Message Date
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 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
Michael Raskin 259e59148e Adding GTK-VNC 
svn path=/nixpkgs/trunk/; revision=25547
 2011-01-13 22:21:09 +00:00
Michael Raskin 18d0193c18 Update TigerVNC 
svn path=/nixpkgs/trunk/; revision=25546
 2011-01-13 22:08:03 +00:00
Ludovic Courtès 80a9a7f8bb Wicd: Add a template for WPA2-TTLS. 
svn path=/nixpkgs/trunk/; revision=25534
 2011-01-13 10:03:20 +00:00
Ludovic Courtès 9b9b5e2f53 Work around hard-coded /usr/bin/nroff' in configure'. 
svn path=/nixpkgs/trunk/; revision=25533
 2011-01-13 10:03:16 +00:00
Eelco Dolstra c8fe9d3b48 * e2fsprogs 1.41.14. 
svn path=/nixpkgs/trunk/; revision=25520
 2011-01-12 14:29:22 +00:00
Eelco Dolstra d82dc5c965 * Added vde2 (Virtual Distributed Ethernet). 
svn path=/nixpkgs/trunk/; revision=25518
 2011-01-12 13:39:17 +00:00
David Guibert 6fa69548b1 aria2: 1.9.3 -> 1.10.8 
svn path=/nixpkgs/trunk/; revision=25505
 2011-01-11 13:42:49 +00:00
Michael Raskin e7cb1ea803 Update plan9port to make it build 
svn path=/nixpkgs/trunk/; revision=25496
 2011-01-10 19:41:58 +00:00
Michael Raskin f9a6c93d43 Adding mtr. 
svn path=/nixpkgs/trunk/; revision=25495
 2011-01-10 15:57:23 +00:00
Karn Kallio 3905064194 Patch cdrdao to be compatible with the glibc 2.12 
svn path=/nixpkgs/trunk/; revision=25492
 2011-01-10 14:59:24 +00:00
Michael Raskin 0eaec55235 Adding UDFtools 
svn path=/nixpkgs/trunk/; revision=25485
 2011-01-10 11:04:20 +00:00
Ludovic Courtès 346673605b GNU Parallel 20101222. 
svn path=/nixpkgs/trunk/; revision=25448
 2011-01-06 14:38:03 +00:00
Ludovic Courtès c59551c32c GNU Recutils 1.1. 
svn path=/nixpkgs/trunk/; revision=25447
 2011-01-06 14:37:59 +00:00
Lluís Batlle i Rossell 3fed0dff5d Telling fakeroot to build only on linux 
svn path=/nixpkgs/trunk/; revision=25441
 2011-01-06 10:51:10 +00:00
Lluís Batlle i Rossell eb3d75b740 Adding fakeroot. 
svn path=/nixpkgs/trunk/; revision=25440
 2011-01-06 10:43:32 +00:00
Karn Kallio bebcd96c1d Apply patch taken from http://www.linuxfromscratch.org/blfs/view/svn/general/bc.html 
to fix segfault when using -l option.

svn path=/nixpkgs/trunk/; revision=25432
 2011-01-06 03:11:25 +00:00
Rob Vermaas 1b81032553 do not build dcraw on cygwin 
svn path=/nixpkgs/trunk/; revision=25415
 2011-01-05 10:08:49 +00:00
Rob Vermaas 1b51c304ab do not build convmv on darwin 
svn path=/nixpkgs/trunk/; revision=25414
 2011-01-05 10:07:42 +00:00
Rob Vermaas a3c649f969 only build asymptote on linux, because it has never built on any platforms other than linux 
svn path=/nixpkgs/trunk/; revision=25406
 2011-01-05 09:31:49 +00:00
Evgeny Egorochkin 180205a431 knetwork-manager: package and enable support in KDE to see what is going to break. 
svn path=/nixpkgs/trunk/; revision=25375
 2011-01-04 00:28:22 +00:00
Evgeny Egorochkin 857ea5f7cd network-manager: try fixing compilation for x86_64-linux. 
svn path=/nixpkgs/trunk/; revision=25374
 2011-01-03 22:34:50 +00:00
Yury G. Kudryashov 45b8ce020f network-manager: use mirror://gnome 
svn path=/nixpkgs/trunk/; revision=25371
 2011-01-03 19:10:01 +00:00
Evgeny Egorochkin 9b50ebd825 network-manager: packaged, maybe even works. 
svn path=/nixpkgs/trunk/; revision=25367
 2011-01-03 18:01:10 +00:00
Eelco Dolstra c1eb464f3c * Build those Python modules in the Python distribution that require 
additional dependencies (e.g. SQLite, X11, or Tcl/Tk) outside the
  main Python package (i.e., pythonBase).  This makes pythonFull
  unnecessary: you can just pass the additional modules as
  buildInputs to packages that require them, e.g.

    buildInputs = [ pythonModules.sqlite3 ];

svn path=/nixpkgs/branches/modular-python/; revision=25364
 2011-01-03 16:25:11 +00:00
Michael Raskin 29cd3206f2 Adding ised 
svn path=/nixpkgs/trunk/; revision=25331
 2011-01-01 20:28:38 +00:00
Peter Simons b5f00acee2 pkgs/tools/networking/pdsh: updated to version 2.23 
svn path=/nixpkgs/trunk/; revision=25329
 2011-01-01 14:51:53 +00:00
Eelco Dolstra a1e444b3b0 * file updated to 5.04. 
svn path=/nixpkgs/trunk/; revision=25324
 2010-12-30 18:31:27 +00:00
Eelco Dolstra b7c7550c43 * Replace the Python "magic" module with the (apparently) more 
common one from the "file" package.

svn path=/nixpkgs/trunk/; revision=25322
 2010-12-29 19:19:56 +00:00
Yury G. Kudryashov 0d730b4362 Add sp compatibility wrapper 
This wrapper is required by some old programs (e.g., po4a which I'm trying to package)

svn path=/nixpkgs/trunk/; revision=25320
 2010-12-29 18:04:11 +00:00
Eelco Dolstra 5bb4096763 * Fix an evaluation error in xburst-tools. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25311
 2010-12-28 17:25:17 +00:00
Eelco Dolstra aa6f43149a * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25308
 2010-12-28 16:42:00 +00:00
Eelco Dolstra 1f5b61713e * Added libvdpau and vdpauinfo. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25296
 2010-12-27 18:30:52 +00:00
Sander van der Burg a8bfe3a9b1 Bumped disnix again 
svn path=/nixpkgs/trunk/; revision=25295
 2010-12-27 16:00:29 +00:00
Sander van der Burg 8e81fd9ee8 Bumped versions of disnix and disnixos 
svn path=/nixpkgs/trunk/; revision=25262
 2010-12-23 17:35:09 +00:00
Eelco Dolstra aceef005c3 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25244
 2010-12-22 17:02:03 +00:00
Lluís Batlle i Rossell a34fd23fc1 Fixing the openvpn url. 
svn path=/nixpkgs/trunk/; revision=25239
 2010-12-22 14:03:55 +00:00
Lluís Batlle i Rossell 9b59178909 Updating openvpn 
svn path=/nixpkgs/trunk/; revision=25237
 2010-12-22 13:34:19 +00:00
Sander van der Burg 80af0654fb Bumped activation scripts so that postgresql and subversion types are supported 
svn path=/nixpkgs/trunk/; revision=25234
 2010-12-22 13:31:25 +00:00
Eelco Dolstra 6c790bbbab * Bump. 
svn path=/nixpkgs/trunk/; revision=25228
 2010-12-21 16:29:01 +00:00
Ludovic Courtès bd311de25c GNU Recutils 1.0. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25227
 2010-12-21 16:26:34 +00:00
Lluís Batlle i Rossell c7de6bfeb3 Updating cromfs to 1.5.9.1, as the previous did not build with glibc 2.12. 
Thanks to Bisqwit for the quick reaction.


svn path=/nixpkgs/branches/stdenv-updates/; revision=25224
 2010-12-21 14:27:48 +00:00
Lluís Batlle i Rossell 22253677b3 Merging from trunk. The previous merge took the firefox 3.6 in a bad state. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25202
 2010-12-19 20:12:10 +00:00
Sander van der Burg c93a60d7a3 Bumped version of disnixos again 
svn path=/nixpkgs/trunk/; revision=25201
 2010-12-19 15:28:11 +00:00
Sander van der Burg 56032641f4 Updated disnixos 
svn path=/nixpkgs/trunk/; revision=25199
 2010-12-19 14:59:26 +00:00
Eelco Dolstra 206aeef557 * Memtest86+ updated to 4.10. 
svn path=/nixpkgs/trunk/; revision=25191
 2010-12-18 17:42:55 +00:00
Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
 2010-12-17 20:39:58 +00:00
Sander van der Burg d0a0f22c76 Updated Disnix packages and added disnixos 
svn path=/nixpkgs/trunk/; revision=25181
 2010-12-17 18:42:02 +00:00
Michael Raskin 55afe4bc5e Patch rlwrap to support high-bit characters 
svn path=/nixpkgs/trunk/; revision=25167
 2010-12-17 10:56:35 +00:00
Eelco Dolstra 229b94b30c svn path=/nixpkgs/trunk/; revision=25165 2010-12-17 08:56:53 +00:00
Michael Raskin 2b1fe76307 Mandatory HDF5 sub-minor-version update with no old version copies around 
svn path=/nixpkgs/trunk/; revision=25159
 2010-12-16 20:19:43 +00:00
Eelco Dolstra f14bafc04b * Bump nixSqlite. 
svn path=/nixpkgs/trunk/; revision=25118
 2010-12-14 10:56:25 +00:00
Ludovic Courtès f03da539a7 GNU tar 1.25. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25093
 2010-12-12 23:35:27 +00:00
Ludovic Courtès e7739d9407 GNU Coreutils 8.7. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25092
 2010-12-12 23:35:22 +00:00
Ludovic Courtès ef8619b4b2 GNU Parted: Allow cross-GNU builds. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25088
 2010-12-12 23:21:35 +00:00
Ludovic Courtès 2e819f094c GNU wdiff 0.6.5. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25084
 2010-12-12 20:19:48 +00:00
Ludovic Courtès 5ce453b66e GNU acct 6.5.5. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25083
 2010-12-12 20:19:43 +00:00
Ludovic Courtès 8404ee65b6 GNU Parallel 20101202. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25082
 2010-12-12 20:19:38 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
 2010-12-11 12:47:00 +00:00
Eelco Dolstra 97d4a54698 * nixSqlite: bump. Also, go back to using SQLite 3.7 because 3.6 also 
gives random "database image is malformed" errors.

svn path=/nixpkgs/trunk/; revision=25050
 2010-12-10 10:22:23 +00:00
Eelco Dolstra d6f066c8ed * e2fsprogs updated to 1.41.12. 
svn path=/nixpkgs/trunk/; revision=25035
 2010-12-08 17:58:18 +00:00
Eelco Dolstra 7236f87bed * Bump. 
svn path=/nixpkgs/trunk/; revision=25025
 2010-12-07 13:16:11 +00:00
Peter Simons 9bd9e32aa8 pkgs/tools/system/ipmitool: move --mandir and --infodir to standard locations 
svn path=/nixpkgs/trunk/; revision=25014
 2010-12-06 18:01:57 +00:00
Peter Simons d46e80976c pkgs/tools/admin/tightvnc: move --mandir and --infodir to standard locations 
svn path=/nixpkgs/trunk/; revision=25013
 2010-12-06 18:01:51 +00:00
Peter Simons dffe4189e7 pkgs/tools/X11/x11vnc: move --mandir and --infodir to standard locations 
svn path=/nixpkgs/trunk/; revision=25012
 2010-12-06 18:01:46 +00:00
Peter Simons b2ae5a5ba9 pkgs/tools/compression/bzip2: move --mandir into standard location $out/share/man 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25007
 2010-12-06 17:48:52 +00:00
Peter Simons 475cbea101 pkgs/tools/text/replace: move --mandir to standard location $out/share/man 
Also, fixed the type of $makeFlags, which is a string, not a list.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25006
 2010-12-06 17:43:57 +00:00
Eelco Dolstra b94588c5c4 * Remove obsolete patch. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25001
 2010-12-06 13:45:07 +00:00
Evgeny Egorochkin c76f114d20 tor:version bump 
svn path=/nixpkgs/trunk/; revision=24944
 2010-12-01 04:07:44 +00:00
Eelco Dolstra f088bd4791 * nixUnstable updated, now with garbage collector. 
svn path=/nixpkgs/trunk/; revision=24943
 2010-11-30 18:32:23 +00:00
Russell O'Connor d07675c415 Maybe this will fix wicd. 
svn path=/nixpkgs/trunk/; revision=24933
 2010-11-30 04:09:51 +00:00
Russell O'Connor 7f65afe3f3 Update wicd to 1.7.0 
svn path=/nixpkgs/trunk/; revision=24929
 2010-11-29 20:15:44 +00:00
Eelco Dolstra 6ff77b7f6c * tcpdump 4.1.1. 
svn path=/nixpkgs/trunk/; revision=24919
 2010-11-29 15:25:07 +00:00
Eelco Dolstra aa01c8abd6 * Added xdelta. 
svn path=/nixpkgs/trunk/; revision=24907
 2010-11-28 16:37:48 +00:00
Tobias Hammerschmidt 1db5a9df76 added tmux 
svn path=/nixpkgs/trunk/; revision=24904
 2010-11-28 12:38:35 +00:00
Evgeny Egorochkin 676562ac15 encfs: packaged. Patch by Ambrus Kaposi. 
svn path=/nixpkgs/trunk/; revision=24900
 2010-11-28 09:59:13 +00:00
Evgeny Egorochkin b89f2ef1e4 system-config-printer: fix runtime errors. Patch by Karn Kallio. 
svn path=/nixpkgs/trunk/; revision=24899
 2010-11-28 09:46:51 +00:00
Tobias Hammerschmidt 57c1632f11 added flvstreamer 
svn path=/nixpkgs/trunk/; revision=24884
 2010-11-26 20:04:07 +00:00
Lluís Batlle i Rossell e571333232 Making ts and tm crossbuild 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24870
 2010-11-26 14:12:10 +00:00
Ludovic Courtès c50a240e3d xtrace 1.0.2. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24854
 2010-11-25 09:38:28 +00:00
Michael Raskin 293704a6f8 Fix the makefile 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24816
 2010-11-22 23:16:05 +00:00
Michael Raskin 6af8a1debd Merging from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24804
 2010-11-22 11:39:42 +00:00
Michael Raskin 6a9414d938 Adding dd_rescue - this is not the same as GNU ddrescue which has not been updated for a long time 
svn path=/nixpkgs/trunk/; revision=24801
 2010-11-22 08:40:10 +00:00
Eelco Dolstra 165a3df7f5 * Update nixSqlite. 
svn path=/nixpkgs/trunk/; revision=24764
 2010-11-19 10:39:48 +00:00
Michael Raskin fb58f74d82 Updating from trunk again 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
 2010-11-17 17:03:09 +00:00
Michael Raskin 4c4b783a10 Fix typo 
svn path=/nixpkgs/trunk/; revision=24703
 2010-11-15 20:36:50 +00:00
Evgeny Egorochkin ecf54a3e6b lshw: disable gui by default since it's ugly. 
svn path=/nixpkgs/trunk/; revision=24689
 2010-11-15 10:12:55 +00:00
Evgeny Egorochkin b9b7665edd lshw: Packaged 
svn path=/nixpkgs/trunk/; revision=24688
 2010-11-15 09:52:57 +00:00
Lluís Batlle i Rossell 8746de3ae8 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
 2010-11-11 22:18:14 +00:00
Ludovic Courtès f1cd0dd6d9 Namazu 2.0.20. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24671
 2010-11-11 22:12:08 +00:00
Ludovic Courtès 9feaed78d2 ncftp: Get the source from Debian. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24664
 2010-11-11 17:32:53 +00:00
Michael Raskin df2d680da8 Kill -I- in fdm 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24643
 2010-11-10 16:14:18 +00:00
Rob Vermaas 7f5431f095 gnugrep: trying to fix darwin builds 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24634
 2010-11-10 07:45:41 +00:00
Ludovic Courtès c317c7f4bd GNU grep: Fix build on non-GNU platforms. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24627
 2010-11-09 13:12:31 +00:00
Yury G. Kudryashov 5b79f27f5c Upgrade ntfs-3g 
svn path=/nixpkgs/trunk/; revision=24617
 2010-11-07 23:20:02 +00:00
Peter Simons ffebdb77c3 Revert revision 24602. diffutils is part of stdenv and shouldn't have 
been modified in trunk.

svn path=/nixpkgs/trunk/; revision=24609
 2010-11-05 14:54:47 +00:00
Peter Simons 027f42695c The lxc package doesn't build on systems other than Linux. 
svn path=/nixpkgs/trunk/; revision=24608
 2010-11-05 14:49:42 +00:00
Peter Simons d5abf27257 pkgs/tools/networking/pdsh: fixed location of "info" and "man" directories 
svn path=/nixpkgs/trunk/; revision=24604
 2010-11-05 14:35:30 +00:00
Peter Simons ceb2468657 pkgs/tools/text/diffutils: fixed location of "info" and "man" directories 
svn path=/nixpkgs/trunk/; revision=24602
 2010-11-05 14:35:18 +00:00
Peter Simons c13e0307b6 pkgs/tools/misc/screen: fixed various impurities 
Removed lots of hard-coded /usr/something paths from the configure script.
Moved $out/{info,man} to $out/share/{info,man}.

svn path=/nixpkgs/trunk/; revision=24601
 2010-11-05 14:35:14 +00:00
Ludovic Courtès 0a00613f89 fileschanged: Assorted nitpicks. 
svn path=/nixpkgs/trunk/; revision=24599
 2010-11-04 14:26:19 +00:00
Sander van der Burg 76e26dd7a1 - Renamed DisnixService => DisnixWebService 
- Updated to latest unstable version


svn path=/nixpkgs/trunk/; revision=24559
 2010-11-01 17:33:24 +00:00
Lluís Batlle i Rossell f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in 
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
 2010-10-31 19:30:31 +00:00
Lluís Batlle i Rossell 1d4fe44ecc Tell lxc to use /var instead of $out/var 
svn path=/nixpkgs/trunk/; revision=24551
 2010-10-31 19:25:51 +00:00
Ludovic Courtès 5c2974a0af Seeks 0.3.0. 
svn path=/nixpkgs/trunk/; revision=24549
 2010-10-30 21:44:36 +00:00
Michael Raskin 9a6c3e6fe9 Nix trunk requires pkgconfig 
svn path=/nixpkgs/trunk/; revision=24541
 2010-10-30 12:01:02 +00:00
Michael Raskin 9af1c42473 Pass BoehmGC to Nix 
svn path=/nixpkgs/trunk/; revision=24540
 2010-10-30 11:21:06 +00:00
Peter Simons e08d173663 pdsh: updated to version 2.22 
svn path=/nixpkgs/trunk/; revision=24539
 2010-10-30 09:51:38 +00:00
Peter Simons 7ec0584160 Added fileschanged version 0.6.9. 
svn path=/nixpkgs/trunk/; revision=24511
 2010-10-28 11:10:09 +00:00
Lluís Batlle i Rossell fdc0738e0b Adding lxc userland tools. 
svn path=/nixpkgs/trunk/; revision=24502
 2010-10-26 21:11:47 +00:00