Eelco Dolstra
6437e2541a
Remove numerous failing kernel packages from Hydra
...
http://hydra.nixos.org/eval/1149989?filter=linuxPackages
2014-08-30 23:20:57 +02:00
Domen Kožar
11345b7844
remove icecat3
2014-08-25 09:52:38 +02:00
Eelco Dolstra
2478e77d8a
Make the manual release-critical
2014-08-24 18:53:29 +02:00
Eelco Dolstra
438b9c543d
Nixpkgs manual: Add a Nix expression to build
2014-08-24 11:03:55 +02:00
Charles Strahan
5ea8497933
get xorg/x11 working on Darwin
2014-08-12 20:40:57 -04:00
Luca Bruno
b331ae33d7
Make platforms.allBut accept a list rather than a single platform
2014-08-09 12:31:33 +02:00
Eelco Dolstra
8a7f3c3618
Mark a bunch of packages as broken or not supported on Darwin
2014-08-08 17:59:02 +02:00
Bjørn Forsman
a1a2851409
Fix tarball job
...
gcc42 was removed in commit 5add082ab8
("gcc-4.2: Remove") but there are still some references to it. Remove
those references to fix Hydra tarball job.
2014-07-23 23:00:18 +02:00
Eelco Dolstra
5c5f115603
firefox: Build without xulrunner
...
Fixes #2950 .
2014-07-23 17:28:36 +02:00
Eelco Dolstra
3ef40e5004
emacs: Remove 23.x
2014-07-22 13:50:52 +02:00
Eelco Dolstra
973c9abdbe
Fix info command
...
The "info" command has been broken on NixOS since
457fdb3842
(proving that nobody uses
info).
2014-07-08 15:19:08 +02:00
Eelco Dolstra
784503864b
Enable the xf86-video-modesetting driver
2014-05-21 15:55:50 +02:00
Eelco Dolstra
2ca913c509
Add some packages to the channel
2014-04-28 18:34:23 +02:00
Eelco Dolstra
d304b277bd
Silence some Hydra evaluation warnings
2014-04-24 15:40:55 +02:00
Vladimír Čunát
a35d4a9d4e
unstable job: don't depend on glib-tested yet (fails)
2014-02-22 10:38:13 +01:00
Vladimír Čunát
dcf6cbf5b3
glib: add -tested variant, also to the unstable job
...
Replaces #1753 .
2014-02-18 20:27:23 +01:00
Vladimír Čunát
07ab75205c
release: fix automake evaluation, broken in 5888f27c
2014-02-02 12:09:58 +01:00
Eelco Dolstra
1a68ee7deb
Disable FreeBSD builds
2014-01-28 16:13:16 +01:00
Vladimír Čunát
3f9388436b
tarball/release: change gnat44 (removed) into gnat
2014-01-18 17:06:56 +01:00
Vladimír Čunát
9443129b08
Merge master into stdenv-updates
...
Conflicts:
pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Peter Simons
ad80939299
pkgs/top-level/release.nix: build the ghc 7.2.2 binary
2013-12-29 12:26:05 +01:00
Peter Simons
486e7736df
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Domen Kožar
c1df906704
vlc: specify meta.platforms
2013-12-08 19:19:11 +01:00
Peter Simons
c32bf83301
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/interpreters/perl/5.16/default.nix
pkgs/tools/networking/curl/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-python.nix
pkgs/top-level/release-small.nix
pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Eelco Dolstra
58af4fb11e
Update some more platforms
2013-11-06 10:58:20 +01:00
Eelco Dolstra
06f4398b46
Remove broken and obsolete versions of gcj and ghdl
2013-11-04 21:11:00 +01:00
Vladimír Čunát
b60d44a00a
release: remove gcjXX references to fix tarball
2013-10-30 22:04:34 +01:00
Peter Simons
ac5d5297dd
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-10-02 22:44:12 +02:00
Eelco Dolstra
8a182718ca
splashutils: Remove
2013-09-26 18:03:43 +02:00
Peter Simons
9407832de4
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Eelco Dolstra
095fc0ebaa
nix-repl: Add
2013-09-17 11:26:12 +02:00
Peter Simons
6451264e63
Drop obsolete versions of flex: we only used the latest one, 2.5.35.
2013-09-09 10:39:56 +02:00
Eelco Dolstra
68469ca342
releaseTools.aggregate: Rename ‘members’ to ‘constituents’
2013-08-15 02:29:08 +02:00
Vladimír Čunát
87444bc281
fix tarball after 541661
2013-07-17 08:16:24 +02:00
Eelco Dolstra
896da1bf8a
Fix reference to firefox21
2013-06-26 11:24:10 +02:00
Peter Simons
a5a74c9c44
release.nix: remove emacs-ecb from nixos-tarball
...
ecb mode is a part of Emacs and no longer exists as a separate package in Nixpkgs.
2013-06-11 11:05:42 +02:00
Eelco Dolstra
ebe6b96698
firefox: Update to 21.0
...
Only problem was that the chrome resources were not in the right place
(and you only see that by running with the -jsconsole flag).
2013-06-06 13:07:54 +02:00
Peter Simons
9ebb5ad7a6
release.nix, release-small.nix: build atlas library on Hydra
...
This puppy takes several hours to compile, being able to download that
package in binary form is really valuable.
2013-06-02 09:41:32 +02:00
Lluís Batlle i Rossell
059af7e759
Revert "Firefox 20 reference in release.nix. Fixing."
...
This reverts commit 19dd9dc877
.
2013-05-31 20:44:49 +02:00
Lluís Batlle i Rossell
19dd9dc877
Firefox 20 reference in release.nix. Fixing.
2013-05-30 20:13:41 +02:00
Peter Simons
6039e98991
pkgs/top-level/release.nix: build GHC 7.6.3 instead of 7.6.2
2013-05-30 12:33:43 +02:00
Eelco Dolstra
e3c641b39a
mercurial: Update to 2.6.1
...
Also, set a default for web.cacerts so that the system certificates on
NixOS are used.
2013-05-15 13:15:53 +02:00
Eelco Dolstra
534c5c5d9c
e2fsprogs: Update to 1.42.7
2013-05-11 18:09:05 +02:00
Eelco Dolstra
4d5ba15ea9
openssh: Update to 6.2p1
2013-04-12 15:27:13 +02:00
Eelco Dolstra
8fc1fe9f6b
socat: Update to 1.7.2.1
...
CVE-2012-0219
2013-04-12 15:01:01 +02:00
Eelco Dolstra
bfa358c76e
firefox: Update to 20.0
2013-04-09 18:00:26 +02:00
Lluís Batlle i Rossell
b10ab7a19a
tinycc: updating it to 0.9.26
...
I simplified the expression a bit. And I renamed it to 'tcc'.
I think everyone calls it tcc.
2013-04-01 12:50:45 +02:00
Eelco Dolstra
c5f45036e6
release-lib.nix: Make the set of supported platforms an argument
2013-03-26 13:12:25 +01:00
Eelco Dolstra
bcc14c4d3c
Add an "unstable" aggregate to replace the "unstable" view
...
Views are obsolete, aggregates are the declarative replacement.
2013-03-26 11:59:00 +01:00
Eelco Dolstra
cffc126e14
Make Nixpkgs jobs unique
...
That is, there are now distinct jobs like ‘coreutils.x86_64-linux’ and
‘coreutils.x86_64-darwin’, rather than a single job ‘coreutils’ with
multiple builds. This means that testing a job is simpler:
$ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
See https://github.com/NixOS/hydra/issues/60 for the motivation.
2013-03-26 11:58:59 +01:00
Peter Simons
e0b0be9fb3
pkgs/top-level/release.nix: enable Hydra builds of GHC versions 6.10.4, 6.12.3, 7.0.4, 7.4.2, and 7.6.2
...
Ensure that binary packages of the compiler itself are available from Hydra.
2013-03-14 19:25:27 +01:00
Shea Levy
1670244f80
Merge branch 'vlada/xfce-notg' of git://github.com/vcunat/nixpkgs
...
This branch refactors xfce and updates it to 4.10. I had been hoping to
find someone besides Vlada to test this (I don't use xfce), but no one
has come forward yet in 2 weeks so if this breaks something they can
make an issue or fix it. It all looks good by inspection.
2013-03-08 17:03:22 -05:00
Shea Levy
f2c79c4542
Remove some references to non-existent packages
2013-03-08 16:36:59 -05:00
Peter Simons
5f32207dfc
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-02-24 19:27:08 +01:00
Eelco Dolstra
95ca031be9
firefox: Update to 19.0
2013-02-21 17:45:42 +01:00
Vladimír Čunát
e979d7ad2f
vlada/xfce
...
Major Xfce refactoring, also adding versions 4.10.*
Signed-off-by: Vladimír Čunát <vcunat@gmail.com>
2013-02-21 12:16:51 +01:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Eelco Dolstra
6dba65b51f
openoffice: Remove
...
It's superseded by LibreOffice and doesn't build anymore.
2013-01-29 12:43:53 +01:00
Eelco Dolstra
e0afec2edc
pwdutils: Remove
...
This package no longer builds and is obsolete (use ‘shadow’ instead).
2013-01-28 17:58:43 +01:00
Eelco Dolstra
d2b76e68d0
gcc-4.1: Remove
...
No longer used and doesn't build.
2013-01-28 17:19:03 +01:00
Eelco Dolstra
0a47a28f1d
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-01-22 23:23:53 +01:00
Eelco Dolstra
edbaa80bc1
Remove Firefox 17
2013-01-21 14:23:01 +01:00
Eelco Dolstra
eeda226b02
Merge branch 'master' into systemd
2013-01-15 12:11:07 +01:00
Peter Simons
b33ad366a1
Merge branch 'master' into stdenv-updates.
2013-01-11 15:46:10 +01:00
Lluís Batlle i Rossell
fdf11fdb7e
firefox18: adding it to release.nix
2013-01-09 19:45:56 +01:00
Eelco Dolstra
c6c1bc6b0f
Merge branch 'master' into systemd
2013-01-07 00:34:25 +01:00
Eelco Dolstra
1e9e2cb2bb
samba, imagemagick: Add missing meta info
2013-01-06 22:31:16 +01:00
Eelco Dolstra
8116fd9341
consolekit: Remove
...
This package is obsolete with systemd.
2012-12-13 11:30:18 +01:00
Eelco Dolstra
5e256ccc88
Merge remote-tracking branch 'origin/master' into stdenv-updates
2012-12-04 17:12:35 +01:00
Eelco Dolstra
012a838ea2
Remove Firefox 16
2012-11-30 11:33:44 +01:00
Mathijs Kwik
ef51f327fe
nxml-mode: remove from release as well
2012-11-23 19:59:19 +01:00
Eelco Dolstra
d4e3064669
firefox: Add 17.0
2012-11-23 16:41:41 +01:00
Eelco Dolstra
c9baa28fef
Remove Firefox 15
2012-11-23 16:41:41 +01:00
Peter Simons
f67d5a9a39
Merge branch 'master' into stdenv-updates.
...
Conflicts have been resolved in:
pkgs/tools/misc/file/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Eelco Dolstra
56cee6fe5c
Make Firefox 16 the default
2012-10-23 15:35:48 +02:00
Eelco Dolstra
5af277bbd1
Merge remote-tracking branch 'origin/master' into x-updates
2012-10-15 12:16:58 -04:00
Lluís Batlle i Rossell
900ffd2d00
release: making hydra build firefox16.
2012-10-13 12:19:58 +02:00
Eelco Dolstra
b78256fbd7
Merge remote-tracking branch 'origin/master' into x-updates
2012-10-01 11:43:43 -04:00
Eelco Dolstra
745cb58e4e
Doh
2012-09-29 14:40:56 -04:00
Eelco Dolstra
14310ed2c8
libxslt: Update to 1.1.27
2012-09-28 17:44:38 -04:00
Eelco Dolstra
c7658cf9b0
libxml2: Update to 2.9.0
2012-09-28 17:44:38 -04:00
Eelco Dolstra
2ca9fc3a32
Make Firefox 15 the default (for realz this time)
2012-09-26 17:29:07 -04:00
Eelco Dolstra
0874615fcc
Remove User Mode Linux
...
It hasn't built in a long time and it's obsolete IMHO.
2012-09-21 13:32:37 -04:00
Peter Simons
d5677fe6c7
stdenv-updates: merge updates from 'master' branch
2012-09-11 16:48:41 +02:00
Lluís Batlle i Rossell
724451668c
firefox15: trying another way of telling hydra to build it
2012-09-02 10:45:16 +02:00
Mathijs Kwik
48d98bd582
gimp28 should probably be gimp_2_8
2012-08-22 17:49:56 +02:00
Michael Raskin
559f5be097
release.nix: use the freshest release GIMP version (2.8.0)
2012-08-22 13:08:49 +04:00
Lluís Batlle i Rossell
d8fbcb7903
release: Disabling hydra builds of now non-existant bison versions
...
It breaks the evaluation of stdenv-updates by hydra.
2012-08-20 15:27:36 +02:00
Ludovic Courtès
240d2e9cfa
automake: remove versions 1.7 and 1.9
2012-07-07 11:27:29 +02: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
Eelco Dolstra
069604730b
* Work around some problems in tarball checks. Nix wants to open the
...
DB even in read-only mode. Should probably fix that. Also, "or" no
longer works like this because it's a keyword now.
svn path=/nixpkgs/trunk/; revision=34079
2012-05-13 19:10:57 +00:00
Eelco Dolstra
bf2d945a02
* Disable some failing builds on specific platforms.
...
svn path=/nixpkgs/trunk/; revision=34033
2012-05-09 21:10:12 +00:00
Eelco Dolstra
4520bb84f7
* Make mercurialFull available in the channel.
...
svn path=/nixpkgs/trunk/; revision=33972
2012-05-02 14:34:09 +00:00
Eelco Dolstra
48b2a26898
* Firefox 12.0.
...
svn path=/nixpkgs/trunk/; revision=33931
2012-04-26 13:25:20 +00:00
Eelco Dolstra
9f2068ac9b
* Don't build Boost on Cygwin. It takes way too long.
...
svn path=/nixpkgs/trunk/; revision=33648
2012-04-06 13:10:19 +00:00
Eelco Dolstra
b62900880a
* Fix the build of Task::Catalyst::Tutorial ( http://hydra.nixos.org/build/2307296 ).
...
svn path=/nixpkgs/trunk/; revision=33423
2012-03-26 11:38:49 +00:00
Eelco Dolstra
b449705587
* Firefox 11 (contributed by Kirill Elagin). Unfortunately it's not
...
called "Firefox" anymore when built without official branding.
Apparently that was a SNAFU in Firefox 10.
svn path=/nixpkgs/trunk/; revision=33319
2012-03-20 23:59:09 +00:00
Eelco Dolstra
626d364e37
* Build Bison 2.5.
...
svn path=/nixpkgs/trunk/; revision=33258
2012-03-19 13:49:39 +00:00
Mathijs Kwik
bd068d386e
completely removed gw6c. use gogoclient.
...
svn path=/nixpkgs/trunk/; revision=32989
2012-03-11 14:35:36 +00:00
Eelco Dolstra
6bc6c61f01
* hdparm updated to 9.39.
...
svn path=/nixpkgs/trunk/; revision=32963
2012-03-09 19:24:54 +00:00
Yury G. Kudryashov
57fd764a39
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Mathijs Kwik
0f81c6363f
gogoclient: added to release
...
svn path=/nixpkgs/trunk/; revision=32761
2012-03-04 12:28:50 +00:00
Eelco Dolstra
81fa68da99
svn path=/nixpkgs/branches/stdenv-updates/; revision=32386
2012-02-18 17:45:10 +00:00
Yury G. Kudryashov
c81f618a34
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32273
2012-02-14 14:33:10 +00:00
Yury G. Kudryashov
96c20f97b7
unzip: fix typo in meta
...
svn path=/nixpkgs/trunk/; revision=32272
2012-02-14 14:29:25 +00:00
Eelco Dolstra
9d9e33b98d
* Added Firefox 10.0. P.S. it seems that Firefox 10 no longer needs
...
--enable-official-branding to get a browser that calls itself
"Firefox". But I'll leave the flag in for the moment.
* Removed Firefox 8.0.
svn path=/nixpkgs/trunk/; revision=31984
2012-02-02 15:44:22 +00:00
Yury G. Kudryashov
71c28d0e33
Use meta.platforms
...
svn path=/nixpkgs/trunk/; revision=31909
2012-01-28 14:39:56 +00:00
Eelco Dolstra
63c643d072
* Firefox 9.0.
...
svn path=/nixpkgs/trunk/; revision=30985
2011-12-20 14:51:26 +00:00
Eelco Dolstra
327715f5df
* Remove missing packages.
...
svn path=/nixpkgs/trunk/; revision=30532
2011-11-22 18:09:33 +00:00
Eelco Dolstra
718a4ec1c5
svn path=/nixpkgs/trunk/; revision=30386
2011-11-11 02:28:12 +00:00
Yury G. Kudryashov
1ef1f01e13
Remove thunderbird2/3 from release.nix
...
svn path=/nixpkgs/trunk/; revision=29716
2011-10-08 11:53:18 +00:00
Yury G. Kudryashov
371cd8bc51
kde3: use meta.platforms
...
svn path=/nixpkgs/trunk/; revision=29596
2011-10-02 21:15:36 +00:00
Yury G. Kudryashov
9839a5d924
policykit: use meta.platforms
...
This makes it easier to remove policykit in the future
svn path=/nixpkgs/trunk/; revision=29594
2011-10-02 21:15:19 +00:00
Michael Raskin
8e02768459
Firefox 7.0 release
...
svn path=/nixpkgs/trunk/; revision=29544
2011-09-30 07:10:47 +00:00
Yury G. Kudryashov
e496b86594
Remove kde3.kcachegrind
...
Use kde4.kcachegrind instead.
svn path=/nixpkgs/trunk/; revision=29484
2011-09-25 22:56:48 +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
Yury G. Kudryashov
7101fbff89
There is no pkgs.xfce4
...
svn path=/nixpkgs/trunk/; revision=28798
2011-08-24 20:41:02 +00:00
Michael Raskin
a3a46ada24
Adding Firefox 6.0. Mozilla says it is seamless upgrade from 5.0, so I am trying not to change anything...
...
svn path=/nixpkgs/trunk/; revision=28625
2011-08-16 21:53:43 +00:00
Michael Raskin
d2dc7cece3
Firefox 4.0 was removed
...
svn path=/nixpkgs/trunk/; revision=28532
2011-08-13 13:27:07 +00:00
Andres Löh
01be205d66
Experimental: comment all Haskell stuff in release.nix.
...
svn path=/nixpkgs/trunk/; revision=28423
2011-08-09 11:21:41 +00:00
Andres Löh
9d98555410
Update release.nix w.r.t. ghc versions.
...
svn path=/nixpkgs/trunk/; revision=28189
2011-08-06 10:28:24 +00:00
Sander van der Burg
a0c03edcd9
Removed test stuff from MySQL + add to releases
...
svn path=/nixpkgs/trunk/; revision=28149
2011-08-04 11:58:49 +00:00
Sander van der Burg
f635aceb5b
Updated some meta information for the emulators I've tried recently. They all seem to work fine :-)
...
svn path=/nixpkgs/trunk/; revision=27905
2011-07-22 19:25:31 +00:00
Lluís Batlle i Rossell
46a1c81294
Make hydra build firefox 5
...
svn path=/nixpkgs/trunk/; revision=27560
2011-06-29 21:19:15 +00:00
Shea Levy
7550f92f9b
Add 2.6.37 and 2.6.38 to release.nix
...
svn path=/nixpkgs/trunk/; revision=26877
2011-04-18 17:07:59 +00:00
Ludovic Courtès
84b3e533de
Build older kernels.
...
svn path=/nixpkgs/trunk/; revision=26731
2011-04-07 09:22:11 +00:00
Eelco Dolstra
997a5c8ef3
* Revert r26507, which I assume was intented for the stdenv branch.
...
svn path=/nixpkgs/trunk/; revision=26550
2011-03-27 19:03:06 +00:00
Ludovic Courtès
446b09c477
Give less work to Hydra.
...
svn path=/nixpkgs/trunk/; revision=26507
2011-03-25 10:54:17 +00:00
Eelco Dolstra
f9ec20d6ec
svn path=/nixpkgs/trunk/; revision=26460
2011-03-22 14:30:13 +00:00
Eelco Dolstra
769c522df6
svn path=/nixpkgs/trunk/; revision=26458
2011-03-22 13:44:25 +00:00
Andres Löh
3e0ac9b040
Major Haskell packages overhaul.
...
Several changes, some highlights:
* Structure of haskell-packages.nix updated. It's now easier to
select different default versions of packages for different
versions of GHC.
* GHC 7.0.2 is now default.
* Haskell Platform 2011.2.0.0 has been added and is now default.
* Several packages have been updated
(gtk2hs, gitit, xmonad, darcs, ...).
* Some old packages have been removed.
svn path=/nixpkgs/trunk/; revision=26288
2011-03-12 17:28:15 +00:00
Andres Löh
9c416145b5
Changed ghc versions in release.nix.
...
svn path=/nixpkgs/trunk/; revision=26218
2011-03-09 08:50:50 +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
Michael Raskin
bf380c62f7
Remove monotone from all-packages.nix to see what it real meta.platforms should be
...
svn path=/nixpkgs/trunk/; revision=25503
2011-01-10 23:47:10 +00:00
Rob Vermaas
adeb63e4c2
remove aterm242fixes
...
svn path=/nixpkgs/trunk/; revision=25407
2011-01-05 09:42:56 +00:00
Michael Raskin
fb58f74d82
Updating from trunk again
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
2010-11-17 17:03:09 +00:00
Andres Löh
ad9d05d909
Version bump for leksah (plus dependencies). Now works with ghc-6.12.3.
...
svn path=/nixpkgs/trunk/; revision=24737
2010-11-17 14:48:12 +00:00
Andres Löh
b6c5e88b1a
No longer build darcs with ghc-6.10.4.
...
svn path=/nixpkgs/trunk/; revision=24711
2010-11-16 14:21:49 +00:00
Lluís Batlle i Rossell
8746de3ae8
Updating from trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
2010-11-11 22:18:14 +00:00
Eelco Dolstra
ce39b02f35
* Add xwininfo to the channel.
...
svn path=/nixpkgs/trunk/; revision=24590
2010-11-03 22:14:13 +00:00
Lluís Batlle i Rossell
6dc839d344
Merging from trunk. I resolved some conflicts; I hope that well.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Michael Raskin
ac19af507f
Adding Linux 2.6.36
...
svn path=/nixpkgs/trunk/; revision=24403
2010-10-21 12:28:14 +00:00
Eelco Dolstra
3ac4025945
* Add some packages to the channel.
...
svn path=/nixpkgs/trunk/; revision=24397
2010-10-21 11:18:30 +00:00
Eelco Dolstra
0fcf6e1f40
* Added xfce4-mixer. This requires gstreamer and gst-plugins-base.
...
* Allow gst-plugins-base to be built with a minimal set of dependencies
(to prevent dependency bloat in Xfce).
* Updated gstreamer.
svn path=/nixpkgs/trunk/; revision=24207
2010-10-10 22:34:48 +00:00
Lluís Batlle i Rossell
e7e103b8eb
Updating from trunk (to catch cron changes)
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24200
2010-10-10 11:44:28 +00:00
Eelco Dolstra
35014ba441
svn path=/nixpkgs/trunk/; revision=24190
2010-10-09 21:21:10 +00:00
Lluís Batlle i Rossell
fca582bff0
Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Yury G. Kudryashov
abbd67b2d5
Remove kde44 from release.nix. Will use meta.platforms
...
svn path=/nixpkgs/trunk/; revision=24087
2010-10-05 17:43:50 +00:00
Lluís Batlle i Rossell
cd4b54748a
Updating from trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Andres Löh
f6e3110b74
Preliminarily added ghc-7.0.1-rc1 and current HEAD.
...
svn path=/nixpkgs/trunk/; revision=23985
2010-09-28 13:48:22 +00:00
Lluís Batlle i Rossell
2c5de61327
Updating from trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
Eelco Dolstra
3b4c29781b
* Turn off obsolete kernels.
...
svn path=/nixpkgs/trunk/; revision=23722
2010-09-10 14:12:15 +00:00
Andres Löh
9534550af5
gitit should now work with ghc-6.12.3
...
svn path=/nixpkgs/trunk/; revision=23671
2010-09-07 13:11:21 +00:00
Ludovic Courtès
420adcd354
Remove another reference to attribute `guileLib'.
...
svn path=/nixpkgs/trunk/; revision=23659
2010-09-06 08:45:24 +00:00
Rob Vermaas
a7791cfd1b
disabled klib in stdenv branch because it seems to hang in buildfarm and produces logs > 1.5GB
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=23596
2010-09-02 07:56:11 +00:00
Andres Löh
6609f91e61
Fixing Haskell Platform attribute names in release.nix.
...
svn path=/nixpkgs/trunk/; revision=23569
2010-08-31 15:54:08 +00:00
Lluís Batlle i Rossell
9884d381c0
Tell hydra to build the kernels 2.6.34 and 2.6.35
...
svn path=/nixpkgs/trunk/; revision=23472
2010-08-26 20:53:10 +00:00
Rob Vermaas
9fa88c5291
added libxpdf and pdf2xml
...
svn path=/nixpkgs/trunk/; revision=23427
2010-08-25 14:25:51 +00:00
Ludovic Courtès
904c8cfa0a
Castle-Combat: Start fixing; rewrite using `buildPythonPackage'.
...
svn path=/nixpkgs/trunk/; revision=23225
2010-08-18 14:25:07 +00:00
Yury G. Kudryashov
83a87e9959
More meta.platforms
...
svn path=/nixpkgs/trunk/; revision=23168
2010-08-13 23:11:58 +00:00
Eelco Dolstra
f6baaeace8
* Add Xfce to the channel.
...
svn path=/nixpkgs/trunk/; revision=23081
2010-08-10 00:09:29 +00:00
Eelco Dolstra
49dd595e2d
* Add some missing X.org packages to the channel.
...
svn path=/nixpkgs/trunk/; revision=23025
2010-08-07 18:21:16 +00:00
Eelco Dolstra
5f8b8ae1d1
* Added weechat and updated xfce-terminal and vte. (From Graeme
...
Caldwell <graemercaldwell@gmail.com>.)
svn path=/nixpkgs/trunk/; revision=22965
2010-08-05 15:47:15 +00:00
Yury G. Kudryashov
75bc6a2f78
Inherit some metadata from kdelibs
...
svn path=/nixpkgs/trunk/; revision=22927
2010-08-03 13:11:58 +00:00
Yury G. Kudryashov
858ce6dfd9
Remove smbfsFuse from release.nix, use meta.platforms instead
...
svn path=/nixpkgs/trunk/; revision=22908
2010-08-02 21:43:53 +00:00
Andres Löh
5503148e05
Minor fix for release.nix.
...
svn path=/nixpkgs/trunk/; revision=22716
2010-07-22 18:55:32 +00:00
Andres Löh
73bee7da33
Switched the default version of ghc and Haskell Platform to 6.12.3 and 2010.2.0.0.
...
svn path=/nixpkgs/trunk/; revision=22715
2010-07-22 18:47:59 +00:00
Lluís Batlle i Rossell
134e944758
Making hydra build nixSqlite
...
svn path=/nixpkgs/trunk/; revision=22552
2010-07-09 17:30:22 +00:00
Sander van der Burg
6e9cc67a25
Added k3b-2.0.0 for KDE 4.X
...
svn path=/nixpkgs/trunk/; revision=22438
2010-07-01 15:00:46 +00:00
Yury G. Kudryashov
b39389560f
Add meta.platforms to qt4 and merkaartor
...
Should fix one of hydra evaluation errors
svn path=/nixpkgs/trunk/; revision=22360
2010-06-21 17:06:08 +00:00
Eelco Dolstra
dbf8d72080
* Remove builds of the aufs1 module for recent kernels.
...
svn path=/nixpkgs/trunk/; revision=22036
2010-05-28 09:23:51 +00:00
Yury G. Kudryashov
ea1953d744
Move gnupg to gnupg1 and gnupg2 to gnupg
...
Also add gnupg1-compatibility symlinks to gnupg2.
Most packages should be able to use gnupg2 instead of gnupg1.
svn path=/nixpkgs/trunk/; revision=21883
2010-05-19 20:58:47 +00:00
Peter Simons
9b48c69f85
pkgs/top-level/release.nix: enable haskellPlatform2010100 on Darwin
...
svn path=/nixpkgs/trunk/; revision=21447
2010-04-29 21:41:38 +00:00
Peter Simons
290bdb470a
pkgs/top-level/release.nix: drop trailing white space
...
svn path=/nixpkgs/trunk/; revision=21446
2010-04-29 21:41:33 +00:00
Peter Simons
995a603ec9
pkgs/top-level/release.nix: enable haskellPackages_ghc6104.haskellPlatform on Darwin
...
I'm pretty sure that the OpenGL/Mesa errors on Darwin have been fixed. I didn't
personally verify that this particular haskellPlatform version builds, though, I
just built the very latest version with GHC 6.12.2, albeit successfully. If it
so happens that this change reveals any further unexpected problems on MacOS X,
please let me know about it.
svn path=/nixpkgs/trunk/; revision=21445
2010-04-29 21:41:28 +00:00
Andres Löh
f892a8efaa
Darcs updated to 2.4.1; now ghc-6.12-compatible.
...
svn path=/nixpkgs/trunk/; revision=21355
2010-04-27 19:51:37 +00:00
Andres Löh
a2b68a97c5
Added gitit to release.nix
...
svn path=/nixpkgs/trunk/; revision=21312
2010-04-26 06:55:02 +00:00
Andres Löh
70c389a2ad
2010-version of platform should only be used with ghc-6.12.*
...
svn path=/nixpkgs/trunk/; revision=21306
2010-04-25 18:26:01 +00:00
Andres Löh
b48dfda990
Added ghc-6.12.2.
...
svn path=/nixpkgs/trunk/; revision=21303
2010-04-25 17:27:21 +00:00
Lluís Batlle i Rossell
d64fc6e17c
Commenting at release.nix how hydra will evaluate it.
...
svn path=/nixpkgs/trunk/; revision=21167
2010-04-19 14:21:52 +00:00
Eelco Dolstra
10fdd4d230
* Updated audacious to 2.3. Combined audacious and audacious-plugins
...
into one derivation so that it works out of the box - no need to set
symlinks to the plugins in ~/.local/share/audacious. There is
really no reason to install those packages separately anyway, as
audacious is useless without the plugins package.
svn path=/nixpkgs/trunk/; revision=21137
2010-04-16 19:26:15 +00:00
Yury G. Kudryashov
62bcea0382
Remove linuxwacom: it is not compatible with new xserver
...
svn path=/nixpkgs/trunk/; revision=21016
2010-04-11 21:03:43 +00:00
Yury G. Kudryashov
f25c68f01a
Remove old kde packages
...
svn path=/nixpkgs/trunk/; revision=21011
2010-04-11 15:50:41 +00:00
Yury G. Kudryashov
94de02e04e
Move kde3 packages into kde3 in release.nix
...
svn path=/nixpkgs/trunk/; revision=20911
2010-04-01 13:46:07 +00:00
Ludovic Courtès
295d249274
Try building `gitFull'.
...
svn path=/nixpkgs/trunk/; revision=20621
2010-03-14 22:11:36 +00:00
Rob Vermaas
b44af59afb
separate cross builds in separate release expression, will add extra jobset
...
svn path=/nixpkgs/trunk/; revision=20484
2010-03-09 10:33:31 +00:00
Eelco Dolstra
596b70a208
* The scheduling priority for the nixpkgs trunk should be higher than
...
the stdenv branch.
svn path=/nixpkgs/trunk/; revision=20470
2010-03-08 10:29:53 +00:00
Lluís Batlle i Rossell
997723ec9b
Trying to make nixUnstable cross-build.
...
It fails because it builds bin2c for the host system, instead of the build system.
I will wait for a fix upstream.
svn path=/nixpkgs/trunk/; revision=20445
2010-03-05 23:22:36 +00:00
Rob Vermaas
dfca3bc039
set meta.platforms to get rid of hydra evaluation errors (assertions)
...
svn path=/nixpkgs/trunk/; revision=20301
2010-03-01 12:23:49 +00:00
Lluís Batlle i Rossell
18f667a954
I missed in release.nix the sheevaplug platform.
...
svn path=/nixpkgs/trunk/; revision=20282
2010-02-27 22:10:36 +00:00
Lluís Batlle i Rossell
89842675cb
Adding more cross build jobs for hydra. Kernels, gdb, mipsel, ultrasparc.
...
svn path=/nixpkgs/trunk/; revision=20281
2010-02-27 21:56:27 +00:00
Lluís Batlle i Rossell
b1b7266aa3
After some testing with an ultrasparc cross-compiler:
...
Updating the cross-build expressions, adding some flexibility.
Updated the linux headers used cross building, as 2.6.28 had bugs on endianness in
sparc64.
There were, as usual some bugs in gcc. Maybe not many make a cross compiler to
ultrasparc.
For the record, I could build an ultrasparc kernel with this base nix:
import /etc/nixos/nixpkgs/default.nix # The root nixpkgs default.nix
{
crossSystem = {
config = "sparc64-unknown-linux";
bigEndian = true;
arch = "sparc64";
float = "soft";
withTLS = true;
cpu = "ultrasparc";
};
config = pkgs: {
packageOverrides = pkgs : {
platform = {
name = "sparc64";
kernelHeadersBaseConfig = "sparc64_defconfig";
kernelBaseConfig = "sparc64_defconfig";
kernelArch = "sparc";
kernelAutoModules = false;
kernelTarget = "zImage";
uboot = null;
};
};
};
}
Although it did not boot directly in qemu-system-sparc64:
[sparc64] Kernel already loaded
Unhandled Exception 0x0000000000000020
PC = 0x0000000000404000 NPC = 0x0000000000404004
svn path=/nixpkgs/trunk/; revision=20269
2010-02-27 00:52:48 +00:00
Eelco Dolstra
e04c9a452a
* Linux 2.6.33.
...
svn path=/nixpkgs/trunk/; revision=20246
2010-02-25 12:40:03 +00:00
Eelco Dolstra
70742ef6b1
svn path=/nixpkgs/trunk/; revision=20190
2010-02-23 12:49:14 +00:00
Lluís Batlle i Rossell
7dc6cf1f03
Removing crossArm.uboot from the hydra builds - it now depends on a platform being set.
...
svn path=/nixpkgs/trunk/; revision=20131
2010-02-19 15:48:07 +00:00
Michael Raskin
2fb7879a19
Upstart 0.6 is just upstart now
...
svn path=/nixpkgs/trunk/; revision=20067
2010-02-17 06:53:08 +00:00
Sander van der Burg
292ebe636f
Added KDE 4.4.x packages to the buildfarm
...
svn path=/nixpkgs/trunk/; revision=20043
2010-02-16 10:55:56 +00:00
Eelco Dolstra
1d2c0eea75
svn path=/nixpkgs/trunk/; revision=19991
2010-02-14 16:21:42 +00:00
Eelco Dolstra
d8c6bb130c
* Sync with the trunk one last time.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=19849
2010-02-05 23:06:36 +00:00
Eelco Dolstra
631ea03875
* Fix / disable some packages that give evaluation errors in Hydra.
...
svn path=/nixpkgs/trunk/; revision=19833
2010-02-05 14:13:25 +00:00
Eelco Dolstra
e9ff6517b9
svn path=/nixpkgs/branches/stdenv-updates/; revision=19711
2010-01-27 14:35:56 +00:00
Eelco Dolstra
566c9ffdc2
* Disable some packages that don't evaluate.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=19666
2010-01-26 14:31:23 +00:00
Lluís Batlle i Rossell
bcba809460
Updating from trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
2010-01-25 18:52:07 +00:00
Lluís Batlle i Rossell
d8900100e5
Allowing linux-headers to be built for cross-compilations on non-linux platforms.
...
Updating the list of hydra cross-build jobs to something more ambitious.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19628
2010-01-23 09:41:50 +00:00
Lluís Batlle i Rossell
38c0a2efbd
Test how cross-compilation works on non-linux native platforms.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=19627
2010-01-23 00:29:38 +00:00
Lluís Batlle i Rossell
d9dd893969
Adding cross-build hydra jobs a bit more generic than it was.
...
There is still a lot of room for improvement on how to write the cross build related
jobs for hydra. Step by step.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19621
2010-01-22 18:51:18 +00:00
Lluís Batlle i Rossell
94ed14ccef
Trying to add a cross build to hydra: bisonSheevaplug
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=19614
2010-01-22 14:59:27 +00:00
Eelco Dolstra
c7194fe7cf
* Added Firefox 3.6. It's not entirely stable yet though. In
...
particular it segfaults with the `-P' option.
svn path=/nixpkgs/trunk/; revision=19606
2010-01-21 22:23:59 +00:00
Eelco Dolstra
b8f106abd7
* Throw away some old versions of Firefox.
...
svn path=/nixpkgs/trunk/; revision=19604
2010-01-21 21:14:22 +00:00
Eelco Dolstra
cdf8259bb3
svn path=/nixpkgs/trunk/; revision=19588
2010-01-21 07:39:36 +00:00
Rob Vermaas
0577bc6bf1
add grub2 to channel
...
svn path=/nixpkgs/trunk/; revision=19558
2010-01-20 09:39:08 +00:00
Ludovic Courtès
7eadcd46a0
Build `gitFull'.
...
svn path=/nixpkgs/trunk/; revision=19528
2010-01-18 17:22:58 +00:00
Lluís Batlle i Rossell
bfbaa73706
Making 'release.nix' point to linuxPackages, and not to kernelPackages (the new
...
linux naming in stdenv-updates)
svn path=/nixpkgs/branches/stdenv-updates/; revision=19506
2010-01-17 22:09:16 +00:00
Lluís Batlle i Rossell
9183f21f7e
Merging from trunk.
...
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Rob Vermaas
e78c7a7189
build qemu_kvm in buildfarm
...
svn path=/nixpkgs/trunk/; revision=19373
2010-01-12 13:23:21 +00:00
Andres Löh
2a95fb6e96
Add ghc-6.12.1 to release.nix.
...
svn path=/nixpkgs/trunk/; revision=19363
2010-01-12 09:21:53 +00:00
Lluís Batlle i Rossell
d4be60ad25
Adding 'wicd' to be built by hydra.
...
svn path=/nixpkgs/trunk/; revision=19344
2010-01-10 22:02:09 +00:00
Eelco Dolstra
24a6975593
svn path=/nixpkgs/trunk/; revision=19201
2010-01-04 10:49:57 +00:00
Eelco Dolstra
05fce85edc
* Thunderbird 3.0. It doesn't use the Xulrunner package, as building
...
against an external Xulrunner seems to be unsupported currently.
svn path=/nixpkgs/trunk/; revision=19169
2010-01-02 13:21:50 +00:00
Lluís Batlle i Rossell
d864771e26
Updating from trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=19139
2009-12-28 11:40:34 +00:00
Armijn Hemel
c11b395003
build Qt 4.6 on Linux
...
svn path=/nixpkgs/trunk/; revision=19106
2009-12-25 10:59:57 +00:00
Lluís Batlle i Rossell
0d949c6161
Adding gnat44 and ghdl to release.nix. I hope that will make hydra build them.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=19076
2009-12-22 09:20:43 +00:00
Lluís Batlle i Rossell
5bae851b1e
Merging from trunk. I had to give away some structure to build the native
...
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
2009-12-19 11:14:16 +00:00
Eelco Dolstra
963a0f8216
* Lower the priority of the stdenv branch.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=19033
2009-12-18 12:33:12 +00:00
Eelco Dolstra
6a3a485f04
* Build 2.6.32 in Hydra.
...
svn path=/nixpkgs/trunk/; revision=19024
2009-12-18 10:13:57 +00:00
Eelco Dolstra
fb6d227127
* Merged the kernel-config branch.
...
svn path=/nixpkgs/trunk/; revision=19022
2009-12-18 10:04:23 +00:00
Rob Vermaas
76038fbbf2
build mysql 5.1.41 in buildfarm
...
svn path=/nixpkgs/trunk/; revision=19018
2009-12-17 19:07:00 +00:00
Michael Raskin
404f029dfe
Use dmtx in-package platform set
...
svn path=/nixpkgs/trunk/; revision=18961
2009-12-15 12:07:53 +00:00
Eelco Dolstra
00c641d336
* Use the kernel config generator for Linux 2.6.28.
...
* Get rid of Linux 2.6.20 and 2.6.26 (the former was only used for
building UML).
svn path=/nixpkgs/branches/kernel-config/; revision=18945
2009-12-14 18:34:46 +00:00
Rob Vermaas
d2c7ef9524
svn path=/nixpkgs/trunk/; revision=18830
2009-12-07 14:56:48 +00:00
Rob Vermaas
da0863d21f
build stratego-shell for darwin
...
svn path=/nixpkgs/trunk/; revision=18829
2009-12-07 14:26:24 +00:00
Rob Vermaas
edca11fec6
svn path=/nixpkgs/trunk/; revision=18678
2009-11-27 20:24:55 +00:00
Eelco Dolstra
11c3e92738
* Bring back Emacs 22 by request from Ludovic.
...
svn path=/nixpkgs/trunk/; revision=18529
2009-11-22 16:29:15 +00:00
Eelco Dolstra
58f543f19f
* Remove some old Emacs versions.
...
svn path=/nixpkgs/trunk/; revision=18470
2009-11-19 17:36:43 +00:00
Rob Vermaas
f2f5176551
add static variant of sdf
...
svn path=/nixpkgs/trunk/; revision=18308
2009-11-09 09:57:59 +00:00
Rob Vermaas
28d59537c5
add static variant of sdf
...
svn path=/nixpkgs/trunk/; revision=18307
2009-11-09 09:56:06 +00:00
Eelco Dolstra
2b11697d1a
svn path=/nixpkgs/trunk/; revision=18238
2009-11-07 01:26:04 +00:00
Michael Raskin
159dc0e0cb
Increase robustness of tryEval use a bit
...
svn path=/nixpkgs/trunk/; revision=18200
2009-11-06 12:27:56 +00:00
Michael Raskin
3b273b945a
Build 2.6.31-zen-stable kernels
...
svn path=/nixpkgs/trunk/; revision=18195
2009-11-06 11:24:49 +00:00
Ludovic Courtès
1e675384b0
Remove reference to libtopology' from
release.nix'.
...
svn path=/nixpkgs/trunk/; revision=18154
2009-11-05 18:46:57 +00:00
Ludovic Courtès
9e1729637e
Don't build GNU Emacs on non-gtk-supported platforms.
...
svn path=/nixpkgs/trunk/; revision=18138
2009-11-05 14:36:49 +00:00
Eelco Dolstra
4f839e9a54
* Sync with the trunk.
...
svn path=/nixpkgs/branches/xorg-7.5/; revision=18122
2009-11-04 22:37:24 +00:00
Eelco Dolstra
dba29df1dc
* Same as r18113.
...
svn path=/nixpkgs/branches/xorg-7.5/; revision=18114
2009-11-04 18:37:48 +00:00
Eelco Dolstra
23ef4c4f79
* Before selecting an attribute from `x', check whether it's an
...
attribute set. `tryEval' no longer catches this.
svn path=/nixpkgs/trunk/; revision=18113
2009-11-04 18:37:11 +00:00
Eelco Dolstra
f1f8debe62
* Lots of packages refer to gnomevfs and startupnotification.
...
svn path=/nixpkgs/branches/xorg-7.5/; revision=18079
2009-11-03 20:56:26 +00:00
Rob Vermaas
3296f78ca9
also build gcc41
...
svn path=/nixpkgs/trunk/; revision=18067
2009-11-02 10:33:59 +00:00
Eelco Dolstra
45ba16864f
* Deleted some obsolete kernels (2.6.20, 2.6.21, 2.6.22, 2.6.23 and
...
the 2.6.31rcs).
svn path=/nixpkgs/trunk/; revision=18065
2009-11-01 17:17:40 +00:00
Ludovic Courtès
25b0c3db17
Update reference to `tahoe'.
...
svn path=/nixpkgs/trunk/; revision=18060
2009-10-31 23:18:23 +00:00
Eelco Dolstra
97ea4b3375
* Updated ALSA.
...
svn path=/nixpkgs/branches/xorg-7.5/; revision=18055
2009-10-30 15:05:13 +00:00