Commit Graph

13313 Commits

Author SHA1 Message Date
Eelco Dolstra
927a41492d * Updated dbus, glib, gtk+.
svn path=/nixpkgs/branches/x-updates/; revision=26156
2011-03-04 11:59:04 +00:00
Lluís Batlle i Rossell
370a89b5ad Removing the wrong pyqt references in freecad. I don't know how to make it work with pyqt still.
svn path=/nixpkgs/trunk/; revision=26154
2011-03-04 09:48:36 +00:00
Lluís Batlle i Rossell
f6ea68b2ee Freecad builds, installs and runs, (although still not with PyQt for its draft workbench).
On virtualgl, it needs a variable set about the GL context set; freecad
suggests that upon failing to run in that environment.

svn path=/nixpkgs/trunk/; revision=26153
2011-03-04 09:48:33 +00:00
Lluís Batlle i Rossell
31c38d7dd2 Updating pyqt and sip because the 'src' there mentioned is not at the urls anymore.
svn path=/nixpkgs/trunk/; revision=26152
2011-03-04 09:48:29 +00:00
Lluís Batlle i Rossell
a76b0fb6fa Making freecad install; it still does not find all shared objects though.
Either eigen changed the hash of the tarball, or I did not commit its latest hash.
I add boost 1.46 apart, because 1.44 does not work easily for freecad.

svn path=/nixpkgs/trunk/; revision=26151
2011-03-04 09:48:24 +00:00
Lluís Batlle i Rossell
5c5170ae88 Updating fossil
svn path=/nixpkgs/trunk/; revision=26150
2011-03-03 16:23:59 +00:00
Eelco Dolstra
5cc5e16104 * Remove the xen-pvclock-resume patch, which has finally been merged
into 2.6.32.

svn path=/nixpkgs/trunk/; revision=26149
2011-03-03 15:36:13 +00:00
Eelco Dolstra
43cca4d6ab * Linux 2.6.32.30.
svn path=/nixpkgs/trunk/; revision=26148
2011-03-03 15:00:30 +00:00
Eelco Dolstra
4b50191fd4 * Remove a not very useful message that didn't get printed anyway
because the test condition was wrong.

svn path=/nixpkgs/trunk/; revision=26147
2011-03-03 14:59:58 +00:00
Lluís Batlle i Rossell
5148ee9654 I revert the "Updating boost" change. I don't really need it new I think, and
it breaks things, niksnut reports.

svn path=/nixpkgs/trunk/; revision=26146
2011-03-03 14:10:18 +00:00
Lluís Batlle i Rossell
60844f7488 Making freecad build (from svn version). It does not install still, though.
svn path=/nixpkgs/trunk/; revision=26145
2011-03-03 13:41:10 +00:00
Lluís Batlle i Rossell
7912200505 Adding libf2c
svn path=/nixpkgs/trunk/; revision=26144
2011-03-03 13:41:06 +00:00
Lluís Batlle i Rossell
b679cf6a66 Updating boost
svn path=/nixpkgs/trunk/; revision=26143
2011-03-03 13:41:01 +00:00
Eelco Dolstra
2f848503b9 svn path=/nixpkgs/trunk/; revision=26142 2011-03-03 12:07:51 +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
Yury G. Kudryashov
efb12635d3 Qca2: do not separate debug info
svn path=/nixpkgs/trunk/; revision=26138
2011-03-02 18:50:00 +00:00
Yury G. Kudryashov
53a7f85871 cmake-2.8.4
svn path=/nixpkgs/trunk/; revision=26137
2011-03-02 18:49:56 +00:00
Lluís Batlle i Rossell
d11c00e5a5 Adding xercesc, the references to coin3d and soqt, and trying to add
freecad (that still does not build).

svn path=/nixpkgs/trunk/; revision=26135
2011-03-02 17:18:30 +00:00
Lluís Batlle i Rossell
f58e7158e0 Updating ODE.
svn path=/nixpkgs/trunk/; revision=26134
2011-03-02 17:18:24 +00:00
Lluís Batlle i Rossell
6381040f0a Adding coin3d and soqt
svn path=/nixpkgs/trunk/; revision=26133
2011-03-02 17:18:20 +00:00
Lluís Batlle i Rossell
e1cf8f90e6 Adding GNU Triangulated Surface library
svn path=/nixpkgs/trunk/; revision=26132
2011-03-02 17:18:15 +00:00
Andres Löh
b13e4ebdef Updated ghc HEAD expression to 7.0.2-rc2.
svn path=/nixpkgs/trunk/; revision=26127
2011-03-01 11:56:41 +00:00
Michael Raskin
e5e98b9984 Updating veracity; adding parts of needed infrastructure for tests. Currently, a test run would fail
svn path=/nixpkgs/trunk/; revision=26126
2011-02-28 20:56:01 +00:00
Michael Raskin
9e204fec07 Update SBCL
svn path=/nixpkgs/trunk/; revision=26124
2011-02-27 18:56:15 +00:00
Eelco Dolstra
f543078655 * Install the libvirt-guests boot script for saving/restoring VMs
across host reboots.

svn path=/nixpkgs/trunk/; revision=26120
2011-02-25 15:56:10 +00:00
Eelco Dolstra
55050ba5c6 * iptables updated to 1.4.10.
svn path=/nixpkgs/trunk/; revision=26113
2011-02-25 14:48:53 +00:00
Eelco Dolstra
583053d018 * libvirt: enable some more features.
svn path=/nixpkgs/trunk/; revision=26111
2011-02-25 13:24:41 +00:00
Eelco Dolstra
6538f20485 * Revert to Boost 1.44 for now, as 1.46 breaks several packages.
svn path=/nixpkgs/branches/x-updates/; revision=26110
2011-02-25 11:01:50 +00:00
David Guibert
f54652ea56 ledger: update to 2.6.3.
svn path=/nixpkgs/trunk/; revision=26109
2011-02-24 22:19:47 +00:00
David Guibert
a5dae2652e kernel: 2.6.37 -> 2.6.37.1
svn path=/nixpkgs/trunk/; revision=26108
2011-02-24 22:19:42 +00:00
David Guibert
ecf72a5720 git: 1.7.4 -> 1.7.4.1
svn path=/nixpkgs/trunk/; revision=26107
2011-02-24 22:19:37 +00:00
David Guibert
67dae3543f update chrome
svn path=/nixpkgs/trunk/; revision=26106
2011-02-24 22:19:32 +00:00
David Guibert
05d5478c9b acpi: 0.09 -> 1.5 (picked from debian)
svn path=/nixpkgs/trunk/; revision=26105
2011-02-24 22:19:27 +00:00
Eelco Dolstra
377b97a37b * Drop the unnecessary boot=on flag.
svn path=/nixpkgs/trunk/; revision=26104
2011-02-24 21:48:32 +00:00
Peter Simons
3c2ba9df1a Dropped file that was checked in by accident.
Thanks, Ludo, for catching this mistake.

svn path=/nixpkgs/trunk/; revision=26102
2011-02-24 18:08:16 +00:00
Eelco Dolstra
df45fa18bb * qemu-kvm updated to 0.14.0.
svn path=/nixpkgs/trunk/; revision=26101
2011-02-24 16:25:10 +00:00
Eelco Dolstra
60e9fc7991 * Fix a typo in the `platforms' attribute.
svn path=/nixpkgs/trunk/; revision=26100
2011-02-24 16:24:54 +00:00
Eelco Dolstra
a9ca5acac3 * Grrr, we should really mirror jquery-ui.
svn path=/nixpkgs/trunk/; revision=26099
2011-02-24 16:20:47 +00:00
Eelco Dolstra
9bbe78533e * Add readline support to libvirt.
svn path=/nixpkgs/trunk/; revision=26097
2011-02-24 15:42:51 +00:00
Eelco Dolstra
6bab14437c * libvirt: use /var and set the correct paths to ip/iptables.
svn path=/nixpkgs/trunk/; revision=26091
2011-02-24 13:36:18 +00:00
Eelco Dolstra
76b07fbc18 * Linux 2.6.32.29.
svn path=/nixpkgs/trunk/; revision=26090
2011-02-24 13:11:51 +00:00
Cillian de Roiste
049d5697c0 Adding a patch which fixes vpnc
svn path=/nixpkgs/trunk/; revision=26089
2011-02-24 12:04:00 +00:00
Eelco Dolstra
a35dcdb281 * libvirt updated to 0.8.8.
svn path=/nixpkgs/trunk/; revision=26088
2011-02-24 11:59:30 +00:00
Peter Simons
f073bf2a3e esniper 2.24.0 is a simple, lightweight tool for sniping eBay auctions.
svn path=/nixpkgs/trunk/; revision=26086
2011-02-24 11:25:16 +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
2fafe4612c GNU IceCat 3.6.13.
svn path=/nixpkgs/trunk/; revision=26080
2011-02-23 17:36:36 +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
Yury G. Kudryashov
072df43f00 boost-1.46.0
svn path=/nixpkgs/branches/x-updates/; revision=26066
2011-02-23 11:29:23 +00:00
Yury G. Kudryashov
eb85a47f9e Cleanup 'rec {'
svn path=/nixpkgs/branches/x-updates/; revision=26065
2011-02-23 10:04:50 +00:00
Marco Maggesi
3c10d32ad0 Oops... Fix alphabetical order in all-packages.nix
svn path=/nixpkgs/trunk/; revision=26064
2011-02-22 21:07:36 +00:00
Marco Maggesi
a297ef5966 Add lsscsi
svn path=/nixpkgs/trunk/; revision=26063
2011-02-22 20:57:17 +00:00
Marco Maggesi
04d74baeb0 * Update dmtcp to version 1.2.0.
* Remove patch 'dont_check_uid' that was introduced to allow building
  hol_light binaries under root, but we will avoid it in the future).


svn path=/nixpkgs/trunk/; revision=26062
2011-02-22 19:00:45 +00:00
Ludovic Courtès
7201a275db GNU AutoGen 5.11.6.
svn path=/nixpkgs/trunk/; revision=26060
2011-02-22 13:40:01 +00:00
Ludovic Courtès
eba1278e84 guile-2-test: Update to 2.0.
svn path=/nixpkgs/trunk/; revision=26059
2011-02-22 13:39:56 +00:00
Yury G. Kudryashov
4a5b7854a8 Move eigen outside of kde-4.x
Michael, sorry for overriding your work but I want to maintain it...

svn path=/nixpkgs/trunk/; revision=26058
2011-02-22 11:54:56 +00:00
Yury G. Kudryashov
0646cfee1e Move strigi outside of kde-4.x
svn path=/nixpkgs/trunk/; revision=26057
2011-02-22 11:54:49 +00:00
Yury G. Kudryashov
78127c3b86 Move qimageblitz outside of kde-4.x
svn path=/nixpkgs/trunk/; revision=26056
2011-02-22 11:54:42 +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
Yury G. Kudryashov
68299a0202 Move qca2 outside of kde-4.x
svn path=/nixpkgs/trunk/; revision=26053
2011-02-22 09:53:01 +00:00
Yury G. Kudryashov
75f4d9972d More explicit dependencies
svn path=/nixpkgs/trunk/; revision=26052
2011-02-22 09:52:54 +00:00
Yury G. Kudryashov
513947cf9f polkit-qt-1: add pkgconfig to explicit buildInputs
svn path=/nixpkgs/trunk/; revision=26051
2011-02-22 06:19:21 +00:00
Yury G. Kudryashov
db67fc27a3 Explicitly depend on pkgconfig
svn path=/nixpkgs/trunk/; revision=26050
2011-02-22 06:19:17 +00:00
Yury G. Kudryashov
dcc137553c newline
svn path=/nixpkgs/trunk/; revision=26049
2011-02-22 06:19:11 +00:00
Yury G. Kudryashov
3b3f50e405 Move automoc4 out of kde-4.x/
kde-4.x/ is for software that is released with kde releases,
not for anything hosted on *.kde.org or in kde svn/git.

svn path=/nixpkgs/trunk/; revision=26048
2011-02-22 06:19:05 +00:00
Eelco Dolstra
d89d26cdd2 * Added OpenStack Compute (Nova). It builds but doesn't work yet.
svn path=/nixpkgs/trunk/; revision=26047
2011-02-21 21:53:42 +00:00
Eelco Dolstra
0dd10c6035 * Add python-eventlet.
svn path=/nixpkgs/trunk/; revision=26046
2011-02-21 21:49:20 +00:00
Eelco Dolstra
237a852e85 * Added python-greenlet and python-httplib2.
svn path=/nixpkgs/trunk/; revision=26045
2011-02-21 17:26:19 +00:00
Eelco Dolstra
f053b6eec1 * Added python-netaddr.
svn path=/nixpkgs/trunk/; revision=26044
2011-02-21 17:09:09 +00:00
Eelco Dolstra
c4bc14bdd0 * Added python-gflags.
svn path=/nixpkgs/trunk/; revision=26043
2011-02-21 16:56:49 +00:00
Yury G. Kudryashov
a37558d8df Remove unused manifests
svn path=/nixpkgs/trunk/; revision=26039
2011-02-21 07:32:55 +00:00
Karn Kallio
e443f99bed Advance mysql workbench to version 5.2.31a
Also add python binary to wrapper PATH prefix to guarantee the
application will use a deterministic python version.

svn path=/nixpkgs/trunk/; revision=26038
2011-02-19 23:45:04 +00:00
Karn Kallio
db53a4e36a Advance version of libjpeg to 8c.
svn path=/nixpkgs/trunk/; revision=26037
2011-02-19 22:16:31 +00:00
Eelco Dolstra
b35383d9b2 * jquery-ui updated to 1.8.9.
svn path=/nixpkgs/trunk/; revision=26033
2011-02-19 16:54:54 +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
e5d12bbca7 * Disable swrast_dri.so because it doesn't work properly (NixOS/121).
svn path=/nixpkgs/branches/x-updates/; revision=26020
2011-02-18 09:16:11 +00:00
Yury G. Kudryashov
d6199a2ca1 Add kde46.kdelibs.meta
svn path=/nixpkgs/trunk/; revision=26019
2011-02-18 09:02:45 +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
9bc4c552a6 * Zabbix 1.8.4.
svn path=/nixpkgs/trunk/; revision=26013
2011-02-17 13:57:15 +00:00
Eelco Dolstra
1062dbd1b0 * Bump.
svn path=/nixpkgs/trunk/; revision=26012
2011-02-17 13:37:48 +00:00
Eelco Dolstra
3e89e6ad89 * Thunderbird 3.1.7.
svn path=/nixpkgs/trunk/; revision=26011
2011-02-17 13:30:00 +00:00
Eelco Dolstra
7d44982534 * icewm: explicitly link against fontconfig.
svn path=/nixpkgs/branches/x-updates/; revision=26008
2011-02-17 11:51:29 +00:00
Eelco Dolstra
a9633d80de * Emacs: don't depend on dbus on non-Linux platforms.
svn path=/nixpkgs/branches/x-updates/; revision=26007
2011-02-17 10:17:49 +00:00
Michael Raskin
6029a74a29 LilyPond is not ready for Guile 2.0
svn path=/nixpkgs/trunk/; revision=26006
2011-02-17 08:23:56 +00:00
Cillian de Roiste
da00930257 Adding version, fixing the mirror path and the license and adding myself as maintainer
svn path=/nixpkgs/trunk/; revision=26005
2011-02-16 23:52:14 +00:00
Cillian de Roiste
dd5ad62588 Adding myself as a maintainer since I want to keep this working, and applying the new style of license
svn path=/nixpkgs/trunk/; revision=26004
2011-02-16 23:37:13 +00:00
Cillian de Roiste
e80dc8eb7f Applying a patch for pstoraster, without this the cups test page was printing solid black, as described in the bug report: http://bugs.ghostscript.com/show_bug.cgi?id=691108 The patch was kindly taken from https://bugs.archlinux.org/task/18339
svn path=/nixpkgs/trunk/; revision=26003
2011-02-16 23:34:19 +00:00
Ludovic Courtès
ad5adaca9e GNU recutils 1.3.
svn path=/nixpkgs/trunk/; revision=26002
2011-02-16 22:50:06 +00:00
Ludovic Courtès
742b97a35b guile-2-test: Add LiquidWar and Freetalk.
svn path=/nixpkgs/trunk/; revision=26001
2011-02-16 22:50:02 +00:00
Michael Raskin
c0b92d0491 FreeTalk is not ready for Guile 2.0
svn path=/nixpkgs/trunk/; revision=25999
2011-02-16 22:21:29 +00:00
Michael Raskin
820e9d1b06 LiquidWar is not ready for Guile 2.0
svn path=/nixpkgs/trunk/; revision=25998
2011-02-16 22:21:07 +00:00
Michael Raskin
479fc3a1d4 Adding warmux
svn path=/nixpkgs/trunk/; revision=25997
2011-02-16 22:19:59 +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
Karn Kallio
7c339958f9 Fix missing semicolon
svn path=/nixpkgs/trunk/; revision=25992
2011-02-16 15:11:58 +00:00
Ludovic Courtès
59904446e4 GNU Guile 2.0.0!
svn path=/nixpkgs/trunk/; revision=25990
2011-02-16 13:18:08 +00:00
Eelco Dolstra
a74d449daf * nixSqlite expects another integer (denoting the size of the NAR) in
`nix-store --load-db'.

svn path=/nixpkgs/trunk/; revision=25988
2011-02-16 11:49:08 +00:00
Eelco Dolstra
2e81976a34 * Apply xlib.patch to go-oo as well.
svn path=/nixpkgs/branches/x-updates/; revision=25985
2011-02-16 09:18:07 +00:00
Karn Kallio
db25406910 Advance racket to latest release version 5.1
svn path=/nixpkgs/trunk/; revision=25984
2011-02-16 00:48:58 +00:00
Eelco Dolstra
4ac97e16b6 * Fix an OpenOffice build problem (http://hydra.nixos.org/build/911291).
Not tested.

svn path=/nixpkgs/branches/x-updates/; revision=25983
2011-02-15 16:06:33 +00:00
Eelco Dolstra
6ba53ec09a * Fix xf86-input-synaptics and xf86-input-keyboard.
* Enable parallel building for all X.org packages.

svn path=/nixpkgs/branches/x-updates/; revision=25982
2011-02-15 15:54:57 +00:00
Eelco Dolstra
a5aa96c3a3 * xorgserver: propagate dri2proto.
svn path=/nixpkgs/branches/x-updates/; revision=25980
2011-02-15 14:34:26 +00:00
Ludovic Courtès
8dba6683ad Fix typo.
svn path=/nixpkgs/trunk/; revision=25979
2011-02-15 13:23:34 +00:00
Ludovic Courtès
46d18d183d "coreutils_real" -> "coreutils".
svn path=/nixpkgs/trunk/; revision=25978
2011-02-15 13:15:55 +00:00
Ludovic Courtès
10f6eb70f1 Add more cross-MinGW and cross-GNU jobs.
svn path=/nixpkgs/trunk/; revision=25977
2011-02-15 13:14:33 +00:00
Ludovic Courtès
9bc101679a Prepare for the Guile 2.0 switchover.
svn path=/nixpkgs/trunk/; revision=25976
2011-02-15 13:14:29 +00:00
Andres Löh
0a69fe9898 Restored HaXml-1.13.3 to keep happstack and gitit working.
svn path=/nixpkgs/trunk/; revision=25974
2011-02-15 10:36:52 +00:00
Andres Löh
bcb46affc2 Version bump for Haskell libs: HaXml and json.
svn path=/nixpkgs/trunk/; revision=25973
2011-02-15 09:47:36 +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
167c520570 * Added Debian 6.0 and Ubuntu 10.10.
svn path=/nixpkgs/trunk/; revision=25968
2011-02-14 16:52:32 +00:00
Eelco Dolstra
070f7debe0 * gdk-pixbuf: build gdk-pixbuf-xlib.
svn path=/nixpkgs/branches/x-updates/; revision=25961
2011-02-14 13:44:01 +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
5f85d4c19c * slim: update to 1.3.2.
svn path=/nixpkgs/branches/x-updates/; revision=25951
2011-02-14 10:15:48 +00:00
Eelco Dolstra
1566609a1a * libXft: propagate libXrender.
svn path=/nixpkgs/branches/x-updates/; revision=25950
2011-02-14 10:14:34 +00:00
Eelco Dolstra
8c58edf34d * xterm: fix build and update to version 268.
svn path=/nixpkgs/branches/x-updates/; revision=25949
2011-02-14 10:09:01 +00:00
Eelco Dolstra
47aa6890d2 * libXaw: propagates libXmu.
svn path=/nixpkgs/branches/x-updates/; revision=25948
2011-02-14 10:04:37 +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
Florian Friesdorf
5526aa13e8 notmuch-0.5 -> notmuch-0.5-20110203 (git)
svn path=/nixpkgs/trunk/; revision=25946
2011-02-14 05:01:33 +00:00
Eelco Dolstra
5042a81534 * Fix broken icons such as the back/forward buttons in Firefox.
svn path=/nixpkgs/branches/x-updates/; revision=25944
2011-02-13 23:38:28 +00:00
Cillian de Roiste
19a516c68d Reverting the pulseSupport configuration option, I believe this is meant to be configured via packageOverrides instead
svn path=/nixpkgs/trunk/; revision=25941
2011-02-13 12:35:23 +00:00
Cillian de Roiste
9fd9a34316 Optionally enable pulseaudio support for MPlayer
svn path=/nixpkgs/trunk/; revision=25940
2011-02-13 11:37:29 +00:00
Yury G. Kudryashov
0c7c2c5c30 kdepim{,runtime}-4.5.94.1
svn path=/nixpkgs/trunk/; revision=25939
2011-02-13 04:37:08 +00:00
Yury G. Kudryashov
96636f0779 kdepimlibs-4.6.0: add libxslt
svn path=/nixpkgs/trunk/; revision=25938
2011-02-13 04:37:04 +00:00
Yury G. Kudryashov
87c534b7d0 Fix evaluation
svn path=/nixpkgs/trunk/; revision=25937
2011-02-13 04:37:00 +00:00
Yury G. Kudryashov
33e30b8601 libdbusmenu-qt-0.7.0
svn path=/nixpkgs/trunk/; revision=25936
2011-02-13 04:36:55 +00:00
Yury G. Kudryashov
424c73794d kde-4.6/akonadi-1.5.0
svn path=/nixpkgs/trunk/; revision=25935
2011-02-13 04:36:51 +00:00
Yury G. Kudryashov
c1e48180f8 soprano-2.6.0
svn path=/nixpkgs/trunk/; revision=25934
2011-02-13 04:36:47 +00:00
Yury G. Kudryashov
ab49679292 KDE-4.6.0 (not ready yet!!)
Mostly automatic changes. Will fix evaluation/compilation later.

svn path=/nixpkgs/trunk/; revision=25933
2011-02-13 04:36:41 +00:00
Yury G. Kudryashov
5e7c026c22 kde-x.y/utils is for kdeutils-x.y.z, not for apps from kde-apps.org
svn path=/nixpkgs/trunk/; revision=25932
2011-02-13 04:34:37 +00:00
Florian Friesdorf
4b603776af notmuch-0.5 build successful
svn path=/nixpkgs/trunk/; revision=25931
2011-02-13 01:56:32 +00:00
Florian Friesdorf
f03892655b notmuch -- The mail indexer
configure fails so far:
Checking for Xapian development files... Yes (1.0.23).
Checking for GMime development files... No.
Checking for talloc development files... No.
Checking for valgrind development files... No (but that's fine).
Checking if emacs is available... Yes.

svn path=/nixpkgs/trunk/; revision=25930
2011-02-13 01:34:49 +00:00
Florian Friesdorf
f4dc1b73f2 added myself to list of maintainers
svn path=/nixpkgs/trunk/; revision=25929
2011-02-13 01:34:44 +00:00
Florian Friesdorf
db47cdae9d xapian(-bindings)-1.0.23 from 1.0.14
svn path=/nixpkgs/trunk/; revision=25928
2011-02-13 00:49:07 +00:00
Lluís Batlle i Rossell
af7a77aca6 Mumble builds
svn path=/nixpkgs/trunk/; revision=25927
2011-02-12 20:31:25 +00:00
David Guibert
ed85acac61 fix mkvtoolnix description and homepage
svn path=/nixpkgs/trunk/; revision=25926
2011-02-12 20:22:55 +00:00
David Guibert
87418d034b mkvtoolnix: 4.4.0
svn path=/nixpkgs/trunk/; revision=25925
2011-02-12 20:18:53 +00:00
David Guibert
188b3c00ba libmatroska: 1.0.0
svn path=/nixpkgs/trunk/; revision=25924
2011-02-12 20:18:46 +00:00
David Guibert
489b0e2fe5 libebml: 1.0.0
svn path=/nixpkgs/trunk/; revision=25923
2011-02-12 20:18:41 +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
Cillian de Roiste
36c45a06dd Updating chromium, I've added myself as a maintainer since I'm happy to keep it updated in the future
svn path=/nixpkgs/trunk/; revision=25921
2011-02-12 18:47:28 +00:00
Eelco Dolstra
52787275a4 * Update clutter and clutter-gtk to get it to build with the latest
GTK+ (http://hydra.nixos.org/build/902751).

svn path=/nixpkgs/branches/x-updates/; revision=25920
2011-02-12 13:52:17 +00:00
Eelco Dolstra
4b45a4c4cb * Build GTK+ with Xinput support, necessary for tablet support in Gimp
and Inkscape (suggested by Cillian de Róiste).

svn path=/nixpkgs/branches/x-updates/; revision=25919
2011-02-12 13:38:30 +00:00
Cillian de Roiste
65e3a1b21c Adding pymacs, an Emacs Lisp to Python interface
svn path=/nixpkgs/trunk/; revision=25918
2011-02-12 13:38:23 +00:00
Cillian de Roiste
93a6c31a9a Avoiding easy_install in order to get rope and ropemacs working for now.
svn path=/nixpkgs/trunk/; revision=25917
2011-02-12 12:50:02 +00:00
Eelco Dolstra
57eed75265 * polkit updated to 0.99.
svn path=/nixpkgs/branches/x-updates/; revision=25916
2011-02-12 09:25:10 +00:00
Yury G. Kudryashov
38b1c5fbfc Fix #! line in gtester-report
svn path=/nixpkgs/branches/x-updates/; revision=25915
2011-02-12 08:44:35 +00:00
Cillian de Roiste
dd0f90b302 Adding rope, a python refactoring library
svn path=/nixpkgs/trunk/; revision=25914
2011-02-11 23:06:54 +00:00
Cillian de Roiste
98bda5c728 Adding ropemacs, a plugin for refactoring python in emacs
svn path=/nixpkgs/trunk/; revision=25913
2011-02-11 22:49:27 +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
Eelco Dolstra
32f8ebfca3 * Emacs: disable the dependency on librsvg, because it pulls in over
26 additional dependencies (such as Samba, Upstart, HAL, udev,
  OpenLDAP, ...).  Also disable gconf because it doesn't really work
  and just prints annoying messages.

svn path=/nixpkgs/branches/x-updates/; revision=25911
2011-02-11 18:02:16 +00:00
Eelco Dolstra
bdafe406db * Update gobject-introspection.
svn path=/nixpkgs/branches/x-updates/; revision=25910
2011-02-11 17:27:16 +00:00
Lluís Batlle i Rossell
cb41a67c47 Building mumble a bit further.
svn path=/nixpkgs/trunk/; revision=25908
2011-02-11 15:56:29 +00:00
Eelco Dolstra
0f0d3f9543 * Fix xorg-server.
svn path=/nixpkgs/branches/x-updates/; revision=25907
2011-02-11 15:54:01 +00:00
Eelco Dolstra
337e26fea0 * xkbcomp 1.2.1.
svn path=/nixpkgs/branches/x-updates/; revision=25906
2011-02-11 15:32:08 +00:00
Eelco Dolstra
2c72c03de5 * Mesa 7.9.1.
svn path=/nixpkgs/branches/x-updates/; revision=25905
2011-02-11 14:48:30 +00:00
Peter Simons
bb1edcae8d pkgs/development/interpreters/maude: updated to version 2.6
svn path=/nixpkgs/trunk/; revision=25904
2011-02-11 14:41:03 +00:00
Eelco Dolstra
e877e4dc13 * Dbus 1.4.1.
svn path=/nixpkgs/branches/x-updates/; revision=25903
2011-02-11 14:01:39 +00:00
Eelco Dolstra
5dcde6d437 * Expat: apply a fix for CVE-2009-3560.
svn path=/nixpkgs/branches/x-updates/; revision=25902
2011-02-11 13:55:30 +00:00
Eelco Dolstra
fc933aaa50 * Udev updated to 166.
svn path=/nixpkgs/branches/x-updates/; revision=25901
2011-02-11 13:30:39 +00:00
Eelco Dolstra
a08d99715d * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=25900
2011-02-11 13:08:45 +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
Eelco Dolstra
3c0dc22e91 * x86_64-linux requires -fPIC.
svn path=/nixpkgs/trunk/; revision=25893
2011-02-11 11:26:40 +00:00
Eelco Dolstra
4ddf706a2f * New adventures in purity: get Spotify to work without a
/usr/share/spotify symlink by rewriting open() and stat() calls.

svn path=/nixpkgs/trunk/; revision=25892
2011-02-11 11:16:18 +00:00
Lluís Batlle i Rossell
951b65cf9c Trying to add mumble. It still does not build.
svn path=/nixpkgs/trunk/; revision=25890
2011-02-10 19:23:27 +00:00
Florian Friesdorf
62759cd550 intel wifi 6000 firmware
svn path=/nixpkgs/trunk/; revision=25888
2011-02-10 17:30:20 +00:00
Michael Raskin
9a9d97642a Pass SQLite to nix-custom
svn path=/nixpkgs/trunk/; revision=25887
2011-02-10 17:13:48 +00:00
Eelco Dolstra
9980c6f01f * Upstart 0.6.7.
svn path=/nixpkgs/trunk/; revision=25885
2011-02-10 12:34:29 +00:00
Karn Kallio
ea8b116d63 Advance syslinux version to 4.03.
Also fix hardcoded /usr/bin/perl.

svn path=/nixpkgs/trunk/; revision=25878
2011-02-10 01:14:13 +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
Yury G. Kudryashov
f909b550dd vlc-1.1.5, much more dependencies
svn path=/nixpkgs/trunk/; revision=25872
2011-02-09 21:11:30 +00:00
Yury G. Kudryashov
857121483f Add libtiger
svn path=/nixpkgs/trunk/; revision=25871
2011-02-09 21:11:16 +00:00
Yury G. Kudryashov
7e4e25bbd2 taglib-1.6.3
svn path=/nixpkgs/trunk/; revision=25870
2011-02-09 21:11:02 +00:00
Yury G. Kudryashov
822ddb6b5e Add libkate
svn path=/nixpkgs/trunk/; revision=25869
2011-02-09 21:10:55 +00:00
Yury G. Kudryashov
e67fdbf901 Add libass
svn path=/nixpkgs/trunk/; revision=25868
2011-02-09 21:10:42 +00:00
Yury G. Kudryashov
e936f855a1 Add liboggz
svn path=/nixpkgs/trunk/; revision=25867
2011-02-09 21:10:28 +00:00
Yury G. Kudryashov
525314a0cd librsvg: propagate glib and gtk
svn path=/nixpkgs/trunk/; revision=25866
2011-02-09 21:10:20 +00:00
Yury G. Kudryashov
5c6389f69c SDL_image-1.2.10
svn path=/nixpkgs/trunk/; revision=25865
2011-02-09 21:10:05 +00:00
Yury G. Kudryashov
f8369c6f2b xine-lib-1.1.19; remove unused files
svn path=/nixpkgs/trunk/; revision=25864
2011-02-09 21:09:56 +00:00
Yury G. Kudryashov
f736995e07 Prefer upstream mirror system to our hand-written mirror list.
svn path=/nixpkgs/trunk/; revision=25863
2011-02-09 21:09:48 +00:00
Yury G. Kudryashov
ba15e16195 attica-0.2.0
svn path=/nixpkgs/trunk/; revision=25862
2011-02-09 21:09:36 +00:00
Yury G. Kudryashov
d347662b25 soprano-2.5.3
svn path=/nixpkgs/trunk/; revision=25861
2011-02-09 21:09:24 +00:00
Yury G. Kudryashov
cd42c8087e akonadi-1.4.3
svn path=/nixpkgs/trunk/; revision=25860
2011-02-09 21:09:10 +00:00
Yury G. Kudryashov
2e92a0cd12 cmake-2.8.3
svn path=/nixpkgs/trunk/; revision=25859
2011-02-09 21:08:53 +00:00
Cillian de Roiste
42f818969d Bumping to version 5.2.6 and fixing the url
svn path=/nixpkgs/trunk/; revision=25858
2011-02-09 20:34:52 +00:00
Karn Kallio
69f2e5d157 Bump version of mlt to 0.6.2
This also fixes compilation error in kdenlive

svn path=/nixpkgs/trunk/; revision=25857
2011-02-09 15:34:30 +00:00
Eelco Dolstra
d924bbb775 * openssl: per Nixpkgs convention, don't install static libraries when
building dynamic libraries.

svn path=/nixpkgs/branches/x-updates/; revision=25856
2011-02-09 15:27:34 +00:00
Eelco Dolstra
8ca86a8114 * Remove libX11 docs.
svn path=/nixpkgs/branches/x-updates/; revision=25855
2011-02-09 15:17:15 +00:00
Eelco Dolstra
935a8efdb0 * Remove the old gdk-pixbuf.
svn path=/nixpkgs/branches/x-updates/; revision=25854
2011-02-09 15:12:05 +00:00
Eelco Dolstra
6a59d1a98f * Latest Glib, ATK, Pango and GTK+.
* Added gdk-pixbuf, which has been revived and is required by GTK+.
* Don't install the documentation of aforementioned packages.  This
  cuts 56 MiB off the closure of GTK+-based packages.  It wasn't
  really useful anyway because it's not installed in a way that allows
  users to find it easily on NixOS.  And if you want it, it's faster
  to Google it.

svn path=/nixpkgs/branches/x-updates/; revision=25853
2011-02-09 15:09:29 +00:00
Eelco Dolstra
38c109a395 * Google Earth 6.0.1.2032.
svn path=/nixpkgs/trunk/; revision=25842
2011-02-09 13:33:46 +00:00
Eelco Dolstra
3d84f8b78f * man-pages updated to 3.32.
svn path=/nixpkgs/trunk/; revision=25841
2011-02-09 13:32:20 +00:00
Eelco Dolstra
51fe520113 * Fix the GTK+ build. It depends directly on libXrender, but probably
we didn't notice because some other X package used to have it as a
  propagated dependency.

svn path=/nixpkgs/branches/x-updates/; revision=25831
2011-02-09 12:36:08 +00:00
Eelco Dolstra
0b86d85634 * Updated gmime to 2.4.22.
svn path=/nixpkgs/branches/x-updates/; revision=25830
2011-02-09 12:35:20 +00:00
Eelco Dolstra
bafc1b5cb8 * While we're at it, bump OpenSSL to 1.0.0d (with a fix for
CVE-2011-0014).

svn path=/nixpkgs/branches/x-updates/; revision=25827
2011-02-09 11:02:24 +00:00
Eelco Dolstra
52e0027c93 * Glib 2.24.2.
svn path=/nixpkgs/branches/x-updates/; revision=25826
2011-02-09 11:01:48 +00:00
Eelco Dolstra
b705289759 * Remove gtkLibs218 and an old Cairo.
svn path=/nixpkgs/branches/x-updates/; revision=25824
2011-02-09 10:49:20 +00:00
Eelco Dolstra
b8e7238254 * CUPS updated to 1.4.6.
svn path=/nixpkgs/branches/x-updates/; revision=25823
2011-02-09 10:45:45 +00:00
Sander van der Burg
0c4706f165 Bumped qt-4.7 to version 4.7.1
svn path=/nixpkgs/trunk/; revision=25820
2011-02-08 21:23:17 +00:00
Eelco Dolstra
0003f76f9b * Cairo 1.10.2.
svn path=/nixpkgs/branches/x-updates/; revision=25819
2011-02-08 17:57:00 +00:00
Eelco Dolstra
0b8efb0cbb * X.org 7.6.
svn path=/nixpkgs/branches/x-updates/; revision=25818
2011-02-08 17:39:28 +00:00
Eelco Dolstra
e9c3b7b55a * libdrm 2.4.23.
svn path=/nixpkgs/branches/x-updates/; revision=25814
2011-02-08 14:15:53 +00:00
Eelco Dolstra
e848a70b31 * Freetype 2.4.4.
svn path=/nixpkgs/branches/x-updates/; revision=25813
2011-02-08 14:12:24 +00:00
Eelco Dolstra
f1c8cbed52 * libjpeg updated to 8c.
svn path=/nixpkgs/branches/x-updates/; revision=25812
2011-02-08 13:41:28 +00:00
Eelco Dolstra
209939f6f2 * OpenSSH 5.8.
svn path=/nixpkgs/trunk/; revision=25808
2011-02-08 13:13:34 +00:00
Rob Vermaas
224ff6c1ee added nix-prefetch-bzr
svn path=/nixpkgs/trunk/; revision=25806
2011-02-08 13:09:17 +00:00
Eelco Dolstra
58744ab7f3 * SQLite 3.7.5.
svn path=/nixpkgs/trunk/; revision=25804
2011-02-08 11:56:49 +00:00
Michael Raskin
7f0c493b1c Add python scripting support to Kig
svn path=/nixpkgs/trunk/; revision=25800
2011-02-08 10:38:52 +00:00
Michael Raskin
662fa0a13b Fix updated maxima build
svn path=/nixpkgs/trunk/; revision=25799
2011-02-08 10:35:58 +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
e0d871ba91 maxima: added buildInput 'texinfo' so that the reference documentation can be built
svn path=/nixpkgs/trunk/; revision=25797
2011-02-07 17:37:22 +00:00
Peter Simons
7795e5ec24 pkgs/applications/science/math/wxmaxima/default.nix: fixed the sha256 checksum
svn path=/nixpkgs/trunk/; revision=25796
2011-02-07 14:49:25 +00:00
Peter Simons
80c344d0cf pkgs/applications/science/math/maxima: fixed the sha256 checksum
svn path=/nixpkgs/trunk/; revision=25795
2011-02-07 14:47:42 +00:00
Peter Simons
0c3dcddbf3 pkgs/applications/science/math/wxmaxima: updated to version 0.8.7
svn path=/nixpkgs/trunk/; revision=25787
2011-02-07 11:35:42 +00:00
Peter Simons
a4cf1b8456 pkgs/applications/science/math/maxima: updated to version 5.23.2
svn path=/nixpkgs/trunk/; revision=25786
2011-02-07 11:35:35 +00:00
Alexander Tsamutali
864e905b4a games/warzone2100: Updated to 2.3.7.
svn path=/nixpkgs/trunk/; revision=25784
2011-02-06 17:26:03 +00:00
Lluís Batlle i Rossell
47c7daa2af Adding vmime
svn path=/nixpkgs/trunk/; revision=25783
2011-02-06 15:27:14 +00:00
Michael Raskin
9391f9819c Update tbe - multiple fixes
svn path=/nixpkgs/trunk/; revision=25782
2011-02-06 14:13:31 +00:00
Andres Löh
9fdd920391 Version bump for convertible.
svn path=/nixpkgs/trunk/; revision=25781
2011-02-05 23:40:34 +00:00
Lluís Batlle i Rossell
16d91fa949 Tell hydra to build audacity.
svn path=/nixpkgs/trunk/; revision=25780
2011-02-05 21:08:12 +00:00
Eelco Dolstra
4f87b5338c * Clang/LLVM updated to 2.8.
svn path=/nixpkgs/trunk/; revision=25777
2011-02-05 15:45:02 +00:00
Michael Raskin
596dca28d3 Update Veracity to 0.5.7
svn path=/nixpkgs/trunk/; revision=25775
2011-02-04 16:58:47 +00:00
Michael Raskin
49f0246f87 Update TBE to SVN revision - some crashes fixed
svn path=/nixpkgs/trunk/; revision=25774
2011-02-04 16:38:22 +00:00
Ludovic Courtès
b4c640d686 GNU Guile-Ncurses 1.3.
svn path=/nixpkgs/trunk/; revision=25772
2011-02-04 08:40:33 +00:00
Ludovic Courtès
726235d36c GNU Guile 1.9.15.
svn path=/nixpkgs/trunk/; revision=25771
2011-02-03 16:42:16 +00:00
Russell O'Connor
7748f89d86 Bump TeXmacs to verion 1.0.7.9.
svn path=/nixpkgs/trunk/; revision=25770
2011-02-03 16:23:05 +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
David Guibert
a45d06f7fb Merge commit 'f54c97b' into HEAD
svn path=/nixpkgs/trunk/; revision=25768
2011-02-02 20:05:47 +00:00
Eelco Dolstra
e87f7fdf1b * Doh.
svn path=/nixpkgs/trunk/; revision=25767
2011-02-02 16:44:50 +00:00
Eelco Dolstra
88b1fb3554 * Fix oxygen-icons' outputHash. (OMG is the oxygen-icons tarball
really 278 MB?)

svn path=/nixpkgs/trunk/; revision=25766
2011-02-02 16:41:37 +00:00
Eelco Dolstra
74c988959a * Updated iputils (though perhaps we should just use GNU inetutils).
svn path=/nixpkgs/trunk/; revision=25765
2011-02-02 16:05:18 +00:00
Eelco Dolstra
b899921afe * nvidia-x11: updated to 260.19.36.
svn path=/nixpkgs/trunk/; revision=25764
2011-02-02 15:30:30 +00:00
Eelco Dolstra
e9584a8f91 * Updated AEFS.
svn path=/nixpkgs/trunk/; revision=25763
2011-02-02 15:12:15 +00:00
Eelco Dolstra
cafbcf1391 * Delete KDE 4.4 - obsolete.
svn path=/nixpkgs/trunk/; revision=25762
2011-02-02 14:24:56 +00:00
Peter Simons
7689a5d7a7 pkgs/applications/window-managers/ratpoison: added dependency on perl, which is required by rpws
svn path=/nixpkgs/trunk/; revision=25761
2011-02-02 13:58:18 +00:00
Eelco Dolstra
a3fe61586c * Updated KDE to 4.5.5.
* Removed the KDE version number from all expressions except the
  top-level default.nix.  This makes it easier to upgrade.
* Deleted the old l10n versions since there doesn't seem to be a good
  reason to keep them around. 
* Don't use replaceChars (slow!) but do the name sanitization in
  l10n-manifest.sh.

svn path=/nixpkgs/trunk/; revision=25760
2011-02-02 13:54:35 +00:00
Eelco Dolstra
207f3278c1 * boehm-gc: For simplicity, use a tarball containing the CVS export
instead of fetchcvs.  Then we don't need to special-case FreeBSD
  either.  Also, removed the Cygwin patch which no longer seems
  needed.

svn path=/nixpkgs/trunk/; revision=25759
2011-02-02 12:17:29 +00:00
Peter Simons
d23005c2f9 pkgs/development/interpreters/python/3.1: major simplification of the expression
This change allows 'python3' to be built with approximately the same features
as 'python27Full'.

svn path=/nixpkgs/trunk/; revision=25757
2011-02-02 11:17:06 +00:00
Peter Simons
1620eb2311 pkgs/top-level/all-packages.nix: use callPackage to import the python 3 expression
svn path=/nixpkgs/trunk/; revision=25756
2011-02-02 11:17:01 +00:00
Peter Simons
4262167be0 pkgs/applications/version-management/git-and-tools/git: fixed git gui module
Patch Tcl/Tk scripts to invoke 'wish' using the complete executable path to
ensure that the proper version is being used.

svn path=/nixpkgs/trunk/; revision=25755
2011-02-02 11:16:57 +00:00
Peter Simons
775542900b pkgs/development/interpreters/python/3.1: enable parallel building
svn path=/nixpkgs/trunk/; revision=25754
2011-02-02 11:16:53 +00:00
Peter Simons
c60fad3978 pkgs/development/interpreters/python/3.1: added missing meta section attributes
svn path=/nixpkgs/trunk/; revision=25753
2011-02-02 11:16:49 +00:00
Peter Simons
4685f4b74e pkgs/development/interpreters/python/3.1/setup-hook.sh: fixed bogus version number
svn path=/nixpkgs/trunk/; revision=25752
2011-02-02 11:16:45 +00:00
Peter Simons
c80d448a64 pkgs/development/interpreters/python/3.1: updated to version 3.1.3
svn path=/nixpkgs/trunk/; revision=25751
2011-02-02 11:16:41 +00:00
Peter Simons
6da6b022c1 pkgs/top-level/all-packages.nix: dropped lowPrio wrapper around python3
Python 3.x was originally marked as 'low priority' to prevent unintended
updates from version 2 to 3. Meanwhile, the python3 expression has been
renamed to use a different package name, so these kind of accidental updates
can no longer happen.

svn path=/nixpkgs/trunk/; revision=25750
2011-02-02 11:16:36 +00:00