1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 23:52:33 +00:00
Commit graph

6924 commits

Author SHA1 Message Date
Peter Simons c5c98b7617 Updated Haskell packages.
- derive: updated to version 2.5.9
 - ghc-mod: updated to version 1.11.0
 - hamlet: updated to version 1.0.1.4
 - http-conduit: updated to version 1.4.1.10
 - leksah: updated to version 0.12.1.3
 - mmap: updated to version 0.5.8
 - mtl: added version 2.1.2
 - prolog-graph-lib: updated to version 0.2.0.1
 - prolog: updated to version 0.2.0.1
 - reactive-banana-wx: updated to version 0.6.0.1
 - resourcet: updated to version 0.3.3
 - shelly: updated to version 0.12.0.2
 - simple-sendfile: updated to version 0.2.4
 - syb: added version 0.3.6.2
 - wai-app-static: updated to version 1.2.0.4
 - wai: updated to version 1.2.0.3
 - warp: updated to version 1.2.2
 - xml-types: updated to version 0.3.2
 - zlib-conduit: updated to version 0.4.0.2
2012-06-28 14:50:44 +02:00
Mathijs Kwik 42ea23675e ogmtools: new package 2012-06-28 11:41:58 +02:00
Mathijs Kwik 38bcd42219 shelly: new package through cabal2nix 2012-06-28 11:41:58 +02:00
Lluís Batlle i Rossell 002ffde4a4 trac: Removing the old misc/trac.
There is a much newer trac at python-packages.nix, and it is used
by nixos' trac apache service.
2012-06-27 22:34:27 +02:00
Lluís Batlle i Rossell 0a79aa8275 genshi: disabling tests. Two tests fail in my x86_64.
I left a comment next to 'doCheck = false'. I did not investigate
why the tests fail.
2012-06-27 22:07:09 +02:00
Lluís Batlle i Rossell db395d9eb3 cgdb: Packaging cgdb 0.6.6 2012-06-27 20:29:56 +02:00
Lluís Batlle 1f1a6c9773 Merge branch 'master' from viric's fork.
It has a few updates to some packages: taskwarrior, dar.
Also made links2 cross-build.
2012-06-27 19:33:34 +02:00
Shea Levy 3c7dba0dc6 Merge pull request #25 from antono/vala-generations
Vala 15, 16, 17. Default is 17 now
2012-06-26 20:23:57 -07:00
Antono Vasiljev 58738223ab Rm vala 14 add versions 2012-06-25 19:01:51 +03:00
Antono Vasiljev 182f0dfe5e Added bsod emulator for unix 2012-06-25 17:25:01 +03:00
Antono Vasiljev e6e6301c5f Vala 14, 15, 16, 17. Default is 17 now 2012-06-25 16:46:26 +03:00
Rob Vermaas 6dc45870af * Add MiniDLNA 1.0.24, media server 2012-06-24 20:24:58 +02:00
Lluís Batlle 7ab7120964 Merge remote-tracking branch 'central/master' 2012-06-24 19:03:50 +02:00
Antono Vasiljev bca195dcb8 Reordered alphabetically 2012-06-23 02:26:39 +03:00
Antono Vasiljev 1b2d1f8399 Added ubuntu-font-family 2012-06-23 01:55:47 +03:00
aszlig b1fdecc460 chromium: Rename "chrome" binary to "chromium".
This is to make it more consistent with the naming of the package file and also
consistent with the build, as we're not using the Google branded version.

In addition the derivation attribute set now has a packageName value which can
be used to easily switch the binary names and paths, just in case we want to
switch to using "chrome" (or something entirely different) again.
2012-06-22 15:53:29 -04:00
aszlig a31301dab4 chromium: Minimal build (no install) from source.
This only gets chromium to build so far, installation is missing by upstream, so
we need to manually copy the corresponding files. And I guess with nix, we also
need to patch a few paths on installation.

Another issue is that at the moment, a lot of dependencies are used from the
source tree, rather than from the system.

Also, it would be nice to build using LLVM, as it really speeds up compilation a
*LOT* and also has the side effect of resulting in smaller binaries.

Working unit tests would be nice, too. Unfortunately they're quite heavyweight
and take hours to run, so I guess "someday" would be the most appropriate time
to integrate.

Further todo's:

- Allow to disable GConf, GIO and CUPS.
- Option to disable the sandbox (for whatever reason the user might have).
- Integrate gold binutils.
- Pulseaudio support.
- Clearly separate Linux specific stuff.
2012-06-22 15:53:27 -04:00
aszlig b06fb762b4 Add tkabber plugins v0.11.1. 2012-06-22 14:47:34 -04:00
aszlig 74b408e151 Add tkabber v0.11.1. 2012-06-22 14:47:34 -04:00
aszlig 572cc12321 Add tkabber dependency tcltls v1.6. 2012-06-22 14:47:34 -04:00
aszlig 3c7da30e12 Add tkabber dependency tcllib v1.14. 2012-06-22 14:47:34 -04:00
aszlig 6c8509b98d Add tkabber dependency bwidget v1.9.5. 2012-06-22 14:47:34 -04:00
Eelco Dolstra d5bb10417e nixUnstable: Updated to 1.1pre2714_2f3f413
This version brings systemd support and automatic log compression.
2012-06-22 10:34:08 -04:00
Lluís Batlle 743cf1ec50 Removing the old unstable taskwarrior; the stable version is on 2.x already. 2012-06-22 15:53:42 +02:00
Eelco Dolstra 7925441bab net-snmp: Moved to pkgs/servers/monitoring 2012-06-21 15:22:17 -04:00
aszlig c1c74e45c5 Add fonts from the DOSEmu project.
These are mainly fonts like the DOS standard VGA fonts.
2012-06-20 23:25:16 -04:00
Eelco Dolstra 1582276602 * Drop some old obsolete kernels and unused patches.
svn path=/nixpkgs/trunk/; revision=34558
2012-06-19 15:56:17 +00:00
Peter Simons fc496faab0 Resurrect the hledger-web package.
svn path=/nixpkgs/trunk/; revision=34548
2012-06-18 15:22:07 +00:00
Peter Simons 8261e2a133 Removed obsolete hledger-{chart,vty} packages.
svn path=/nixpkgs/trunk/; revision=34547
2012-06-18 15:22:05 +00:00
Peter Simons df3afb4d13 haskell-QuickCheck: added version 2.5
svn path=/nixpkgs/trunk/; revision=34546
2012-06-18 15:22:01 +00:00
Peter Simons bc7c4c1951 Updated Haskell packages.
- base16-bytestring: updated to version 0.1.1.5
 - base64-bytestring: updated to version 0.1.1.3
 - bloomfilter: updated to version 1.2.6.10
 - cryptocipher: updated to version 0.3.5
 - gtk: updated to version 0.12.3.1
 - http-conduit: updated to version 1.4.1.9
 - snap-core: updated to version 0.9.0
 - snap-server: updated to version 0.9.0
 - stringsearch: updated to version 0.3.6.3
 - text: updated to version 0.11.2.2
 - void: updated to version 0.5.6

svn path=/nixpkgs/trunk/; revision=34542
2012-06-18 09:52:42 +00:00
Peter Simons 1e196a120f all-packages.nix: stripped trailing whitespace
svn path=/nixpkgs/trunk/; revision=34541
2012-06-18 09:52:37 +00:00
Peter Simons 5f81184129 all-packages.nix: fixed path to stardict expression
svn path=/nixpkgs/trunk/; revision=34540
2012-06-18 09:52:30 +00:00
Joachim Schiele 0de49e8c04 StarDict is a Cross-Platform and international dictionary Software. Now it is available on NixOS. See https://nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications if you want to get it running.
svn path=/nixpkgs/trunk/; revision=34531
2012-06-17 18:41:00 +00:00
Eelco Dolstra 5808b3804c * Add bchunk.
svn path=/nixpkgs/trunk/; revision=34529
2012-06-17 03:36:22 +00:00
Lluís Batlle i Rossell 3874e5812d Adding two kernel patches for mips, that make the life easier on loongson2f
(less sigill, less sigbus). Related to bad handling of FPU instructions.

I apply them only to linux 3.4, although I think they can apply to many older kernels too.


svn path=/nixpkgs/trunk/; revision=34522
2012-06-16 10:49:03 +00:00
Peter Simons da350b93a2 Updated Haskell packages.
- bson: updated to version 0.2.0
 - cpu: updated to version 0.1.1
 - defaults.nix: cosmetic
 - iteratee: updated to version 0.8.9.1
 - ListLike: updated to version 3.1.5
 - mongoDB: updated to version 1.3.0
 - packages.nix: cosmetic
 - stringsearch: added version 0.3.6.3
 - system-fileio: updated to version 0.3.8
 - wai-extra: updated to version 1.2.0.5

svn path=/nixpkgs/trunk/; revision=34517
2012-06-15 08:06:11 +00:00
Peter Simons 75cd74c72c haskell-defaults.nix: switched GHC 7.4.2 to use the Haskell Platform 2012.2.0.0 configuration
svn path=/nixpkgs/trunk/; revision=34516
2012-06-15 08:06:06 +00:00
Ludovic Courtès 6ccf519fc6 GCC 4.7.1.
svn path=/nixpkgs/trunk/; revision=34512
2012-06-14 20:40:22 +00:00
Peter Simons e71f2ed1f7 all-packages.nix: disable dependencies in Emacs 24 that we didn't have in Emacs 23 either
It's unclear what adding these dependencies accomplishes. If you find that a
feature you need doesn't work anymore, please feel free to re-enable the
appropriate dependencies.

svn path=/nixpkgs/trunk/; revision=34510
2012-06-14 19:44:34 +00:00
Eelco Dolstra 4f19239875 * Clean up the Ant name, e.g. "ant-openjdk-1.8.0RC1" instead of
"ant-<JDK name>".
* Remove openjdkDarwin/ecjDarwin/antDarwin attributes.  Instead
  the openjdk attribute refers to the Darwin package on Darwin.

svn path=/nixpkgs/trunk/; revision=34505
2012-06-13 14:11:52 +00:00
Yury G. Kudryashov 316222e2e1 Mass telepathy update, add telepathy-haze
svn path=/nixpkgs/trunk/; revision=34494
2012-06-13 07:09:19 +00:00
Yury G. Kudryashov c6d9ead047 Add vanilla pkg-config
Some packages (e.g., telepathy) rely on the upstream way to handle
Requires.private in pkg-config.

svn path=/nixpkgs/trunk/; revision=34492
2012-06-13 07:09:10 +00:00
Yury G. Kudryashov 4638c52fb6 dovecot-2.1.7
svn path=/nixpkgs/trunk/; revision=34490
2012-06-13 07:09:03 +00:00
Peter Simons ff2b57f957 Updated Haskell packages.
- BNFC-meta: updated to version 0.3.0.3
 - HUnit: added version 1.2.4.3
 - multirec: updated to version 0.7.2
 - resourcet: updated to version 0.3.2.2

svn path=/nixpkgs/trunk/; revision=34489
2012-06-13 07:08:57 +00:00
karltk c7fb96a684 * Added coilmq and dependencies; distribute and stompclient.
svn path=/nixpkgs/trunk/; revision=34482
2012-06-12 20:16:04 +00:00
Peter Simons 7a626565df Updated Haskell packages.
- parsec: added version 3.1.3
 - xmonad-extras: updated to version 0.10.1.1

svn path=/nixpkgs/trunk/; revision=34475
2012-06-12 08:39:32 +00:00
Mathijs Kwik 46beccef20 linux kernel aufs (needed for livecd): added to 3.4
upgraded 3.3 version to stable

svn path=/nixpkgs/trunk/; revision=34468
2012-06-11 17:41:05 +00:00
Mathijs Kwik e19cc94e1a added vobcopy: nice CLI dvd ripper
svn path=/nixpkgs/trunk/; revision=34466
2012-06-11 17:40:58 +00:00
Peter Simons ac3df043d6 haskell-happstack-data: obsolete package removed
svn path=/nixpkgs/trunk/; revision=34463
2012-06-11 17:15:52 +00:00
Eelco Dolstra d63bcce038 * Added pam_ssh_agent_auth, a PAM module for authentication through
the SSH agent.

svn path=/nixpkgs/trunk/; revision=34462
2012-06-11 16:45:54 +00:00
Peter Simons e0f5d8870e Updated Emacs default version from 23.3 to 24.1.
Yay!

svn path=/nixpkgs/trunk/; revision=34461
2012-06-11 16:41:31 +00:00
Peter Simons f723b4dcb4 haskell-defaults.nix: added empty 'haskellPlatform' attribute to ghcHEADPrefs
Writing generic expressions is easier if this attribute always exists.

svn path=/nixpkgs/trunk/; revision=34459
2012-06-11 15:07:33 +00:00
Peter Simons 1c9727a81c haskell-defaults.nix: explicitly set mtl version in Haskell Platform 2009.2.0.2 to fix builds with GHC 6.10.4
svn path=/nixpkgs/trunk/; revision=34458
2012-06-11 15:04:44 +00:00
Peter Simons a89d66337c haskell-packages.nix: updated default 'cgi' reference to the latest version
svn path=/nixpkgs/trunk/; revision=34456
2012-06-11 14:55:52 +00:00
Peter Simons cc54e3e695 all-packages.nix: removed recurseIntoAttrs from emacs24Packages
Offering the names of those packages in "nix-env -qa *" is pointless
because it's impossible to install any of those packages by name. Only
packages from emacs23Packages can be installed by name.

svn path=/nixpkgs/trunk/; revision=34449
2012-06-11 08:21:32 +00:00
Peter Simons 73ede3160b all-packages.nix: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=34448
2012-06-11 07:44:16 +00:00
Peter Simons 8b65b2e2bc afew and alot updates
svn path=/nixpkgs/trunk/; revision=34445
2012-06-11 07:18:17 +00:00
Peter Simons a7949741f6 gimp 2.8
- rename package from gimp_2_8_0 to gimp_2_8 as discussed on mailing list[1]
- remove babl_0_1_10 and gegl_0_2_0 and use them as default versions

[1] http://article.gmane.org/gmane.linux.distributions.nixos/8708

svn path=/nixpkgs/trunk/; revision=34444
2012-06-11 07:17:39 +00:00
Peter Simons 7b14de6733 Add package for vlock from Debian mirror.
This is mainly because the original upstream URL is not available anymore.

svn path=/nixpkgs/trunk/; revision=34442
2012-06-11 07:16:11 +00:00
Peter Simons 499161282e Update Django to version 1.4.
svn path=/nixpkgs/trunk/; revision=34441
2012-06-11 07:15:12 +00:00
Lluís Batlle i Rossell 0820367a35 Adding the XFS and JFS modules to the sheevaplug kernel. They may be worth
using.


svn path=/nixpkgs/trunk/; revision=34426
2012-06-10 19:11:07 +00:00
Eelco Dolstra 192291eb01 * Added net-snmp.
svn path=/nixpkgs/trunk/; revision=34413
2012-06-09 23:28:07 +00:00
Lluís Batlle i Rossell 5d263987a0 Updating the sheevaplug kernel config to include btrfs and netconsole.
svn path=/nixpkgs/trunk/; revision=34412
2012-06-09 20:27:00 +00:00
Yury G. Kudryashov f6e6e4287d Add kbibtex
svn path=/nixpkgs/trunk/; revision=34404
2012-06-09 13:09:45 +00:00
Yury G. Kudryashov 3640b0c1e9 Add GiNaC
svn path=/nixpkgs/trunk/; revision=34403
2012-06-09 13:09:41 +00:00
Peter Simons 572b182042 all-packages.nix: removed broken 'dzen2' attribute, it refers to a non-existent file
svn path=/nixpkgs/trunk/; revision=34383
2012-06-08 13:34:43 +00:00
Arie Middelkoop 3c74283d03 Committing some outstanding modifications that I cannot make into smaller chunks anymore.
* added briss: a pdf cropper
* added compton, an improved fork of xcompmgr
* added myself to the maintainers list
* minor version bumps: xcompmgr, upower


svn path=/nixpkgs/trunk/; revision=34380
2012-06-08 10:16:46 +00:00
Andres Löh acb95ca925 Removed an unnecessary (and harmful) version constraint for haskell-download-curl.
svn path=/nixpkgs/trunk/; revision=34378
2012-06-07 11:27:25 +00:00
Eelco Dolstra f677edf57f * Firefox 13.0. It's not stable yet though - it seems to hang the
first time a Flash control is loaded, with the following message on
  stderr:

    /nix/store/c5ma4l7nlzcwdkjzrflni58aacqrfs1y-xulrunner-13.0/lib/xulrunner-13.0/plugin-container: symbol lookup error: /nix/store/c5ma4l7nlzcwdkjzrflni58aacqrfs1y-xulrunner-13.0/lib/xulrunner-13.0/plugin-container: undefined symbol: malloc_message

  Need to investigate where malloc_message is defined.

svn path=/nixpkgs/trunk/; revision=34368
2012-06-06 14:35:56 +00:00
Lluís Batlle i Rossell 0332f87a0b Adding windows jom; it does not build for me still, but it's close to it.
I think it's better to share it though. I wrote a comment about the expression
not building.


svn path=/nixpkgs/trunk/; revision=34365
2012-06-05 21:24:27 +00:00
Arie Middelkoop 7fd5e26ede Revert on kosmikus' request.
svn path=/nixpkgs/trunk/; revision=34358
2012-06-05 09:33:40 +00:00
Arie Middelkoop 3370d1284e Some explicit dependencies so that xmobar works with the latest haskellPlatform/stable ghc:
xmobar -> mtl-version1
mtl-version1 -> transformers-version2
where version1 and version2 are different from the default, which is needed because their
respective cabal files require that.

svn path=/nixpkgs/trunk/; revision=34357
2012-06-05 09:12:45 +00:00
Andres Löh cfdf9cafaa Setting GHC default version to 7.4.1, default platform to 2012.2.0.0.
svn path=/nixpkgs/trunk/; revision=34355
2012-06-05 08:09:10 +00:00
Cillian de Roiste 27bef25b17 Applying the patch from Rok Garbas to add GIMP 2.8.0
svn path=/nixpkgs/trunk/; revision=34352
2012-06-04 17:38:47 +00:00
Peter Simons f0b9f401ae haskell-defaults.nix: switched ghc-7.5 pre-release to 'future' configuration
svn path=/nixpkgs/trunk/; revision=34343
2012-06-04 09:46:26 +00:00
Peter Simons a92f3fac24 haskell-packages.nix: oops, fixed typo committed earlier
svn path=/nixpkgs/trunk/; revision=34342
2012-06-04 09:46:23 +00:00
Peter Simons 2e8c5de358 haskell-defaults.nix: updated mtl1 to the latest 1.x version (and override that choice in older compilers if necessary)
svn path=/nixpkgs/trunk/; revision=34341
2012-06-04 09:46:20 +00:00
Peter Simons 1495e5ac1e haskell-packages.nix: build xmobar with STM 2.3
This is the default in HP 2012.2.0.0, but GHC 7.0.4 still uses an older version.

svn path=/nixpkgs/trunk/; revision=34339
2012-06-04 09:24:22 +00:00
Peter Simons 9a59fdb416 haskell-packages.nix: added 'haskellPlatformArgs_future' configuration that has the latest version of the network library
svn path=/nixpkgs/trunk/; revision=34338
2012-06-04 09:24:18 +00:00
Peter Simons 4fdbd75e4f Updated Haskell packages.
- ghc-mod: updated to version 1.10.16
 - network: added version 2.3.0.14
 - pandoc: updated to version 1.9.4
 - xmobar: updated to version 0.15

svn path=/nixpkgs/trunk/; revision=34337
2012-06-04 09:24:14 +00:00
Rickard Nilsson 0d719146a2 Moved obnam from pythonPackages to pkgs.
svn path=/nixpkgs/trunk/; revision=34336
2012-06-04 05:02:31 +00:00
Eelco Dolstra 887c89cc33 * Include the Git shortrev in the version number.
* Less verbose output in the tarball job.

svn path=/nixpkgs/trunk/; revision=34335
2012-06-04 04:12:17 +00:00
Rickard Nilsson ca5dfc9634 obnam 1.0
obnam is a backup program with support for deduplication, compression and encryption. See http://liw.fi/obnam/.

svn path=/nixpkgs/trunk/; revision=34331
2012-06-03 22:11:09 +00:00
Peter Simons 53d7bcb206 haskell-packages.nix: cosmetic, no functional change
Re-ordered entries in haskellPlatformArgs_2012_2_0_0 to match the order
in the Cabal file. This makes it easier to compare the package list side
by side.

svn path=/nixpkgs/trunk/; revision=34326
2012-06-03 18:26:15 +00:00
Peter Simons 1a024eabbc haskell-packages.nix: Haskell Platform version 2012.2.0.0 is out.
Renamed 'haskellPlatformArgs_future' to 'haskellPlatformArgs_2012_2_0_0'.

svn path=/nixpkgs/trunk/; revision=34325
2012-06-03 18:26:12 +00:00
Andres Löh 23f81c74c9 Provide a shortcut for the current Haskell Platform version.
svn path=/nixpkgs/trunk/; revision=34314
2012-06-01 12:27:20 +00:00
Eelco Dolstra 45c8db6065 * Remove duplicate python- prefix.
svn path=/nixpkgs/trunk/; revision=34308
2012-05-31 19:22:20 +00:00
Michael Raskin 2de23edd59 Adding LLVM 3.1. (as a separate attribute, because it seems to be API-incompatible)
svn path=/nixpkgs/trunk/; revision=34300
2012-05-31 11:04:28 +00:00
Eelco Dolstra c57a50290a * Mark jdkPlugin/jrePlugin as low priority.
svn path=/nixpkgs/trunk/; revision=34294
2012-05-31 02:28:14 +00:00
Eelco Dolstra 596eddb6e8 * Add some dependencies.
svn path=/nixpkgs/trunk/; revision=34293
2012-05-30 21:49:36 +00:00
Eelco Dolstra 5bd2bc4a58 * Add ReviewBoard and its dependencies (such as Django).
svn path=/nixpkgs/trunk/; revision=34292
2012-05-30 21:12:40 +00:00
Peter Simons 6050e8749c haskell-defaults.nix: dropped 'packages_ghc741_pedantic' variant, it's identical to 'packages_ghc741' now
svn path=/nixpkgs/trunk/; revision=34284
2012-05-29 20:16:16 +00:00
Lluís Batlle i Rossell ac1857cef1 Adding fio, the flexible IO tester.
svn path=/nixpkgs/trunk/; revision=34275
2012-05-29 14:21:55 +00:00
Andres Löh 9f47f715c1 Revert bogus change.
svn path=/nixpkgs/trunk/; revision=34273
2012-05-29 14:02:26 +00:00
Andres Löh 4e10015cab Added gnumeric.
svn path=/nixpkgs/trunk/; revision=34272
2012-05-29 12:21:33 +00:00
Russell O'Connor 417a07a0e9 Updatings ssreflect to depend on camlp5 version 6.
svn path=/nixpkgs/trunk/; revision=34263
2012-05-28 20:53:17 +00:00
Russell O'Connor 390907e0a2 Update coq to use camlp5 version 6.
svn path=/nixpkgs/trunk/; revision=34261
2012-05-28 19:41:26 +00:00
Peter Simons e6f2845b30 haskell-defaults.nix: switch ghc 7.4.1 to latest versions of 'mtl' and 'transformers'
svn path=/nixpkgs/trunk/; revision=34256
2012-05-28 10:53:46 +00:00
Peter Simons c664157e7d Updated Haskell packages.
- attoparsec: updated to version 0.10.2.0
 - blaze-html: dropped obsolete version 0.4.3.4
 - cairo: updated to version 0.12.3.1
 - cryptocipher: updated to version 0.3.4
 - file-embed: updated to version 0.0.4.4
 - glib: updated to version 0.12.3.1
 - gtk2hs-buildtools: updated to version 0.12.3.1
 - gtksourceview2: updated to version 0.12.3.1
 - hakyll: updated to version 3.3.0.0
 - happstack-server: updated to version 7.0.2
 - hjsmin: updated to version 0.1.2
 - http-conduit: updated to version 1.4.1.7
 - http-types: updated to version 0.6.11
 - language-c-quote: updated to version 0.3.1.2
 - parallel: added version 3.2.0.3
 - regex-pcre: updated to version 0.94.3
 - regex-posix: added version 0.95.2
 - shakespeare-js: updated to version 1.0.0.3
 - svgcairo: updated to version 0.12.1.1
 - text: added version 0.11.2.1
 - vty: updated to version 4.7.0.14
 - warp: updated to version 1.2.1.1
 - yaml: updated to version 0.7.0.2
 - yesod-static: updated to version 1.0.0.3

svn path=/nixpkgs/trunk/; revision=34255
2012-05-28 10:23:20 +00:00