JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,682 Commits 2 Branches 0 Tags 12 GiB
195831a3bf
Commit Graph

15437 Commits

Author SHA1 Message Date
Andres Löh
51124b08b5 Bumping the GHC HEAD snapshot. 
svn path=/nixpkgs/trunk/; revision=29026
 2011-09-05 13:29:33 +00:00
Eelco Dolstra
d7b4b63f4d * Allow literal examples to be included in the manual. 
svn path=/nixpkgs/trunk/; revision=29024
 2011-09-05 10:14:24 +00:00
Andres Löh
1e6eeb9ad7 Updated ghc-events and threadscope. 
svn path=/nixpkgs/trunk/; revision=29023
 2011-09-05 09:52:34 +00:00
Nicolas Pierron
51ccaadce3 Thunderbird 5.x: Add Linux as a build platform. 
svn path=/nixpkgs/trunk/; revision=29019
 2011-09-05 08:33:07 +00:00
Nicolas Pierron
ad416e1cff Add additional Intel firmwares (naming iwlwifig2{a,b}-ucode). 
svn path=/nixpkgs/trunk/; revision=29018
 2011-09-05 08:33:03 +00:00
Nicolas Pierron
174153238a rdiff-backup: Fix nix expression. 
svn path=/nixpkgs/trunk/; revision=29017
 2011-09-05 08:32:55 +00:00
Lluís Batlle i Rossell
05f95c69c5 Updating meld 
svn path=/nixpkgs/trunk/; revision=29016
 2011-09-05 08:31:49 +00:00
Ludovic Courtès
02f91a458d GNU Source-Highlight 3.1.5. 
svn path=/nixpkgs/trunk/; revision=29013
 2011-09-04 23:06:03 +00:00
Ludovic Courtès
2af4615ea8 GNU TeXmacs 1.0.7.11. 
svn path=/nixpkgs/trunk/; revision=29012
 2011-09-04 23:05:57 +00:00
Ludovic Courtès
71325e1eba GNU FreeIPMI 1.0.6. 
svn path=/nixpkgs/trunk/; revision=29011
 2011-09-04 23:05:53 +00:00
Ludovic Courtès
b9b268eb01 GNU Wget 1.13.3. 
svn path=/nixpkgs/trunk/; revision=29010
 2011-09-04 23:05:48 +00:00
Ludovic Courtès
bad0bd10a8 GnuTLS 3.0.2. 
svn path=/nixpkgs/trunk/; revision=29009
 2011-09-04 23:05:42 +00:00
Ludovic Courtès
77f80e6310 GNU Nettle 2.4. 
svn path=/nixpkgs/trunk/; revision=29008
 2011-09-04 23:05:35 +00:00
Sander van der Burg
1ecf17711d Updated hashcode 
svn path=/nixpkgs/trunk/; revision=29005
 2011-09-04 16:47:54 +00:00
Peter Simons
92153bc2d5 haskell-xss-sanitize: dropped obsolete version 0.2.6 
svn path=/nixpkgs/trunk/; revision=29004
 2011-09-04 13:44:39 +00:00
Peter Simons
5fb2b7c8eb haskell-happstack-server: updated to version 6.2.2 
svn path=/nixpkgs/trunk/; revision=29003
 2011-09-04 13:44:31 +00:00
Peter Simons
27b2d8f8a9 haskell-gitit: updated to version 0.8.1 
svn path=/nixpkgs/trunk/; revision=29002
 2011-09-04 13:44:22 +00:00
Michael Raskin
09114ea858 Adding ZBar 
svn path=/nixpkgs/trunk/; revision=29001
 2011-09-04 09:12:00 +00:00
Ludovic Courtès
0803c5d069 Pius 2.0.9. 
svn path=/nixpkgs/trunk/; revision=29000
 2011-09-04 08:54:19 +00:00
Shea Levy
1fe20228b9 sphinxbase: Add flag to play with multiple outputs 
svn path=/nixpkgs/trunk/; revision=28999
 2011-09-03 20:01:06 +00:00
Shea Levy
04e4bf68c8 sphinxbase: The source tarball hash changed for some reason. That's disconcerting... 
svn path=/nixpkgs/trunk/; revision=28998
 2011-09-03 20:00:58 +00:00
Ludovic Courtès
db867607cb Add GimpLensfun. 
svn path=/nixpkgs/trunk/; revision=28997
 2011-09-03 17:31:10 +00:00
Peter Simons
2c0eddaeaa git-annex: updated to version 3.20110902 
svn path=/nixpkgs/trunk/; revision=28996
 2011-09-03 13:17:36 +00:00
Peter Simons
c79027e3ab haskell-hxt: added version 9.1.4 
haskell-hxt-charproperties: added version 9.1.0
haskell-hxt-regex-xmlschema: added version 9.0.1
haskell-hxt-unicode: added version 9.0.1

svn path=/nixpkgs/trunk/; revision=28995
 2011-09-03 13:17:29 +00:00
Peter Simons
9bc7fee30d haskell-hS3: added version 0.5.6 
svn path=/nixpkgs/trunk/; revision=28994
 2011-09-03 13:17:23 +00:00
Michael Raskin
238625aa76 Attempting to fix tests a bit.. 
svn path=/nixpkgs/trunk/; revision=28993
 2011-09-03 10:21:55 +00:00
Peter Simons
30c71f18b8 haskell-vector-space: updated to version 0.7.6 
svn path=/nixpkgs/trunk/; revision=28992
 2011-09-02 21:49:13 +00:00
Peter Simons
b07e579498 haskell-hledger: updated to version 0.15.1 
svn path=/nixpkgs/trunk/; revision=28991
 2011-09-02 21:49:08 +00:00
Peter Simons
df672edd89 haskell-hledger-vty: updated to version 0.15.1 
svn path=/nixpkgs/trunk/; revision=28990
 2011-09-02 21:49:02 +00:00
Peter Simons
afb859003f haskell-hledger-chart: updated to version 0.15.1 
svn path=/nixpkgs/trunk/; revision=28989
 2011-09-02 21:48:57 +00:00
Russell O'Connor
2bc0a91739 bitcoin cannot use the recent versions of boost. 
setting boost dependency to 1.44

svn path=/nixpkgs/trunk/; revision=28988
 2011-09-02 20:19:42 +00:00
Russell O'Connor
c128803d11 upgrading 32-bit flashplayer to version 10.3.183.7 
svn path=/nixpkgs/trunk/; revision=28987
 2011-09-02 19:25:46 +00:00
Peter Simons
afdabc50ff Oops, forgot to delete the old file. 
svn path=/nixpkgs/trunk/; revision=28986
 2011-09-02 18:33:04 +00:00
Peter Simons
35e1b7ddee haskell-vector-algorithms: updated to version 0.5.3 
svn path=/nixpkgs/trunk/; revision=28985
 2011-09-02 18:31:44 +00:00
Peter Simons
6295090cc6 haskell-unix-compat: added version 0.3 
svn path=/nixpkgs/trunk/; revision=28984
 2011-09-02 18:24:27 +00:00
Peter Simons
fb05c34051 haskell-HaskellForMaths: added version 0.3.4 
svn path=/nixpkgs/trunk/; revision=28983
 2011-09-02 18:20:35 +00:00
Peter Simons
6942491296 haskell-hledger-interest: updated to version 1.3 
svn path=/nixpkgs/trunk/; revision=28982
 2011-09-02 18:12:31 +00:00
Peter Simons
89afa3dd58 haskell-hmatrix: updated to version 0.12.0.0 
svn path=/nixpkgs/trunk/; revision=28981
 2011-09-02 18:02:28 +00:00
Peter Simons
2442cf69f7 haskell-hledger: updated to version 0.15 
svn path=/nixpkgs/trunk/; revision=28980
 2011-09-02 18:02:24 +00:00
Peter Simons
79c008e863 haskell-hledger-vty: updated to version 0.15 
svn path=/nixpkgs/trunk/; revision=28979
 2011-09-02 18:02:20 +00:00
Peter Simons
232483a379 haskell-hledger-lib: updated to version 0.15 
svn path=/nixpkgs/trunk/; revision=28978
 2011-09-02 18:02:16 +00:00
Peter Simons
159adba352 haskell-hledger-chart: updated to version 0.15 
svn path=/nixpkgs/trunk/; revision=28977
 2011-09-02 18:02:10 +00:00
Eelco Dolstra
573e554e2c * Apache httpd updated to 2.2.20, with a fix for CVE-2011-3192. 
svn path=/nixpkgs/trunk/; revision=28976
 2011-09-02 15:59:12 +00:00
Andres Löh
33afa20575 Added HDBC-odbc. 
svn path=/nixpkgs/trunk/; revision=28975
 2011-09-02 15:11:52 +00:00
Eelco Dolstra
e8c849f8e3 * Re-enable the fbcondecor patch for Linux 2.6.35, seems to work fine. 
svn path=/nixpkgs/trunk/; revision=28974
 2011-09-02 13:41:38 +00:00
Eelco Dolstra
c084ef2f61 * The latest and greatest Tribler. 
svn path=/nixpkgs/trunk/; revision=28971
 2011-09-02 11:11:48 +00:00
Lluís Batlle i Rossell
295089faae Updating task spooler. 
svn path=/nixpkgs/trunk/; revision=28970
 2011-09-02 08:57:12 +00:00
Michael Raskin
32754d3c19 Adding Regina-REXX interpreter 
svn path=/nixpkgs/trunk/; revision=28969
 2011-09-02 08:05:51 +00:00
Lluís Batlle i Rossell
833eea6157 Updating fossil to 1.19. I can't still add readline as build input, because its 
new configuration code fails to cope with nix gcc detecting readline.


svn path=/nixpkgs/trunk/; revision=28968
 2011-09-01 21:03:18 +00:00
Peter Simons
236ba05e06 haskell-yesod: updated to version 0.9.1.1 
svn path=/nixpkgs/trunk/; revision=28966
 2011-09-01 17:59:38 +00:00
Peter Simons
dfc019ad49 haskell-yesod-core: updated to version 0.9.1.1 
svn path=/nixpkgs/trunk/; revision=28965
 2011-09-01 17:59:34 +00:00
Peter Simons
9221fafcb1 haskell-regular: updated to version 0.3.3 
svn path=/nixpkgs/trunk/; revision=28964
 2011-09-01 17:59:30 +00:00
Peter Simons
7e165bb559 haskell-ranges: updated to version 0.2.4 
svn path=/nixpkgs/trunk/; revision=28963
 2011-09-01 17:59:26 +00:00
Peter Simons
70c47021a7 haskell-xhtml: updated to version 3000.2.0.4 
svn path=/nixpkgs/trunk/; revision=28962
 2011-09-01 17:59:22 +00:00
Michael Raskin
8fa5d91e51 adding VUE mindmapper 
svn path=/nixpkgs/trunk/; revision=28957
 2011-09-01 13:41:42 +00:00
Marco Maggesi
a02960ae4e Add clojure. 
(Install with command
   nix-env -i clojure-wrapper
 start REPL with command
   clojure)


svn path=/nixpkgs/trunk/; revision=28956
 2011-09-01 13:38:59 +00:00
David Guibert
80db090ed7 add bluetooth audio support for linux 3.0 and 3.1. 
svn path=/nixpkgs/trunk/; revision=28954
 2011-09-01 10:03:06 +00:00
David Guibert
754fb9cc29 make blueman create the audio sink/source via pulse 
svn path=/nixpkgs/trunk/; revision=28953
 2011-09-01 10:03:01 +00:00
David Guibert
e7418b271c bluez 4.95 -> 4.96 
svn path=/nixpkgs/trunk/; revision=28952
 2011-09-01 10:02:56 +00:00
Michael Raskin
cd68b91a4f Update Vacuum 
svn path=/nixpkgs/trunk/; revision=28948
 2011-09-01 06:15:12 +00:00
Peter Simons
7a0fe943aa haskell-fclabels: updated to version 1.0.4 
svn path=/nixpkgs/trunk/; revision=28945
 2011-08-31 19:05:10 +00:00
Peter Simons
04b1ac31da haskell-http-enumerator: updated to version 0.6.7 
svn path=/nixpkgs/trunk/; revision=28943
 2011-08-31 12:41:06 +00:00
Peter Simons
4758e8a71a haskell-clientsession: updated to version 0.7.2 
svn path=/nixpkgs/trunk/; revision=28942
 2011-08-31 12:41:01 +00:00
Peter Simons
6358071c14 haskell-ListLike: updated to version 3.1.2 
svn path=/nixpkgs/trunk/; revision=28941
 2011-08-31 12:40:57 +00:00
Peter Simons
fe445aa5b2 haskell-xhtml: added version 3000.2.0.2 
svn path=/nixpkgs/trunk/; revision=28940
 2011-08-31 12:40:53 +00:00
Peter Simons
614551f9b4 antiword: patch source code so that the tool can find it's data files 
svn path=/nixpkgs/trunk/; revision=28939
 2011-08-31 12:06:27 +00:00
Peter Simons
577ddef0be antiword: added version 0.37 
svn path=/nixpkgs/trunk/; revision=28938
 2011-08-31 11:55:51 +00:00
Eelco Dolstra
a4993d3b23 * Firefox 6.0.1, 3.6.21. 
svn path=/nixpkgs/trunk/; revision=28937
 2011-08-31 09:12:56 +00:00
Rob Vermaas
4c7418cb29 add protobuf based on the default version in nixpkgs 
svn path=/nixpkgs/trunk/; revision=28936
 2011-08-30 19:57:29 +00:00
Rob Vermaas
a63bf23f32 add enum-0.4.4 
svn path=/nixpkgs/trunk/; revision=28935
 2011-08-30 19:50:36 +00:00
Eelco Dolstra
c529cc17f0 * dosfstools updated to 3.0.11. 
svn path=/nixpkgs/trunk/; revision=28933
 2011-08-30 18:25:07 +00:00
Shea Levy
9496f3767b gcc-apple64: Enable Objective C 
darwin-updates was just merged, so I'm taking the liberty of messing with darwin's stdenv

svn path=/nixpkgs/trunk/; revision=28929
 2011-08-30 13:46:05 +00:00
Shea Levy
5058e62c56 linux-3.1: Bump to rc4 
svn path=/nixpkgs/trunk/; revision=28928
 2011-08-30 13:25:23 +00:00
Shea Levy
72c9b2f62e linux-3.0.nix: Bump to 3.0.4 
svn path=/nixpkgs/trunk/; revision=28927
 2011-08-30 13:25:11 +00:00
Ludovic Courtès
e84b9edc78 Merge from the `darwin-updates' branch. 
svn path=/nixpkgs/trunk/; revision=28926
 2011-08-30 13:08:33 +00:00
Peter Simons
92e3a9c6dc haskell-blaze-textual: updated to version 0.2.0.4 
svn path=/nixpkgs/trunk/; revision=28925
 2011-08-30 09:49:12 +00:00
Peter Simons
84ff2da8c1 haskell-aeson: updated to version 0.3.2.11 
svn path=/nixpkgs/trunk/; revision=28924
 2011-08-30 09:49:08 +00:00
Peter Simons
1392096d69 Updated the default version of haskell-text to 0.11.1.5. 
A growing number of packages don't build with the old version. I was
reluctant to make that change because Haskell Platform 2011.2.0.1 says
that text 0.11.0.6 ought to be used, but then HP says we shouldn't be
using GHC 7.0.4 either, yet we do. Anyway, upgrading the text library
caused no problems: all packages just built fine, so there you go.

svn path=/nixpkgs/trunk/; revision=28923
 2011-08-30 09:49:04 +00:00
Peter Simons
3775dea86f haskell-warp: updated to version 0.4.4 
svn path=/nixpkgs/trunk/; revision=28922
 2011-08-30 09:17:38 +00:00
Peter Simons
d26f4612b1 haskell-random-fu: updated to version 0.2.1.0 
svn path=/nixpkgs/trunk/; revision=28921
 2011-08-30 09:17:34 +00:00
Peter Simons
f17a4bc77e haskell-pool: updated to version 0.1.1 
svn path=/nixpkgs/trunk/; revision=28920
 2011-08-30 09:17:30 +00:00
Peter Simons
d0803ce5c8 haskell-largeword: updated to version 1.0.1 
svn path=/nixpkgs/trunk/; revision=28919
 2011-08-30 09:17:26 +00:00
Peter Simons
61dd4707c9 haskell-SHA: updated to version 1.5.0.0 
svn path=/nixpkgs/trunk/; revision=28918
 2011-08-30 09:17:22 +00:00
Peter Simons
fb37aed285 Dropped obsolete versions of haskell-HaXml. 
svn path=/nixpkgs/trunk/; revision=28917
 2011-08-30 08:55:14 +00:00
Michael Raskin
6a01304317 Adding TFTP-HPA 
svn path=/nixpkgs/trunk/; revision=28915
 2011-08-30 07:02:01 +00:00
Michael Raskin
3f845cb22d Adding xtreemfs 
svn path=/nixpkgs/trunk/; revision=28914
 2011-08-30 05:51:49 +00:00
Michael Raskin
c5e1345758 Update LiquidWar 
svn path=/nixpkgs/trunk/; revision=28913
 2011-08-30 05:26:39 +00:00
Rob Vermaas
c508b4cf04 add get_iplayer 2.80 
svn path=/nixpkgs/trunk/; revision=28912
 2011-08-30 00:14:16 +00:00
Yury G. Kudryashov
0a2debdee3 SDO-0.8.0 
svn path=/nixpkgs/trunk/; revision=28911
 2011-08-29 22:48:36 +00:00
Yury G. Kudryashov
94c6bb3ed4 Add kmymoney 
svn path=/nixpkgs/trunk/; revision=28910
 2011-08-29 22:43:11 +00:00
Yury G. Kudryashov
50f5c15996 Trying to fix nepomukserver startup problem 
svn path=/nixpkgs/trunk/; revision=28909
 2011-08-29 22:43:03 +00:00
Peter Simons
ed03fadafc pkgs/tools/networking/p2p/gtk-gnutella/builder.sh: dropped obsolete file 
svn path=/nixpkgs/trunk/; revision=28908
 2011-08-29 22:21:29 +00:00
Peter Simons
d84962624e Dropped obsolete haskell-emgm. 
The package doesn't build with any of our compilers.

svn path=/nixpkgs/trunk/; revision=28906
 2011-08-29 21:46:22 +00:00
Piotr Pietraszkiewicz
63ace05051 added polish dictionary to the list 
svn path=/nixpkgs/trunk/; revision=28905
 2011-08-29 21:45:42 +00:00
Peter Simons
6f23bfc52f Dropped obsolete haskell-MaybeT-transformers. 
The package doesn't build with any of our compilers.

svn path=/nixpkgs/trunk/; revision=28904
 2011-08-29 21:44:36 +00:00
Peter Simons
a96de07ceb Dropped obsolete Haskell packages monads-fd, salvia, and salvia-protocol. 
These packages don't build with any of our compilers.

svn path=/nixpkgs/trunk/; revision=28903
 2011-08-29 21:44:30 +00:00
Peter Simons
04e2d193bd haskell-yesod: updated to version 0.9.1 
svn path=/nixpkgs/trunk/; revision=28902
 2011-08-29 20:28:32 +00:00
Peter Simons
6b2839c361 haskell-yesod-static: updated to version 0.3.0.1 
svn path=/nixpkgs/trunk/; revision=28901
 2011-08-29 20:28:27 +00:00
Peter Simons
4e715256a7 haskell-yesod-persistent: updated to version 0.2.1 
svn path=/nixpkgs/trunk/; revision=28900
 2011-08-29 20:28:23 +00:00
Peter Simons
077c598c85 haskell-yesod-json: updated to version 0.2.1 
svn path=/nixpkgs/trunk/; revision=28899
 2011-08-29 20:28:19 +00:00
Peter Simons
5b948f85e5 haskell-yesod-form: updated to version 0.3.1 
svn path=/nixpkgs/trunk/; revision=28898
 2011-08-29 20:28:14 +00:00
Peter Simons
4aa21929ea haskell-yesod-core: updated to version 0.9.1 
svn path=/nixpkgs/trunk/; revision=28897
 2011-08-29 20:28:10 +00:00
Peter Simons
682bf916a8 haskell-yesod-auth: updated to version 0.7.1 
svn path=/nixpkgs/trunk/; revision=28896
 2011-08-29 20:28:06 +00:00
Peter Simons
5836af8dc2 haskell-wai-extra: updated to version 0.4.2 
svn path=/nixpkgs/trunk/; revision=28895
 2011-08-29 20:28:02 +00:00
Peter Simons
9c0c9b9ba4 haskell-wai-app-static: updated to version 0.3.3 
svn path=/nixpkgs/trunk/; revision=28894
 2011-08-29 20:27:47 +00:00
Peter Simons
42a21dc8d6 haskell-persistent: updated to version 0.6.1 
svn path=/nixpkgs/trunk/; revision=28893
 2011-08-29 20:27:34 +00:00
Peter Simons
e5454cf33a haskell-persistent-template: updated to version 0.6.1 
svn path=/nixpkgs/trunk/; revision=28892
 2011-08-29 20:27:28 +00:00
Peter Simons
ba9cc549fa haskell-data-default: updated to version 0.3.0 
svn path=/nixpkgs/trunk/; revision=28891
 2011-08-29 20:27:20 +00:00
Peter Simons
e31db94550 haskell-clientsession: updated to version 0.7.0 
svn path=/nixpkgs/trunk/; revision=28890
 2011-08-29 20:27:15 +00:00
Peter Simons
e6273ab9d1 haskell-authenticate: updated to version 0.10.1 
svn path=/nixpkgs/trunk/; revision=28889
 2011-08-29 20:27:10 +00:00
Peter Simons
ddb2097b3f haskell-packages.nix: added shakespeare packages 
haskell-shakespeare-css: added version 0.10.0
  haskell-shakespeare-js: added version 0.10.1
  haskell-shakespeare: added version 0.10.0

svn path=/nixpkgs/trunk/; revision=28888
 2011-08-29 20:27:05 +00:00
Peter Simons
5eb504674a haskell-hamlet: added version 0.10.0 
svn path=/nixpkgs/trunk/; revision=28887
 2011-08-29 20:26:52 +00:00
Peter Simons
70f424ee5e haskell-xss-sanitize: added version 0.3.0.1 
svn path=/nixpkgs/trunk/; revision=28886
 2011-08-29 20:26:45 +00:00
Peter Simons
3895e45e51 haskell-blaze-textual-native: added version 0.2.1 
svn path=/nixpkgs/trunk/; revision=28885
 2011-08-29 20:26:40 +00:00
Peter Simons
1bc2601ae1 haskell-aeson-native: added version 0.3.3 
svn path=/nixpkgs/trunk/; revision=28884
 2011-08-29 20:26:35 +00:00
Peter Simons
482a61cf53 gtk-gnutella: updated to version 0.97 
svn path=/nixpkgs/trunk/; revision=28883
 2011-08-29 20:26:26 +00:00
Peter Simons
feff68214e pkgs/development/compilers/ghc/7.0.4.nix: hard-code list of supported platforms 
I assumed that Hydra would arrive at that result anyway, but apparently
it doesn't: no x86_64-darwin builds have occurred despite the fact that
we can bootstrap on that architecture now.

svn path=/nixpkgs/trunk/; revision=28882
 2011-08-29 20:09:57 +00:00
Shea Levy
8a3f40a088 Get libpciaccess to compile on darwin 
The added patch uses the correct byte-conversion functions on Apple systems. The library compiles on darwin but is not yet tested.

svn path=/nixpkgs/trunk/; revision=28881
 2011-08-29 18:58:59 +00:00
Peter Simons
7e2dcdc5ee pkgs/top-level/all-packages.nix: fixed Darwin build of haskellPackages_ghc704_{,no_}profiling 
svn path=/nixpkgs/trunk/; revision=28880
 2011-08-29 18:57:35 +00:00
Shea Levy
e309c50e7e Get libdrm to compile on darwin 
The added patch uses mach_absolute_time() to get a nanosecond-resolution monotonic clock on darwin systems (See http://developer.apple.com/library/mac/#qa/qa1398/_index.html for an understanding of the added code). In addition, the patch changes one use of clock_gettime to gettimeofday since only resolution of a second is needed at that point. This code compiles on darwin, but the resulting library is not yet tested.

svn path=/nixpkgs/trunk/; revision=28879
 2011-08-29 18:55:37 +00:00
Eelco Dolstra
41f39c4a22 * qemu-kvm updated to 0.15.0. 
svn path=/nixpkgs/trunk/; revision=28876
 2011-08-29 13:39:25 +00:00
Michael Raskin
6759fab01b Moving debian patch to fetchurl 
svn path=/nixpkgs/trunk/; revision=28875
 2011-08-29 13:17:44 +00:00
Michael Raskin
b612e07c0b Adding atftp 
svn path=/nixpkgs/trunk/; revision=28874
 2011-08-29 12:47:39 +00:00
Michael Raskin
946458d4f9 Fixing tarball build 
svn path=/nixpkgs/trunk/; revision=28873
 2011-08-29 10:31:10 +00:00
Michael Raskin
04e84c2c13 Adding netboot 
svn path=/nixpkgs/trunk/; revision=28872
 2011-08-29 10:16:36 +00:00
Michael Raskin
f9728ee0db Fix a typo 
svn path=/nixpkgs/trunk/; revision=28871
 2011-08-29 10:06:12 +00:00
Peter Simons
6bd84d04a5 haskell-fclabels: updated to version 1.0.3 
svn path=/nixpkgs/trunk/; revision=28870
 2011-08-29 09:54:47 +00:00
Shea Levy
3fe371b856 ghc/7.0.4-binary.nix: Remove comments about wrapper scripts 
svn path=/nixpkgs/trunk/; revision=28869
 2011-08-29 08:09:27 +00:00
Shea Levy
9381f1a419 ghc-7.0.4-binary.nix: don't wrap the binaries on darwin 
ghc-7.0.4 fails at configure with the wrapped binaries and builds fine with the unwrapped binaries.

svn path=/nixpkgs/trunk/; revision=28868
 2011-08-29 08:00:55 +00:00
Peter Simons
e211161c2c haskell-tagged: updated to version 0.2.3.1 
svn path=/nixpkgs/trunk/; revision=28867
 2011-08-29 07:57:01 +00:00
Peter Simons
f990dd30f7 pkgs/development/compilers/ghc/7.0.4-binary.nix: added (untested) support for i686-darwin 
svn path=/nixpkgs/trunk/; revision=28866
 2011-08-29 07:49:35 +00:00
Peter Simons
7d9c4b06ad pkgs/top-level/all-packages.nix: don't use tabs for indention 
svn path=/nixpkgs/trunk/; revision=28865
 2011-08-29 07:46:38 +00:00
Peter Simons
b6d994e9b7 pkgs/top-level/all-packages.nix: bootstrap ghc 7.0.4 and 7.2.1 with 7.0.4-binary on Darwin 
svn path=/nixpkgs/trunk/; revision=28864
 2011-08-29 07:46:30 +00:00
Peter Simons
8286d30453 pkgs/development/compilers/ghc/7.0.4.nix: add myself as a maintainer 
svn path=/nixpkgs/trunk/; revision=28863
 2011-08-29 07:39:29 +00:00
Peter Simons
7d9ac73058 pkgs/top-level/all-packages.nix: strip trailing whitespace 
svn path=/nixpkgs/trunk/; revision=28862
 2011-08-29 07:39:08 +00:00
Peter Simons
33597eee35 pkgs/development/compilers/ghc/7.0.4-binary.nix: pass "$@" in double quotes to avoid issues with arguments that contain whitespace 
svn path=/nixpkgs/trunk/; revision=28861
 2011-08-29 07:32:37 +00:00
Peter Simons
e9c8a9307b pkgs/development/compilers/ghc/7.0.4-binary.nix: support linux, too 
svn path=/nixpkgs/trunk/; revision=28860
 2011-08-29 07:25:56 +00:00
Shea Levy
346481f483 Add GHC 7.0.4 binary for x86_64-darwin 
svn path=/nixpkgs/trunk/; revision=28859
 2011-08-29 01:20:12 +00:00
Nicolas Pierron
d528cba5b8 fetchgit: Handle https. 
svn path=/nixpkgs/trunk/; revision=28857
 2011-08-28 16:03:14 +00:00
Eelco Dolstra
353ec7a128 * CAcert bundle updated to the latest version (it was almost two years old). 
svn path=/nixpkgs/trunk/; revision=28856
 2011-08-28 16:02:18 +00:00
Peter Simons
14de7e8293 haskell-monad-control: updated to version 0.2.0.3 
svn path=/nixpkgs/trunk/; revision=28855
 2011-08-28 13:07:47 +00:00
Russell O'Connor
c7e097251c Updating Encfs to 1.7.4 
svn path=/nixpkgs/trunk/; revision=28854
 2011-08-28 00:16:43 +00:00
Michael Raskin
6a49d6a920 Re-add GNU TLS 2.12 - it does fix glib-networking 
svn path=/nixpkgs/trunk/; revision=28853
 2011-08-27 17:04:25 +00:00
Nicolas Pierron
6e9492d7fd Fix mozilla urls. 
svn path=/nixpkgs/trunk/; revision=28850
 2011-08-27 15:29:13 +00:00
Nicolas Pierron
fb3a64c934 Gdb: Remove un-neccessary --with-python. 
svn path=/nixpkgs/trunk/; revision=28849
 2011-08-27 15:29:04 +00:00
Eelco Dolstra
3f02dcf735 * Fix indentation/layout. 
svn path=/nixpkgs/trunk/; revision=28848
 2011-08-27 15:19:19 +00:00
Eelco Dolstra
b44f2c7ad3 * Add polkit-kde-agent to the channel. 
svn path=/nixpkgs/trunk/; revision=28847
 2011-08-27 15:19:05 +00:00
Eelco Dolstra
f823626fd8 * Get Firefox 6.0 to build with an upstream patch for building Firefox 
separately from Xulrunner
  (https://bugzilla.mozilla.org/show_bug.cgi?id=639554).

svn path=/nixpkgs/trunk/; revision=28846
 2011-08-27 13:44:36 +00:00
Michael Raskin
a4d460f52a Update SBCL 
svn path=/nixpkgs/trunk/; revision=28845
 2011-08-27 07:27:35 +00:00
Michael Raskin
ce77d02c9e Update Wine 
svn path=/nixpkgs/trunk/; revision=28844
 2011-08-27 07:22:17 +00:00
Yury G. Kudryashov
3244114412 Remove copies from hydra jobs 
Namely, kde45.kde4.kdenetwork == kde45.kdenetwork etc.

svn path=/nixpkgs/trunk/; revision=28843
 2011-08-26 20:08:46 +00:00
Yury G. Kudryashov
5d6cc2ef84 Add note about drop-kde4.5 branch 
svn path=/nixpkgs/trunk/; revision=28841
 2011-08-26 16:02:43 +00:00
Yury G. Kudryashov
2683407fe4 Add newer dbus and dbus-glib 
Old versions are kept to prevent huge rebuild

svn path=/nixpkgs/trunk/; revision=28836
 2011-08-26 14:57:48 +00:00
Eelco Dolstra
fde10569b0 * Added XML::LibXSLT. 
* Updated XML::LibXML.

svn path=/nixpkgs/trunk/; revision=28835
 2011-08-26 14:22:09 +00:00
Yury G. Kudryashov
597412252a Wrap kde-related packages in kdePackagesFor 
This lets hydra build kde packages for all available KDE releases.
Will commit NixOS-fix in a few minutes.

svn path=/nixpkgs/trunk/; revision=28833
 2011-08-26 13:49:23 +00:00
Yury G. Kudryashov
8c26e61e42 Remove outPath from dbus 
This was a compatibility hack. Packages should depend on dbus.libs explicitly.
Should not change any hash. Will fix NixOS dbus.nix in the next commit.

svn path=/nixpkgs/trunk/; revision=28831
 2011-08-26 13:46:32 +00:00
Michael Raskin
9c87acf5ab Update Google Talk source. I wonder if there is a way to get it with a fixed version.. 
svn path=/nixpkgs/trunk/; revision=28830
 2011-08-26 11:21:56 +00:00
Peter Simons
c0fb177ce9 git-annex: pass an older version of QuickCheck to fix build failure of the test suite 
svn path=/nixpkgs/trunk/; revision=28829
 2011-08-26 10:51:47 +00:00
Peter Simons
5412c585bc haskell-cabal2nix: updated to version 1.13 
svn path=/nixpkgs/trunk/; revision=28828
 2011-08-26 10:29:17 +00:00
Peter Simons
7ccb9f141a haskell-nixos-types: updated to version 1.1 
svn path=/nixpkgs/trunk/; revision=28827
 2011-08-26 10:29:11 +00:00
Peter Simons
ea5a993ac4 haskell-X11-xft: cabal2nix can re-generate this expression now 
svn path=/nixpkgs/trunk/; revision=28826
 2011-08-26 10:29:06 +00:00
Peter Simons
ad24694013 haskell-pandoc: enable highlighting and threading 
svn path=/nixpkgs/trunk/; revision=28825
 2011-08-26 10:28:59 +00:00
Sander van der Burg
875cb2965f Bumped Tomcat connectors to version 1.2.32 
svn path=/nixpkgs/trunk/; revision=28823
 2011-08-26 09:54:46 +00:00
Peter Simons
1cc2d88899 haskell-zlib-bindings: updated to version 0.0.1 
svn path=/nixpkgs/trunk/; revision=28822
 2011-08-26 09:21:17 +00:00
Peter Simons
397845a77d haskell-utf8-string: updated to version 0.3.7 
svn path=/nixpkgs/trunk/; revision=28821
 2011-08-26 09:21:13 +00:00
Peter Simons
dfcddab7e2 haskell-haskell-src-meta: updated to version 0.5 
svn path=/nixpkgs/trunk/; revision=28820
 2011-08-26 09:21:09 +00:00
Peter Simons
506b355d33 haskell-filepath: updated to version 1.2.0.1 
svn path=/nixpkgs/trunk/; revision=28819
 2011-08-26 09:21:04 +00:00
Peter Simons
becb1962c2 haskell-random: added version 1.0.1.0 
svn path=/nixpkgs/trunk/; revision=28818
 2011-08-26 09:20:54 +00:00
Peter Simons
dc7e7b7dcf haskell-extensible-exceptions: added version 0.1.1.3 
svn path=/nixpkgs/trunk/; revision=28817
 2011-08-26 09:20:42 +00:00
Yury G. Kudryashov
5c90976c6a Add meta to kde-4.7 'subdir' pkgs 
svn path=/nixpkgs/trunk/; revision=28816
 2011-08-25 20:00:55 +00:00
Eelco Dolstra
69a8ca2dc8 * Added Catalyst::View::JSON. 
svn path=/nixpkgs/trunk/; revision=28815
 2011-08-25 18:37:52 +00:00
Peter Simons
59882abab2 haskell-async: updated to version 1.4 
svn path=/nixpkgs/trunk/; revision=28813
 2011-08-25 11:12:32 +00:00
Peter Simons
6401a82424 haskell-async: updated to version 1.3 
svn path=/nixpkgs/trunk/; revision=28812
 2011-08-25 10:41:01 +00:00
Peter Simons
96fcee49c9 haskell-fclabels: updated to version 1.0.2 
svn path=/nixpkgs/trunk/; revision=28811
 2011-08-25 09:32:41 +00:00
Peter Simons
82bdefea1e haskell-email-validate: updated to version 0.2.7 
svn path=/nixpkgs/trunk/; revision=28810
 2011-08-25 09:32:37 +00:00
Peter Simons
54242ed70c haskell-dimensional: updated to version 0.10.1.1 
svn path=/nixpkgs/trunk/; revision=28809
 2011-08-25 09:32:30 +00:00
Rob Vermaas
9690dc026b add dbench 
svn path=/nixpkgs/trunk/; revision=28807
 2011-08-25 01:00:25 +00:00
Rob Vermaas
4170da1c96 add dbench 
svn path=/nixpkgs/trunk/; revision=28806
 2011-08-25 01:00:13 +00:00
Shea Levy
5b3aa1f8ec openjdk: Remove extraneous whitespace 
svn path=/nixpkgs/trunk/; revision=28804
 2011-08-24 22:52:16 +00:00
Peter Simons
c9914f5559 haskell-hackage-db: added version 1.0 
svn path=/nixpkgs/trunk/; revision=28803
 2011-08-24 22:04:38 +00:00
Yury G. Kudryashov
c19d8396e4 Merge with udev-173 (trivial) 
svn path=/nixpkgs/trunk/; revision=28800
 2011-08-24 21:23:53 +00:00
Yury G. Kudryashov
7101fbff89 There is no pkgs.xfce4 
svn path=/nixpkgs/trunk/; revision=28798
 2011-08-24 20:41:02 +00:00
Ludovic Courtès
4a4aad4e6f GNU dbm 1.9.1. 
svn path=/nixpkgs/trunk/; revision=28791
 2011-08-24 17:00:17 +00:00
Lluís Batlle i Rossell
b58016b007 Updating the nongnu ghostscript 
svn path=/nixpkgs/trunk/; revision=28790
 2011-08-24 15:44:54 +00:00
Ludovic Courtès
60f13a191a Add dvgrab. 
svn path=/nixpkgs/trunk/; revision=28789
 2011-08-24 14:55:48 +00:00
Lluís Batlle i Rossell
a9ce52e01a Updating dos2unix, that now includes also unix2dos. 
svn path=/nixpkgs/trunk/; revision=28788
 2011-08-24 07:48:02 +00:00
Michael Raskin
e9a5a5d819 Fix xmacro build 
svn path=/nixpkgs/trunk/; revision=28787
 2011-08-23 17:52:05 +00:00
Yury G. Kudryashov
1e981a7deb fetchmtn: move logic to default args 
svn path=/nixpkgs/trunk/; revision=28786
 2011-08-23 17:45:40 +00:00
Peter Simons
08605870da Renamed 'radeonJuniperPfp' to 'radeonJuniper' and added all related blobs into one expression. 
svn path=/nixpkgs/trunk/; revision=28785
 2011-08-23 13:24:44 +00:00
Peter Simons
14e8450a30 haskell-cabal2nix: updated to version 1.12 
svn path=/nixpkgs/trunk/; revision=28784
 2011-08-23 13:18:32 +00:00
Peter Simons
e5a3306880 haskell-nixos-types: added version 1.0 
svn path=/nixpkgs/trunk/; revision=28783
 2011-08-23 13:18:28 +00:00
Peter Simons
0d28dfe2d6 pkgs/os-specific/linux/firmware/radeon-*/default.nix: these derivations don't need to be recursive 
svn path=/nixpkgs/trunk/; revision=28782
 2011-08-23 12:25:31 +00:00
Peter Simons
ad090c5877 Ooops, forgot to add this file prior to committing. 
svn path=/nixpkgs/trunk/; revision=28781
 2011-08-23 12:16:41 +00:00
Peter Simons
35261ff739 all-packages.nix: added radeon-juniper-pfp firmware for ATI cards 
svn path=/nixpkgs/trunk/; revision=28780
 2011-08-23 12:15:04 +00:00
Eelco Dolstra
f3d7bcc851 * Fix description. 
svn path=/nixpkgs/trunk/; revision=28779
 2011-08-23 12:10:08 +00:00
Eelco Dolstra
8c37d99fd9 * Forgot to commit. 
svn path=/nixpkgs/trunk/; revision=28778
 2011-08-23 12:08:21 +00:00
Peter Simons
b801018864 haskell-pandoc: enable highlighting support 
svn path=/nixpkgs/trunk/; revision=28777
 2011-08-23 12:04:29 +00:00
Marco Maggesi
495bae62a0 (Ooops!) Remove debug instruction in fdupes derivation 
svn path=/nixpkgs/trunk/; revision=28776
 2011-08-23 11:59:31 +00:00
Marco Maggesi
42469337d7 Update fdupes to version 1.50-RC2 
svn path=/nixpkgs/trunk/; revision=28775
 2011-08-23 11:52:38 +00:00
Peter Simons
058055fd16 haskell-packages: normalize all lists to state their elements in alphabetical order 
svn path=/nixpkgs/trunk/; revision=28774
 2011-08-23 11:00:05 +00:00
Peter Simons
97de61b5b1 pkgs/top-level/all-packages.nix: strip trailing whitespace 
svn path=/nixpkgs/trunk/; revision=28773
 2011-08-23 10:35:53 +00:00
Peter Simons
c8ae7cc8bb Updated build expressions for the current version of cabal.nix. 
svn path=/nixpkgs/trunk/; revision=28772
 2011-08-23 10:35:49 +00:00
Peter Simons
1972e6f6dc git-annex: updated to version 3.20110819 
svn path=/nixpkgs/trunk/; revision=28771
 2011-08-23 08:52:06 +00:00
Peter Simons
1e83b9c896 haskell-enumerator: updated to version 0.4.14 
svn path=/nixpkgs/trunk/; revision=28770
 2011-08-23 08:45:08 +00:00
Peter Simons
a2e3aad4cf haskell-cmdlib: updated to version 0.3.3 
svn path=/nixpkgs/trunk/; revision=28769
 2011-08-23 08:45:04 +00:00
Peter Simons
1c79ecc5af git2cl: added meta data for the package and updated the build to take 
advantage of stdenv features such as automatic updating of the shebang
path to perl, etc.

svn path=/nixpkgs/trunk/; revision=28768
 2011-08-23 08:44:59 +00:00
Michael Raskin
716df38be1 Updating avr-gcc and avr-libc (old link is inaccessible) 
svn path=/nixpkgs/trunk/; revision=28767
 2011-08-23 07:56:34 +00:00
Michael Raskin
c44359b973 Updating avrdude 
svn path=/nixpkgs/trunk/; revision=28766
 2011-08-23 03:23:34 +00:00
Shea Levy
019cc6614a linux-3.1.nix: Bump to 3.1-rc3 
svn path=/nixpkgs/trunk/; revision=28765
 2011-08-23 02:34:21 +00:00
Eelco Dolstra
8a70005921 * Updated xfce4-power-manager. 
svn path=/nixpkgs/trunk/; revision=28763
 2011-08-22 23:08:42 +00:00
Eelco Dolstra
ffe1af714d * Xfce 4.8. 
svn path=/nixpkgs/trunk/; revision=28761
 2011-08-22 22:51:23 +00:00
David Guibert
19b376cc41 git-subtree: 0.3 -> 0.4 
svn path=/nixpkgs/trunk/; revision=28760
 2011-08-22 20:26:15 +00:00
David Guibert
c716ac66e0 add jbrout, a photo manager using IPTC keywords/EXIF 
svn path=/nixpkgs/trunk/; revision=28759
 2011-08-22 20:26:11 +00:00
Peter Simons
600e2c0927 haskell-attoparsec: updated to version 0.9.1.2 
svn path=/nixpkgs/trunk/; revision=28758
 2011-08-22 19:46:09 +00:00
Eelco Dolstra
1475781b19 * Rename xfce-4 to xfce-4.6 in preparation for Xfce 4.8. 
svn path=/nixpkgs/trunk/; revision=28757
 2011-08-22 17:40:07 +00:00
Ludovic Courtès
f62b53ee19 GNU Xnee 3.10. 
svn path=/nixpkgs/trunk/; revision=28754
 2011-08-22 17:38:53 +00:00
Ludovic Courtès
152a2612ae GNU Parallel 20110822. 
svn path=/nixpkgs/trunk/; revision=28753
 2011-08-22 17:38:49 +00:00
Ludovic Courtès
097f8d1daa GnuPG 2.0.18. 
svn path=/nixpkgs/trunk/; revision=28752
 2011-08-22 17:38:45 +00:00
Ludovic Courtès
4b509b7eac GNU Xorriso 1.1.4. 
svn path=/nixpkgs/trunk/; revision=28751
 2011-08-22 17:38:37 +00:00
Ludovic Courtès
d0f60bf3a1 GNU MyServer 0.11. 
svn path=/nixpkgs/trunk/; revision=28750
 2011-08-22 17:38:33 +00:00
Ludovic Courtès
8c59f75a58 gnutls fix 
svn path=/nixpkgs/trunk/; revision=28749
 2011-08-22 17:38:29 +00:00
Ludovic Courtès
fc006a3564 GNU SIP Witch 1.1.1. 
svn path=/nixpkgs/trunk/; revision=28748
 2011-08-22 17:38:24 +00:00
Ludovic Courtès
d12e31b445 GNU uCommon C++ 5.0.5. 
svn path=/nixpkgs/trunk/; revision=28747
 2011-08-22 17:38:20 +00:00
Ludovic Courtès
56c2fe0c56 GNU Nettle 2.2. 
svn path=/nixpkgs/trunk/; revision=28746
 2011-08-22 17:38:16 +00:00
Ludovic Courtès
a5ff05ebca GLPK 4.46. 
svn path=/nixpkgs/trunk/; revision=28745
 2011-08-22 17:38:12 +00:00
Ludovic Courtès
7a7be1202f GNU ccRTP 2.0.1. 
svn path=/nixpkgs/trunk/; revision=28744
 2011-08-22 17:38:08 +00:00
Ludovic Courtès
34a5ec9e66 GnuTLS 3.0.1. 
svn path=/nixpkgs/trunk/; revision=28743
 2011-08-22 17:38:04 +00:00
Ludovic Courtès
8fe3128e71 GNU Aspell 0.60.6.1. 
svn path=/nixpkgs/trunk/; revision=28742
 2011-08-22 17:37:59 +00:00
Eelco Dolstra
e12337604a * Remove unused dependency. 
svn path=/nixpkgs/trunk/; revision=28740
 2011-08-22 15:25:26 +00:00
Eelco Dolstra
62049ecfb1 * Added super. 
svn path=/nixpkgs/trunk/; revision=28739
 2011-08-22 15:24:24 +00:00
Peter Simons
b14a795d8f haskell-mwc-random: updated to version 0.10.0.1 
svn path=/nixpkgs/trunk/; revision=28738
 2011-08-22 12:20:31 +00:00
Peter Simons
d81cab0003 haskell-hledger-interest: updated to version 1.2 
svn path=/nixpkgs/trunk/; revision=28737
 2011-08-22 11:54:23 +00:00
Peter Simons
83acf410e9 haskell-cmdlib: cosmetic change 
svn path=/nixpkgs/trunk/; revision=28736
 2011-08-22 11:54:16 +00:00
Eelco Dolstra
b4ca59e17f * Polkit: look for ‘polkit-agent-helper-1’ in the right location (for 
NixOS, that is), i.e., /var/setuid-wrappers.

svn path=/nixpkgs/trunk/; revision=28733
 2011-08-22 11:45:51 +00:00
Michael Raskin
b23809b118 Adding Firefox 7.0beta1 - with a hack for Linux 3.0 build, but unlike 6.0 it does work afterwards 
svn path=/nixpkgs/trunk/; revision=28732
 2011-08-22 06:54:03 +00:00
Cillian de Roiste
694dbfe845 Adding csslint, this uses node as an interpreter. It detects problems in CSS files. 
svn path=/nixpkgs/trunk/; revision=28731
 2011-08-21 21:34:17 +00:00
Peter Simons
d34ffe6f3b haskell-cmdlib: added version 0.3.2.1 
svn path=/nixpkgs/trunk/; revision=28728
 2011-08-21 20:21:22 +00:00
Peter Simons
c8581b4b4e haskell-http-enumerator: updated to version 0.6.6 
svn path=/nixpkgs/trunk/; revision=28727
 2011-08-21 19:56:13 +00:00
Cillian de Roiste
2dd19f6d72 Updating node to version 0.5.4 
svn path=/nixpkgs/trunk/; revision=28726
 2011-08-21 19:42:55 +00:00
Eelco Dolstra
1317e5bdaa * Polkit updated to 0.102. 
svn path=/nixpkgs/trunk/; revision=28725
 2011-08-21 19:10:36 +00:00
Peter Simons
c67ce898cf pkgs/applications/office/hledger-interest: initial version 1.0 
svn path=/nixpkgs/trunk/; revision=28724
 2011-08-21 18:01:13 +00:00
Peter Simons
56477a99f5 haskell-AspectAG: updated to version 0.3.4.1 
svn path=/nixpkgs/trunk/; revision=28723
 2011-08-21 16:09:41 +00:00
Nicolas Pierron
2defa3e715 Follow Mozilla homepages migrations. (.com -> .org) 
svn path=/nixpkgs/trunk/; revision=28722
 2011-08-21 15:44:53 +00:00
Nicolas Pierron
0c3490e94a Gdb: Add --without-python to cygwin builds. 
svn path=/nixpkgs/trunk/; revision=28721
 2011-08-21 15:36:33 +00:00
Nicolas Pierron
4c8bbfe81b Restrict freeciv to linux platforms. 
svn path=/nixpkgs/trunk/; revision=28720
 2011-08-21 15:36:25 +00:00
Michael Raskin
27dc494095 Fix typo 
svn path=/nixpkgs/trunk/; revision=28719
 2011-08-21 10:29:01 +00:00
Marco Maggesi
a9d2f34301 Update HOL Light to release 102 
svn path=/nixpkgs/trunk/; revision=28718
 2011-08-21 08:41:22 +00:00
Eelco Dolstra
0b99612c18 * Layout. 
svn path=/nixpkgs/trunk/; revision=28717
 2011-08-21 00:13:34 +00:00
Eelco Dolstra
631ba2a5f0 svn path=/nixpkgs/trunk/; revision=28716 2011-08-21 00:10:12 +00:00
Cillian de Roiste
d99e939015 Upgrading Kdenlive to 0.8 
svn path=/nixpkgs/trunk/; revision=28715
 2011-08-20 23:26:59 +00:00