3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

10630 commits

Author SHA1 Message Date
Eelco Dolstra ad48452ee1 * NVIDIA drivers updated to 195.36.24.
svn path=/nixpkgs/trunk/; revision=21856
2010-05-19 10:35:44 +00:00
Marc Weber 26e718ba23 move assertions so that buildign the NixOS manual doesn't fail
svn path=/nixpkgs/trunk/; revision=21855
2010-05-19 10:01:07 +00:00
Peter Simons fa9b6ef08d Fix ledger to compile with recent gcc.
Also makes ledger overridable.

svn path=/nixpkgs/trunk/; revision=21854
2010-05-19 07:50:45 +00:00
Lluís Batlle i Rossell b4536c217f Fixing openoffice urls for 3.2.0
svn path=/nixpkgs/trunk/; revision=21853
2010-05-19 07:31:07 +00:00
Michael Raskin e2736a0888 DMTX now needs libjasper.. pass that lib to dmtx
svn path=/nixpkgs/trunk/; revision=21852
2010-05-18 21:15:13 +00:00
Michael Raskin ae476d641a DMTX now needs libjasper..
svn path=/nixpkgs/trunk/; revision=21851
2010-05-18 21:08:19 +00:00
Lluís Batlle i Rossell 84f61fadd1 OpenOffice.org update attempt to 3.2.0 - maybe it will work
I'll wait for the hydra report.

svn path=/nixpkgs/trunk/; revision=21850
2010-05-18 20:57:00 +00:00
Michael Raskin ad1684ae13 Replace codegen script which was failing with EACCESS. Test Gajim build worked fine
svn path=/nixpkgs/trunk/; revision=21849
2010-05-18 20:13:39 +00:00
Marc Weber 6361b3a682 adding ati-drivers There is still much to be done, see http://thread.gmane.org/gmane.linux.distributions.nixos/4145
svn path=/nixpkgs/trunk/; revision=21848
2010-05-18 19:36:55 +00:00
Sander van der Burg 202e36f856 Update VirtualBox + guest additions to version 3.1.8
svn path=/nixpkgs/trunk/; revision=21846
2010-05-18 19:10:28 +00:00
Lluís Batlle i Rossell 8523c93081 Fixing the build of consolekit (it wants libgcc_s)
svn path=/nixpkgs/trunk/; revision=21843
2010-05-18 16:40:40 +00:00
Yury G. Kudryashov c270663fec Move polkit-1 libexec files into libexec/polkit-1/
svn path=/nixpkgs/trunk/; revision=21842
2010-05-18 16:40:17 +00:00
Eelco Dolstra cfd6e0f21b * The desktop item should be named "Firefox", not "firefox".
svn path=/nixpkgs/trunk/; revision=21840
2010-05-18 14:58:45 +00:00
Peter Simons 1fc724cc5c pkgs/applications/version-management/git-and-tools/git: build git on all platforms, not just Linux
svn path=/nixpkgs/trunk/; revision=21839
2010-05-18 14:41:18 +00:00
Peter Simons 1295493b18 pkgs/applications/science/logic/coq: install coqide libraries
Patch courtesy of Russell O'Connor.

svn path=/nixpkgs/trunk/; revision=21838
2010-05-18 13:40:19 +00:00
Peter Simons 5f36663ecc pkgs/top-level/perl-packages.nix: updated Digest-SHA1 to version 2.12
svn path=/nixpkgs/trunk/; revision=21837
2010-05-18 13:35:06 +00:00
Rob Vermaas a07cdd3b23 * added patchelf pre-release 0.6 until it gets stable
* updated chrome to latest version


svn path=/nixpkgs/trunk/; revision=21836
2010-05-18 12:36:23 +00:00
Peter Simons 0563e08996 pkgs/development/libraries/pango/1.26.x.nix: enable hydra builds on all platforms, not just Linux
svn path=/nixpkgs/trunk/; revision=21835
2010-05-18 12:07:48 +00:00
Eelco Dolstra 5f9542583f * MPlayer updated (from David Brown).
svn path=/nixpkgs/trunk/; revision=21829
2010-05-18 08:48:43 +00:00
Rob Vermaas 6ab3528051 typo
svn path=/nixpkgs/trunk/; revision=21827
2010-05-18 08:39:31 +00:00
Rob Vermaas 29c68e4468 fix check of tarball
svn path=/nixpkgs/trunk/; revision=21826
2010-05-18 08:22:35 +00:00
Michael Raskin bc720e1061 Update ikiwiki - previous tarball is unaccessible
svn path=/nixpkgs/trunk/; revision=21823
2010-05-18 06:35:43 +00:00
Armijn Hemel fc1344e4c9 update to 0.6
svn path=/nixpkgs/trunk/; revision=21822
2010-05-17 20:22:04 +00:00
Peter Simons c29e6c97f1 Only set font in wrapper if we have X.
Unison's wrapper was generating errors by calling xset even if DISPLAY
was not set.  This was especially noticeable when connecting to a
remote server to sync with.

Fix this by only setting the font path if DISPLAY is set to something.

svn path=/nixpkgs/trunk/; revision=21821
2010-05-17 16:16:48 +00:00
Peter Simons cbc19490b9 Add Xfce Terminal emulator.
Adds the terminal emulator, and the libraries that it depends upon.

svn path=/nixpkgs/trunk/; revision=21820
2010-05-17 16:16:39 +00:00
Rob Vermaas 93f0bf658e irssi: enable perl support
svn path=/nixpkgs/trunk/; revision=21819
2010-05-17 15:52:56 +00:00
Marc Weber aebfa8548f Revert "update wmii. libixp vanished"
The new wmii has some wired behaviour:
- When you move windows the curser location changes.
  Until the window manager has changed that location movement of mouse is
  ignored.
- window do not always popup in the col which was focused.
- wmiimenu broke

old wmii does not build with newer libixp

Until I know how to fix those issues I'll revert my update

This reverts -r 21683

svn path=/nixpkgs/trunk/; revision=21816
2010-05-17 13:35:38 +00:00
Ludovic Courtès 38c35ba49b GNU Inetutils 1.8.
svn path=/nixpkgs/trunk/; revision=21814
2010-05-17 09:31:43 +00:00
Peter Simons 71f164ac1e Three Games and Perl Support for Irssi
Here are four patches. Three of them add expressions for games. The
fourth, irssi-perl.patch, adds perl as an input for irssi, so that one
can run perl plugins in irssi. I didn't make the perl input optional,
but maybe it should be to keep the irssi expression light.

svn path=/nixpkgs/trunk/; revision=21813
2010-05-17 09:21:42 +00:00
Lluís Batlle i Rossell 0dc24d9f04 Disabling tests on two perl packages, whose tests related to network
failed on chroot builds.
That should allow hydra to build git.

(Thanks to David Brown)

svn path=/nixpkgs/trunk/; revision=21812
2010-05-17 06:47:52 +00:00
Eelco Dolstra fc0279c07e svn path=/nixpkgs/trunk/; revision=21811 2010-05-16 22:38:00 +00:00
Lluís Batlle i Rossell 70302d2d18 Adding inputs to privoxy, so it gets more features (zlib, documentation, pcre)
svn path=/nixpkgs/trunk/; revision=21809
2010-05-16 22:14:02 +00:00
Alexander Tsamutali 03d8babdf5 applications/editors/emacs-modes/jabber: New nixbuild.
svn path=/nixpkgs/trunk/; revision=21806
2010-05-16 20:32:21 +00:00
Eelco Dolstra e367687e29 * mdadm: Enable incremental activation of swraid arrays from udev.
svn path=/nixpkgs/trunk/; revision=21805
2010-05-16 20:25:57 +00:00
Eelco Dolstra 1b1e5e7d69 * xpdf updated to 3.02pl4.
svn path=/nixpkgs/trunk/; revision=21803
2010-05-16 18:59:50 +00:00
Eelco Dolstra 687376f426 * Updated Nix.
svn path=/nixpkgs/trunk/; revision=21801
2010-05-16 16:48:38 +00:00
Armijn Hemel c239f0d20e update to 2.7.0
svn path=/nixpkgs/trunk/; revision=21798
2010-05-16 16:31:04 +00:00
Lluís Batlle i Rossell a286b7c9b2 Adding tor 0.2.1.26
(Patch sent by roconnor)

svn path=/nixpkgs/trunk/; revision=21797
2010-05-16 16:23:32 +00:00
Lluís Batlle i Rossell 4df5343e78 Adding x2x.
Patch by Oleksandr Kozachuk

svn path=/nixpkgs/trunk/; revision=21796
2010-05-16 16:23:17 +00:00
Yury G. Kudryashov 64f0f42d4f Upgrade mdadm
svn path=/nixpkgs/trunk/; revision=21792
2010-05-15 18:43:24 +00:00
Yury G. Kudryashov ff03fa4511 Upgrade lvm2
svn path=/nixpkgs/trunk/; revision=21791
2010-05-15 18:43:10 +00:00
Yury G. Kudryashov 6edea62ea5 make freetype overridable
svn path=/nixpkgs/trunk/; revision=21790
2010-05-15 17:07:46 +00:00
Peter Simons 39b2ec2488 Fix git-send-email.
git-send-email depends on Net::SMTP and Net::SMTP::SSL.  Make
sendEmailSupport a config for git, and bring these libraries.  Wrap
the send-email script, or replace with a not supported script.

svn path=/nixpkgs/trunk/; revision=21789
2010-05-15 10:38:28 +00:00
Yury G. Kudryashov 07c11bbec2 Make polkit compile
svn path=/nixpkgs/trunk/; revision=21788
2010-05-15 09:55:31 +00:00
Yury G. Kudryashov 3fbd71aa88 udev-154
svn path=/nixpkgs/trunk/; revision=21787
2010-05-15 09:55:22 +00:00
Yury G. Kudryashov 062c48db4b Start migrating to polkit-0.9.6
svn path=/nixpkgs/trunk/; revision=21786
2010-05-15 09:55:15 +00:00
Yury G. Kudryashov 0e8261b0be eggdbus-0.6
svn path=/nixpkgs/trunk/; revision=21785
2010-05-15 09:55:08 +00:00
Yury G. Kudryashov 84984310e9 Update polkit-1 meta info
svn path=/nixpkgs/trunk/; revision=21784
2010-05-15 09:54:56 +00:00
Yury G. Kudryashov 9c7c6a9202 consolekit-0.4.1
svn path=/nixpkgs/trunk/; revision=21783
2010-05-15 09:54:50 +00:00
Yury G. Kudryashov 1c9a08d3eb Changed udev firmware path to /root/test-firmware:/var/run/current-system/firmware
/etc/firmware -> /var/run/current-system/firmware was disscussed on ML
I've also changed the order because "emergency" path should be of higher priority

svn path=/nixpkgs/trunk/; revision=21782
2010-05-15 09:54:42 +00:00
Yury G. Kudryashov 82201f14e9 Upgrade to udev-153. Use /etc/firmware:/root/test-firmware path
svn path=/nixpkgs/trunk/; revision=21781
2010-05-15 09:54:35 +00:00
Yury G. Kudryashov e69bf4f278 Remove unused lines
svn path=/nixpkgs/trunk/; revision=21780
2010-05-15 09:49:07 +00:00
Yury G. Kudryashov 52c65a1e62 Add rekonq browser (both 0.4.0 and latest git)
svn path=/nixpkgs/trunk/; revision=21779
2010-05-15 09:47:32 +00:00
Peter Simons 8f8b0bc3ad pkgs/applications/editors/emacs-{22,23}: don't restrict this build to Linux
It looks like the recent update broke the package on all platforms other than
Linux, but no-one seems to have noticed. Hydra certainly didn't. That's not
particularly satisfactory. Surely, we would like Emacs to build on Darwin, BSD,
and other platforms, too?

svn path=/nixpkgs/trunk/; revision=21773
2010-05-14 09:54:31 +00:00
Andres Löh b5feb272d7 Added ppm package for Haskell.
svn path=/nixpkgs/trunk/; revision=21772
2010-05-14 09:23:04 +00:00
Eelco Dolstra 22d901d935 * Updated Nix.
svn path=/nixpkgs/trunk/; revision=21771
2010-05-14 08:57:16 +00:00
Yury G. Kudryashov dd6d459130 Add otr support to kopete
svn path=/nixpkgs/trunk/; revision=21770
2010-05-13 22:14:16 +00:00
Yury G. Kudryashov 43106b4d04 Apply upstream security patch to kget
svn path=/nixpkgs/trunk/; revision=21769
2010-05-13 22:05:08 +00:00
Andres Löh 975b88f573 Updated parsec-3.
svn path=/nixpkgs/trunk/; revision=21768
2010-05-13 18:47:04 +00:00
Andres Löh a7e554d43c Added Vec and Ranged-sets libraries for Haskell.
svn path=/nixpkgs/trunk/; revision=21767
2010-05-13 17:23:33 +00:00
Andres Löh 5bf578f7f9 Updated cpphs version.
svn path=/nixpkgs/trunk/; revision=21766
2010-05-13 16:35:32 +00:00
Andres Löh 01d171e811 Added vector library for Haskell.
svn path=/nixpkgs/trunk/; revision=21765
2010-05-13 16:21:38 +00:00
Yury G. Kudryashov a309626c49 Fix a typo in gobject-introspection
svn path=/nixpkgs/trunk/; revision=21764
2010-05-13 15:57:37 +00:00
Yury G. Kudryashov 46bce5a789 Add gobject-introspection
svn path=/nixpkgs/trunk/; revision=21763
2010-05-13 15:56:04 +00:00
Lluís Batlle i Rossell c7d36ccd97 Update Awesome to 3.4.5
svn path=/nixpkgs/trunk/; revision=21762
2010-05-13 12:18:09 +00:00
Ludovic Courtès 7a34b3a7a9 glibc: Get the Hurd-specific glibc branch.
svn path=/nixpkgs/trunk/; revision=21761
2010-05-12 23:54:20 +00:00
Lluís Batlle i Rossell a07de1d9b1 The installation path of larswm was wrong
(Lots of commits for that larswm!)

svn path=/nixpkgs/trunk/; revision=21759
2010-05-12 22:08:45 +00:00
Lluís Batlle i Rossell d994faca9b Fixing larswm src.
svn path=/nixpkgs/trunk/; revision=21758
2010-05-12 21:59:06 +00:00
Lluís Batlle i Rossell 45944d3aee I forgot the nix file for larswm
svn path=/nixpkgs/trunk/; revision=21757
2010-05-12 21:53:42 +00:00
Ludovic Courtès 632ad9e73c glibc: Check whether `crossSystem' is null before accessing it.
svn path=/nixpkgs/trunk/; revision=21756
2010-05-12 20:49:57 +00:00
Lluís Batlle i Rossell 146cfcba6c Fixing glibcInfo - it did not build.
svn path=/nixpkgs/trunk/; revision=21755
2010-05-12 19:31:18 +00:00
Lluís Batlle i Rossell ed55a19bc7 Adding FUSE to the sheevaplug kernel, as a module
svn path=/nixpkgs/trunk/; revision=21754
2010-05-12 19:31:03 +00:00
Ludovic Courtès e4b15a9cee release-cross: Add `crossGNU' job.
svn path=/nixpkgs/trunk/; revision=21753
2010-05-12 15:46:55 +00:00
Ludovic Courtès 7e08174782 glibc 2.11: Cross-build for GNU/Hurd.
svn path=/nixpkgs/trunk/; revision=21752
2010-05-12 15:46:51 +00:00
Ludovic Courtès 2d4fa8897e Add GNU Hurd (headers).
svn path=/nixpkgs/trunk/; revision=21751
2010-05-12 15:46:47 +00:00
Ludovic Courtès 32fcf8d32b Add GNU MIG.
svn path=/nixpkgs/trunk/; revision=21750
2010-05-12 15:46:43 +00:00
Ludovic Courtès 5738f20c83 Add GNU Mach (headers).
svn path=/nixpkgs/trunk/; revision=21749
2010-05-12 15:46:38 +00:00
Eelco Dolstra cde9d0fb13 * The old evaluator segfaults if the `outPath' attribute is missing.
Work around it for the moment.

svn path=/nixpkgs/trunk/; revision=21747
2010-05-12 13:24:09 +00:00
Marco Maggesi 891868a4fe Add package for Fossil
svn path=/nixpkgs/trunk/; revision=21746
2010-05-12 13:17:19 +00:00
Marco Maggesi d4785a25dd Add myself to nixpkgs/pkgs/lib/maintainers.nix
svn path=/nixpkgs/trunk/; revision=21744
2010-05-12 12:25:23 +00:00
Ludovic Courtès 7a491b54fa releaseTools.coverageAnalysis: Add `lcovExtraTraceFiles' parameter.
svn path=/nixpkgs/trunk/; revision=21743
2010-05-12 12:22:44 +00:00
Eelco Dolstra 9ec34da2ee * In the generation of the `options.xml' file used to produce the
NixOS manual and  manpages, remove all derivation attributes except
  the `name' attribute.  This cuts the size of `options.xml' from 7.0
  MiB to 473 KiB, and more importantly, cuts evaluation time of the
  system derivation from 1.63s to 1.10s on my laptop (a 32%
  improvement).

svn path=/nixpkgs/trunk/; revision=21739
2010-05-12 11:07:49 +00:00
Eelco Dolstra da7e1fbea3 * Do not silently ignore broken "example" and "default" attributes
when generating the documentation.  If they're broken, they should
  be fixed.

svn path=/nixpkgs/trunk/; revision=21738
2010-05-12 09:31:46 +00:00
Peter Simons 55a322022c pkgs/applications/editors/emacs-modes/magit: bumped to 0.8 release
svn path=/nixpkgs/trunk/; revision=21737
2010-05-12 09:09:55 +00:00
Marc Weber 657ae2a621 adding libdwg - optional dependency of grass
svn path=/nixpkgs/trunk/; revision=21736
2010-05-12 00:50:01 +00:00
Marc Weber 75ca72cf75 adding GIS application OpenJUMP
svn path=/nixpkgs/trunk/; revision=21735
2010-05-11 22:19:37 +00:00
Marco Maggesi afbb01c90d Add expression for Coq 8.3 beta
svn path=/nixpkgs/trunk/; revision=21734
2010-05-11 20:14:46 +00:00
Andres Löh 76167b5bd3 Added a few new Haskell libraries.
svn path=/nixpkgs/trunk/; revision=21733
2010-05-11 19:58:47 +00:00
Marc Weber 57cffe5040 pidgin plugin sipe contributed by David Brown
svn path=/nixpkgs/trunk/; revision=21730
2010-05-11 17:28:54 +00:00
Lluís Batlle i Rossell f1fc3e3ef1 Fixing the putty name, from putty-rNUM to putty-NUM, so nix-env -i putty installs it.
svn path=/nixpkgs/trunk/; revision=21729
2010-05-11 16:17:39 +00:00
Lluís Batlle i Rossell 074e7db41a Adding an assertion for pk2cmd to build only on linux.
svn path=/nixpkgs/trunk/; revision=21728
2010-05-11 16:17:35 +00:00
Lluís Batlle i Rossell 06eab9d0a7 Enabling AUTH_LOGIN in cyrus_sasl (thanks d3z#nixos)
svn path=/nixpkgs/trunk/; revision=21727
2010-05-11 16:17:31 +00:00
Lluís Batlle i Rossell 001a74368f Adding the Microchip software for the PICKit2 programmer: pk2cmd
svn path=/nixpkgs/trunk/; revision=21726
2010-05-11 16:17:26 +00:00
Ludovic Courtès f19a35aeeb Magit: Latest version.
The tarball at crypt.to had vanished, and hopefully `fetchgit' over HTTP
will work for everyone.

svn path=/nixpkgs/trunk/; revision=21722
2010-05-11 14:56:28 +00:00
Ludovic Courtès 659e48bbb0 GNU wdiff: Fix URL.
svn path=/nixpkgs/trunk/; revision=21713
2010-05-10 17:54:26 +00:00
Marc Weber e97d2900d4 ctags: never use build dir as TMP
svn path=/nixpkgs/trunk/; revision=21712
2010-05-10 14:46:17 +00:00
Ludovic Courtès f64cc94638 GnuTLS 2.8.6.
svn path=/nixpkgs/trunk/; revision=21710
2010-05-10 14:30:52 +00:00
Ludovic Courtès d1bca917cd GNU Scientific Library 1.14.
svn path=/nixpkgs/trunk/; revision=21709
2010-05-10 14:30:48 +00:00
Ludovic Courtès 340f826442 GNU Wdiff 0.6.1.
svn path=/nixpkgs/trunk/; revision=21708
2010-05-10 14:30:44 +00:00
Ludovic Courtès 714937bfa3 GNU Hello 2.6.
svn path=/nixpkgs/trunk/; revision=21707
2010-05-10 14:30:39 +00:00
Ludovic Courtès 86e3de70e1 GNU gettext 0.18 (not in stdenv).
svn path=/nixpkgs/trunk/; revision=21704
2010-05-10 12:57:10 +00:00
Ludovic Courtès d15d6267fa GNU gettext 0.18.
svn path=/nixpkgs/branches/stdenv-updates/; revision=21702
2010-05-10 12:33:43 +00:00
Lluís Batlle i Rossell e47a2a9651 Adding blender 2.49, additional to the last 'alpha' 2.50 there already was in nixpkgs.
I put the alpha in lowPrio too; too many things don't work still, there.

svn path=/nixpkgs/trunk/; revision=21701
2010-05-10 10:20:51 +00:00
Ludovic Courtès 53c13c6892 GNU libunistring 0.9.3.
svn path=/nixpkgs/trunk/; revision=21699
2010-05-09 23:14:50 +00:00
Ludovic Courtès 601f46e716 GNU libtasn1 2.6.
svn path=/nixpkgs/trunk/; revision=21698
2010-05-09 23:14:44 +00:00
Ludovic Courtès a5bfd45419 GNU gv 3.6.9.
svn path=/nixpkgs/trunk/; revision=21697
2010-05-09 23:14:39 +00:00
Ludovic Courtès c63a2c79a4 GNU Zile 2.3.16.
svn path=/nixpkgs/trunk/; revision=21696
2010-05-09 23:14:34 +00:00
Ludovic Courtès e583aae98c Emacs: Add optional dependencies on GConf and librsvg.
svn path=/nixpkgs/trunk/; revision=21694
2010-05-09 23:14:23 +00:00
Marc Weber 27ef15a6bd adding postgis + script enabling postgis features
Exporting builder.pl because it will be used in NixOS postgresql module

svn path=/nixpkgs/trunk/; revision=21691
2010-05-09 20:38:16 +00:00
Marc Weber 6a9f333cea geos update 3.2.2 because of postgis
svn path=/nixpkgs/trunk/; revision=21690
2010-05-09 20:38:12 +00:00
Lluís Batlle i Rossell 7ccbfc1746 Fixing nfsUtils rpc.statd about pointing to the sm-notify binary. It pointed to
/usr/sbin

svn path=/nixpkgs/trunk/; revision=21689
2010-05-09 19:14:06 +00:00
Peter Simons fd8c6ae43d Moved 'maintainers' attribute into the meta section of the expression.
I've also set the 'platforms' attribute to ensure that Hydra actually
builds these packages. Thanks to Lluís Batlle i Rossell for pointing out
these mistakes.

svn path=/nixpkgs/trunk/; revision=21688
2010-05-09 16:01:44 +00:00
Marc Weber 3303106e97 python: support ncurses, replace composedArgsAndFun by makeOverridable
because composedArgsAndFun didn't pass values to the builder

svn path=/nixpkgs/trunk/; revision=21686
2010-05-09 14:33:50 +00:00
Marc Weber 258d886a17 remove duplication in derivation adding tags to source
svn path=/nixpkgs/trunk/; revision=21685
2010-05-09 14:17:24 +00:00
Marc Weber d86dace29b adding Eclipse note,
readding older version.
adding eclipseLatest top level name

svn path=/nixpkgs/trunk/; revision=21684
2010-05-09 14:17:21 +00:00
Marc Weber 6c21d81ae1 update wmii. libixp vanished
svn path=/nixpkgs/trunk/; revision=21683
2010-05-09 14:17:15 +00:00
Marc Weber 3e6777935a fix thinking rock url
svn path=/nixpkgs/trunk/; revision=21682
2010-05-09 14:15:37 +00:00
Lluís Batlle i Rossell 8b311ba757 Adding the openssh patch I forgot in a recent commit
svn path=/nixpkgs/trunk/; revision=21681
2010-05-09 12:53:46 +00:00
Ludovic Courtès 8edf4f1896 GNU Emacs 23.2.
svn path=/nixpkgs/trunk/; revision=21680
2010-05-09 12:46:22 +00:00
Lluís Batlle i Rossell b7af00b889 Making openssh pass the LOCALE_ARCHIVE variable to the forked session processes,
so the session 'bash' will receive the proper locale archive, and thus process
UTF-8 properly.

svn path=/nixpkgs/trunk/; revision=21678
2010-05-09 12:44:09 +00:00
Lluís Batlle i Rossell 9012b226c7 Fixing the 'awesome' tab completion on Run command
svn path=/nixpkgs/trunk/; revision=21677
2010-05-09 11:01:29 +00:00
Marc Weber 6fe4db1c7d sane-backends update provided by David Brown
svn path=/nixpkgs/trunk/; revision=21676
2010-05-09 01:09:28 +00:00
Lluís Batlle i Rossell d770597dda I wrote a bad 'name' for blender before. Fixing.
svn path=/nixpkgs/trunk/; revision=21674
2010-05-08 22:33:20 +00:00
Ludovic Courtès cfd8533c8d Avahi: Use /var as localstatedir.
Reported by Lluís Batlle.

svn path=/nixpkgs/trunk/; revision=21672
2010-05-08 22:24:39 +00:00
Marc Weber 8d9af6d596 patch provided by David Brown adding simple-build-tool which builds Scala packages
svn path=/nixpkgs/trunk/; revision=21671
2010-05-08 21:51:47 +00:00
Lluís Batlle i Rossell c82a9ac921 Updating blender
svn path=/nixpkgs/trunk/; revision=21670
2010-05-08 21:25:56 +00:00
Nicolas Pierron 4f62c83781 Update pam_usb url.
svn path=/nixpkgs/trunk/; revision=21665
2010-05-08 17:30:43 +00:00
Nicolas Pierron 9767a35159 Update suckless urls.
svn path=/nixpkgs/trunk/; revision=21664
2010-05-08 17:30:34 +00:00
Yury G. Kudryashov ab6031464a Upgrade phonon to 4.4.1
svn path=/nixpkgs/trunk/; revision=21660
2010-05-08 17:03:07 +00:00
Yury G. Kudryashov 169fee5644 Add qt-4.7-beta1 with low priority
svn path=/nixpkgs/trunk/; revision=21659
2010-05-07 20:08:37 +00:00
Yury G. Kudryashov 0864c1422e Move qt-4.x into subfolder
svn path=/nixpkgs/trunk/; revision=21658
2010-05-07 20:08:31 +00:00
Eelco Dolstra 5564bd2635 * Make stack traces more consistent.
svn path=/nixpkgs/trunk/; revision=21652
2010-05-07 15:13:43 +00:00
Lluís Batlle i Rossell a3d73679b7 Cleaning a bit the boost directory. I propose having 'default.nix' for the latest version,
so the updates end in a simple diff. I remove the versions not mentioned anywhere else too.

svn path=/nixpkgs/trunk/; revision=21650
2010-05-07 14:27:22 +00:00
Lluís Batlle i Rossell 6dd72c5897 Updating putty to the last svn version, so now it can work with gtk2. The previous
wanted gtk1, that did not build on x86_64-linux

svn path=/nixpkgs/trunk/; revision=21649
2010-05-07 14:18:00 +00:00
Peter Simons f96b77a4ce gnuplot: updated to version 4.4.0
svn path=/nixpkgs/trunk/; revision=21648
2010-05-07 14:01:57 +00:00
Peter Simons 79a6a66322 libgnomeprintui derivation
svn path=/nixpkgs/trunk/; revision=21647
2010-05-07 14:01:52 +00:00
Peter Simons f3ceb181e2 gmime 2.4.15
svn path=/nixpkgs/trunk/; revision=21646
2010-05-07 14:01:46 +00:00
Peter Simons 67cf56d2a5 git-subtree: added the version 0.3.
svn path=/nixpkgs/trunk/; revision=21645
2010-05-07 14:01:39 +00:00
Eelco Dolstra 57c049f4a0 * meta.platforms is a list of strings, not a list of lists of strings
(http://hydra.nixos.org/build/399330). 
* Fix the indentation of longDescription.

svn path=/nixpkgs/trunk/; revision=21640
2010-05-07 10:02:52 +00:00
Peter Simons 3542a7777e pkgs/top-level/all-packages.nix: removed boost_1_36_0 attribute
According to "grep -R", that attribute isn't referenced by anything in nix-pkgs.

svn path=/nixpkgs/trunk/; revision=21639
2010-05-07 09:33:30 +00:00
Peter Simons 00b296762a pkgs/development/libraries/boost: updated boost to 1.43.0
svn path=/nixpkgs/trunk/; revision=21638
2010-05-07 09:32:46 +00:00
Yury G. Kudryashov 5eca4b85f1 metadata for kdevplatform and kdevelop
svn path=/nixpkgs/trunk/; revision=21637
2010-05-07 07:38:35 +00:00
Lluís Batlle i Rossell f0d7bf0541 Updating the hydra cross-build tests to build wxMSW and not wxGTK for mingw32
svn path=/nixpkgs/trunk/; revision=21635
2010-05-06 19:20:47 +00:00
Lluís Batlle i Rossell 2c8783a48b Making wxGTK stay wxGTK even cross-built, so I remove the wxMSW code I added
to test the crossbuilding with wxGTK.
I added a new windows-specific package: wxMSW.

svn path=/nixpkgs/trunk/; revision=21634
2010-05-06 19:19:22 +00:00
Lluís Batlle i Rossell 4547dffb5d Fixing gcc-4.5 related to the patch for ultrasparc. The patch should not be
needed anymore

svn path=/nixpkgs/trunk/; revision=21633
2010-05-06 19:19:02 +00:00
Lluís Batlle i Rossell c65304ff49 Telling hydra to build the cross-mingw32
svn path=/nixpkgs/trunk/; revision=21632
2010-05-06 18:47:35 +00:00
Lluís Batlle i Rossell 24c157910c Making wxWidgets cross-build for mingw32.
svn path=/nixpkgs/trunk/; revision=21631
2010-05-06 18:23:03 +00:00
Lluís Batlle i Rossell c548c084bb Making gcc-4.5 cross-build to mingw32 too (set by the proper config and libc = "msvcrt"
in the crossSystem)

svn path=/nixpkgs/trunk/; revision=21630
2010-05-06 18:22:51 +00:00
Eelco Dolstra 3b2d0133f3 * Patch the `nvidia-settings.desktop' file to make it work on KDE.
svn path=/nixpkgs/trunk/; revision=21628
2010-05-06 16:58:04 +00:00
Sander van der Burg b97a0eb54e Added GeoIP Java API library
svn path=/nixpkgs/trunk/; revision=21626
2010-05-06 13:58:27 +00:00
Sander van der Burg 65c05f03da Changed version in derivation names to 4.4.3
svn path=/nixpkgs/trunk/; revision=21625
2010-05-06 11:54:41 +00:00
Ludovic Courtès 3bda68d779 Linux: Attempt to copy more debugging info to $out.
svn path=/nixpkgs/trunk/; revision=21624
2010-05-06 11:52:49 +00:00
Ludovic Courtès 074f450ab3 Linux: Patch incorrect absolute paths in makefiles.
svn path=/nixpkgs/trunk/; revision=21623
2010-05-06 11:52:43 +00:00
Sander van der Burg e7a10e7142 Bumped KDE SC to version 4.4.3
svn path=/nixpkgs/trunk/; revision=21622
2010-05-06 09:33:40 +00:00
Lluís Batlle i Rossell 222e41519e Making lame compile with assembly optimization for i386
svn path=/nixpkgs/trunk/; revision=21620
2010-05-05 20:38:13 +00:00
Ludovic Courtès 96f2d289bc Don't strip Linux modules in the SystemTap variant.
svn path=/nixpkgs/trunk/; revision=21619
2010-05-05 19:48:52 +00:00
Ludovic Courtès 588be9d6db Add a Linux kernel suitable for SystemTap.
svn path=/nixpkgs/trunk/; revision=21618
2010-05-05 19:48:46 +00:00
Ludovic Courtès 83609f6191 nixUnstable: Fix typo.
svn path=/nixpkgs/trunk/; revision=21617
2010-05-05 19:48:39 +00:00
Ludovic Courtès 1edabb560c Make `nixUnstable' the default.
svn path=/nixpkgs/trunk/; revision=21616
2010-05-05 19:48:32 +00:00
Ludovic Courtès d9de1677cc OProfile 0.9.6.
svn path=/nixpkgs/trunk/; revision=21615
2010-05-05 19:48:18 +00:00
Yury G. Kudryashov b03f3bd8a1 Add platforms to xf86-input-wacom
svn path=/nixpkgs/trunk/; revision=21614
2010-05-05 18:23:08 +00:00
Yury G. Kudryashov e58d461623 Add kdevelop
svn path=/nixpkgs/trunk/; revision=21613
2010-05-05 18:18:05 +00:00
Yury G. Kudryashov 8fce481d76 Add kdevplatform
svn path=/nixpkgs/trunk/; revision=21612
2010-05-05 18:18:00 +00:00
Yury G. Kudryashov b07f14b1f5 Use stdenv2 in KDE to speed-up builds
svn path=/nixpkgs/trunk/; revision=21611
2010-05-05 18:17:55 +00:00
Yury G. Kudryashov 5008f2dba6 add enchant support to kdelibs
svn path=/nixpkgs/trunk/; revision=21610
2010-05-05 18:17:50 +00:00
Yury G. Kudryashov 320ce20929 Revert "Really add policykit support to kdebase-workspace"
svn path=/nixpkgs/trunk/; revision=21609
2010-05-05 18:17:45 +00:00
Yury G. Kudryashov d61f35545c kdeedu: drop libfacile as kdeedu fails to find it; use libspectre.
svn path=/nixpkgs/trunk/; revision=21608
2010-05-05 18:17:40 +00:00
Yury G. Kudryashov b2ed8f1aa0 Propagate policykit
svn path=/nixpkgs/trunk/; revision=21607
2010-05-05 18:17:35 +00:00
Yury G. Kudryashov a44db4e52d Adjust plugin install dir to changes in qt
svn path=/nixpkgs/trunk/; revision=21606
2010-05-05 18:17:30 +00:00
Yury G. Kudryashov b8186141e3 Qt 4.6: add more SQL backends and libXi
Also install qch docs by default

svn path=/nixpkgs/trunk/; revision=21605
2010-05-05 18:17:25 +00:00
Peter Simons d21dc14966 pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.1
svn path=/nixpkgs/trunk/; revision=21604
2010-05-05 10:26:19 +00:00
Peter Simons 6b42129c3a pkgs/applications/science/math/wxmaxima: updated to version 0.8.5
svn path=/nixpkgs/trunk/; revision=21603
2010-05-05 10:26:15 +00:00
Peter Simons 2dd70d3ffb pkgs/applications/science/math/maxima: updated to version 5.21.1
svn path=/nixpkgs/trunk/; revision=21602
2010-05-05 10:26:11 +00:00
Ludovic Courtès d2e6d7b84f Update Nix unstable.
svn path=/nixpkgs/trunk/; revision=21601
2010-05-05 09:30:42 +00:00
Eelco Dolstra 20fcfdef64 * Revert to Samba 3.3.3 because never versions (including 3.3.12)
break our VM builds.  The child smbd process sends a TERM signal to
  its process group when it exists (e.g. on unmount), causing qemu-kvm
  to die.

  Reported upstream: https://sourceforge.net/tracker/?func=detail&aid=2996643&group_id=180599&atid=893831

svn path=/nixpkgs/trunk/; revision=21600
2010-05-04 15:26:34 +00:00
Ludovic Courtès 085bf1f2f1 Add SystemTap.
svn path=/nixpkgs/trunk/; revision=21596
2010-05-04 13:32:09 +00:00
Ludovic Courtès d5086fd5bd xmlto 0.0.23.
svn path=/nixpkgs/trunk/; revision=21595
2010-05-04 13:32:04 +00:00
Ludovic Courtès be07b7f60d tcp-wrapper: Apply patches with `--batch' to please the latest GNU Patch.
svn path=/nixpkgs/trunk/; revision=21594
2010-05-04 13:32:00 +00:00
Eelco Dolstra 82fe986554 * strace 4.5.20.
svn path=/nixpkgs/trunk/; revision=21592
2010-05-04 12:17:34 +00:00
Rob Vermaas 9e5ab46737 added git2cl script
svn path=/nixpkgs/trunk/; revision=21590
2010-05-04 10:06:50 +00:00
Armijn Hemel 049c896998 update to 1.1.1
svn path=/nixpkgs/trunk/; revision=21585
2010-05-03 23:14:28 +00:00
Lluís Batlle i Rossell f434403e59 Updating numpy, so it builds on arm, and then I can get tahoe-lafs building in armv5tel-linux.
svn path=/nixpkgs/trunk/; revision=21584
2010-05-03 20:06:09 +00:00
Lluís Batlle i Rossell 4b44717b1d Making the ld-wrapper2.sh much faster, when having lots of '-L' parameters,
breaking a double loop we had.

svn path=/nixpkgs/trunk/; revision=21583
2010-05-03 19:59:51 +00:00
Alexander Tsamutali d2237f9912 warzone2100: New nixpkg.
svn path=/nixpkgs/trunk/; revision=21582
2010-05-03 16:07:01 +00:00
Yury G. Kudryashov c2c4990057 Remove C++-style comment from sys/acl.h
svn path=/nixpkgs/branches/stdenv-updates/; revision=21581
2010-05-03 15:47:58 +00:00
Alexander Tsamutali 6ce7168eac quesoglc: New nixpkg.
svn path=/nixpkgs/trunk/; revision=21580
2010-05-03 15:38:16 +00:00
Yury G. Kudryashov 646d7a2eb0 Upgrade attr, moved to savannah
svn path=/nixpkgs/branches/stdenv-updates/; revision=21579
2010-05-03 14:41:19 +00:00
Yury G. Kudryashov 2452930b76 Upgrade acl, new homepage
svn path=/nixpkgs/branches/stdenv-updates/; revision=21578
2010-05-03 14:41:04 +00:00
Yury G. Kudryashov de4815afa8 catdoc: fix evaluation error
svn path=/nixpkgs/trunk/; revision=21577
2010-05-03 13:39:46 +00:00
Yury G. Kudryashov 796ffd9f71 Move "fetchurl restricted" code to requireFile.
This reverts r21474 and r21467.
Also migrate wtk (r21472) to new API.

svn path=/nixpkgs/trunk/; revision=21575
2010-05-03 09:13:17 +00:00
Yury G. Kudryashov 2d9ba975e7 digikam: use external lensfun and lqr-1
svn path=/nixpkgs/trunk/; revision=21561
2010-05-03 03:45:58 +00:00
Yury G. Kudryashov 83f4846c49 Add lensfun library
svn path=/nixpkgs/trunk/; revision=21560
2010-05-03 03:45:52 +00:00
Yury G. Kudryashov 19cc1226d4 Add liblqr-1
svn path=/nixpkgs/trunk/; revision=21559
2010-05-03 03:45:47 +00:00
Yury G. Kudryashov d8c07cc4d6 Add catdoc
svn path=/nixpkgs/trunk/; revision=21558
2010-05-03 03:45:40 +00:00
Ludovic Courtès 17a3bcd4d6 Add GNU FreeDink.
svn path=/nixpkgs/trunk/; revision=21555
2010-05-02 09:27:51 +00:00
Ludovic Courtès 61ec7e828d Add SDL_gfx.
Contributed by Brian Gough <bjg@gnu.org>.

svn path=/nixpkgs/trunk/; revision=21554
2010-05-02 09:27:45 +00:00
Ludovic Courtès 8da4605505 GCC 4.5: Remove redundant `--disable-multilib'.
svn path=/nixpkgs/trunk/; revision=21553
2010-05-02 09:27:39 +00:00
Ludovic Courtès 8298738364 Add GNU Parallel.
svn path=/nixpkgs/trunk/; revision=21552
2010-05-02 09:27:32 +00:00
Lluís Batlle i Rossell 357e3ce108 Breaking a dependency of zefc on ghc. Trying to get tahoelafs built on armv5tel-linux
svn path=/nixpkgs/trunk/; revision=21550
2010-05-01 20:54:27 +00:00
Andres Löh 3c6f04e08e Commented on the current decision on recurseIntoAttrs for haskellPackages.
svn path=/nixpkgs/trunk/; revision=21478
2010-05-01 11:23:39 +00:00
Lluís Batlle i Rossell 103f51c4da Making the latest haskell expressions appear on 'nix-env -qa'.
More than one person had trouble not finding ghc 6.12 on 'nix-env -qa '*''

svn path=/nixpkgs/trunk/; revision=21477
2010-05-01 10:55:05 +00:00
Lluís Batlle i Rossell b14e71be03 Updating irssi
svn path=/nixpkgs/trunk/; revision=21476
2010-05-01 10:33:00 +00:00
Yury G. Kudryashov 0b11f22f49 Trying to fix virtuoso build on freebsd
svn path=/nixpkgs/trunk/; revision=21475
2010-05-01 07:41:40 +00:00
Yury G. Kudryashov 3e1e56e10c fetchurl restricted: list nix-prefetch-url as well
svn path=/nixpkgs/trunk/; revision=21474
2010-05-01 07:07:36 +00:00
Yury G. Kudryashov bf92619681 Upgrade virtuoso to 6.1.1
svn path=/nixpkgs/trunk/; revision=21473
2010-05-01 07:07:31 +00:00
Yury G. Kudryashov c43dbd671e Migrate wtk to new "restricted downloads" feature of fetchurl
svn path=/nixpkgs/trunk/; revision=21472
2010-05-01 07:07:25 +00:00
Lluís Batlle i Rossell 1ae5a63425 Fixing the yasm 'name'
svn path=/nixpkgs/trunk/; revision=21471
2010-04-30 22:25:25 +00:00
Lluís Batlle i Rossell 1215f3a7a4 Adding yasm, and making x264 and xvid codecs be compiled with their assembly code
svn path=/nixpkgs/trunk/; revision=21470
2010-04-30 21:58:47 +00:00
Lluís Batlle i Rossell b3870f0148 Adding xvid, to ffmpeg and mplayer.
svn path=/nixpkgs/trunk/; revision=21469
2010-04-30 21:47:09 +00:00
Lluís Batlle i Rossell fe7945b7fb Adding rtmpdump
svn path=/nixpkgs/trunk/; revision=21468
2010-04-30 21:46:55 +00:00
Yury G. Kudryashov 404c314412 Add support for restricted downloads
svn path=/nixpkgs/trunk/; revision=21467
2010-04-30 20:40:42 +00:00
Yury G. Kudryashov cc0b0b1c69 Add openssl1 back (but don't remove 0.9.8n)
svn path=/nixpkgs/trunk/; revision=21466
2010-04-30 20:40:33 +00:00
Yury G. Kudryashov 4ba1c06c89 Support nepomuk and marble in digikam.
Also stop passing lib.

svn path=/nixpkgs/trunk/; revision=21465
2010-04-30 20:40:11 +00:00
Yury G. Kudryashov 8137966874 Upgrade samba
Also add symlink for CUPS

svn path=/nixpkgs/trunk/; revision=21464
2010-04-30 20:39:54 +00:00
Lluís Batlle i Rossell fa6c22b5c6 Adding the expressions for gcc 4.5 for cross building.
Although I still have set gcc 4.4 for that, I tested with the 4.5 expression
and it cross built perfectly bison for the sheevaplug.

svn path=/nixpkgs/trunk/; revision=21463
2010-04-30 19:12:59 +00:00
Peter Simons 52884c145f pkgs/tools/misc/most/default.nix: added license tag (GPLv2)
svn path=/nixpkgs/trunk/; revision=21461
2010-04-30 16:06:01 +00:00
Peter Simons d4221fa80a pkgs/tools/misc/most/default.nix: cosmetic changes
svn path=/nixpkgs/trunk/; revision=21460
2010-04-30 16:05:55 +00:00
Lluís Batlle i Rossell 32b7ecf0d9 Adding more dependencies to mlt (for more features)
svn path=/nixpkgs/trunk/; revision=21459
2010-04-30 13:12:12 +00:00
Lluís Batlle i Rossell a386398be6 Adding kdenlive, and as a side effect, mlt.
Kdenlive looks for some binaries in PATH, so some dependencies may be fulfilled
not by kdenlive nix expression.

svn path=/nixpkgs/trunk/; revision=21458
2010-04-30 13:12:07 +00:00
Peter Simons 2cd7033243 pkgs/tools/text/source-highlight: added GNU source highlight version 3.1.3
svn path=/nixpkgs/trunk/; revision=21457
2010-04-30 12:23:26 +00:00
Peter Simons 06f51c6e05 pkgs/applications/misc/ikiwiki: added build input PerlMagick
Without ImageMagick support, Ikiwiki cannot handle images.

svn path=/nixpkgs/trunk/; revision=21456
2010-04-30 10:49:43 +00:00
Peter Simons ccf9a368b3 pkgs/top-level/perl-packages.nix: added PerlMagick, a perl API to ImageMagick
Unfortunately, the test suite had to be disabled because it assumes that
ImageMagick has been built with any and all extensions, i.e. WMF support
and whatnot else, and if it isn't, then the suite reports that as a
failure.

svn path=/nixpkgs/trunk/; revision=21455
2010-04-30 10:49:39 +00:00
Peter Simons 5139e564fa pkgs/applications/graphics/ImageMagick: added build input jasper for jpeg-2000 support
While I was at it, I also rewrote the expression to get along without
using the deprecated "args: with args;" style.

svn path=/nixpkgs/trunk/; revision=21454
2010-04-30 10:49:33 +00:00
Lluís Batlle i Rossell 376895d34c Fixing the nixpkgs tarball build: I used 'stdenv.bash', where I should use 'stdenv.shell'.
svn path=/nixpkgs/trunk/; revision=21453
2010-04-30 10:47:53 +00:00
Peter Simons c82a9c8e10 pkgs/tools/misc/most: added version 5.0.0
Build instructions courtesy of Tim Horton <tmhorton@gmail.com>.

svn path=/nixpkgs/trunk/; revision=21452
2010-04-30 09:21:18 +00:00
Lluís Batlle i Rossell 7b6ce0f9df Updating x264, and adding x264 support to mplayer and ffmpeg.
svn path=/nixpkgs/trunk/; revision=21451
2010-04-30 08:33: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
Lluís Batlle i Rossell fa2177ed5c Making filelight built by hydra (I added the platforms meta attribute)
svn path=/nixpkgs/trunk/; revision=21444
2010-04-29 21:32:01 +00:00
Lluís Batlle i Rossell f85992530f Adding meta information to kdiff3 so it gets built by hydra
svn path=/nixpkgs/trunk/; revision=21443
2010-04-29 21:31:35 +00:00
Yury G. Kudryashov 54224374cc Delete unused builder.sh
svn path=/nixpkgs/trunk/; revision=21441
2010-04-29 19:09:33 +00:00
Lluís Batlle i Rossell cf5343a07d Adding the logrotate I found in the freebsd ports.
I think that is what debian, fedora and freebsd call 'logrotate'.

svn path=/nixpkgs/trunk/; revision=21437
2010-04-29 17:55:06 +00:00
Lluís Batlle i Rossell 060714f287 Adding mtdutils
svn path=/nixpkgs/trunk/; revision=21436
2010-04-29 17:54:51 +00:00
Andres Löh b3224edee3 Updated the expression for EHC/UHC.
This is not yet properly tested, but it should be an improvement over
what was there before ...

svn path=/nixpkgs/trunk/; revision=21435
2010-04-29 17:35:09 +00:00
Andres Löh 7d2ae46bce Add missing binaries to the GHC wrapper.
svn path=/nixpkgs/trunk/; revision=21434
2010-04-29 17:35:05 +00:00
Peter Simons 170b98be32 pkgs/top-level/haskell-packages.nix: drop trailing white space
svn path=/nixpkgs/trunk/; revision=21433
2010-04-29 15:08:28 +00:00
Peter Simons 0a87f7f706 pkgs/top-level/all-packages.nix: disable libdrm on Darwin platforms
libdrm doesn't build on Darwin and, according to the Xorg developers, isn't
supposed to be built.

This change fixes the build of haskell-platform-ghc6.12.2-2010.1.0.0 on Darwin.

svn path=/nixpkgs/trunk/; revision=21432
2010-04-29 14:57:23 +00:00
Peter Simons 5d63995485 pkgs/development/libraries/freeglut/default.nix: strip trailing white space
svn path=/nixpkgs/trunk/; revision=21431
2010-04-29 14:57:17 +00:00
Peter Simons 7d0cd3dbb7 pkgs/development/libraries/freeglut: disable building with "-Wall -Werror" on Darwin
The build generates warnings on MacOS X because of unused variables, and we
don't want those trivial problems to lead to a build failure.

svn path=/nixpkgs/trunk/; revision=21430
2010-04-29 14:57:13 +00:00
Peter Simons 8ccc115606 pkgs/development/libraries/mesa: disable build of egl library on Darwin
The egl library doesn't seem to work, i.e. the included demo program has
undefined symbols after linking with it.

svn path=/nixpkgs/trunk/; revision=21429
2010-04-29 14:57:07 +00:00
Peter Simons 5c43115185 pkgs/development/libraries/mesa/default.nix: drop trailing white space
svn path=/nixpkgs/trunk/; revision=21428
2010-04-29 14:57:02 +00:00
Peter Simons 56ce7f2ae6 pkgs/development/libraries/mesa: pass lipo utility to this build on Darwin
svn path=/nixpkgs/trunk/; revision=21427
2010-04-29 14:56:52 +00:00
Peter Simons 85b7c134cb pkgs/os-specific/darwin/lipo: add support for running the native Darwin lipo utility
svn path=/nixpkgs/trunk/; revision=21426
2010-04-29 14:56:44 +00:00
Peter Simons 5e8a97a831 pkgs/top-level/all-packages.nix: added RPC-XML support to ikiwiki
This is required for the 'rst' plugin and for non-perl plugin support in
general.

svn path=/nixpkgs/trunk/; revision=21421
2010-04-29 09:35:20 +00:00
Peter Simons d2160c4ad0 pkgs/top-level/perl-packages.nix: added RPC-XML-0.73
svn path=/nixpkgs/trunk/; revision=21420
2010-04-29 09:35:16 +00:00
Peter Simons 325efe1b5e pkgs/top-level/perl-packages.nix: strip trailing white space
svn path=/nixpkgs/trunk/; revision=21419
2010-04-29 09:35:12 +00:00
Peter Simons a20694d004 pkgs/applications/misc/ikiwiki: renamed package from ikiwiki_3.20100427 to ikiwiki-3.20100427 to make it conform with Nix conventions
svn path=/nixpkgs/trunk/; revision=21418
2010-04-29 09:35:09 +00:00
Peter Simons 411b6600ba pkgs/applications/misc/ikiwiki: dropped unnecessary empty line in shell code
svn path=/nixpkgs/trunk/; revision=21417
2010-04-29 09:35:05 +00:00
Peter Simons 68d6efe22c pkgs/top-level/all-packages.nix: strip trailing white space
svn path=/nixpkgs/trunk/; revision=21416
2010-04-29 08:54:02 +00:00
Peter Simons d22b66cffc pkgs/top-level/all-packages.nix: added ikiwiki.{git,monotone} options to $NIXPKGS_CONFIG
Set "ikiwiki = { git = true; monotone = true; };" in $NIXPKGS_CONFIG to
enable support for git and monotone in ikiwiki. If left unconfigured,
the default is to include support for git, but not for monotone.

svn path=/nixpkgs/trunk/; revision=21415
2010-04-29 08:53:58 +00:00
Peter Simons 74e8f87d00 pkgs/applications/misc/ikiwiki: bumped to version 3.20100427
svn path=/nixpkgs/trunk/; revision=21414
2010-04-29 08:53:52 +00:00
Peter Simons 410536177b pkgs/applications/misc/ikiwiki: strip trailing white space
svn path=/nixpkgs/trunk/; revision=21413
2010-04-29 08:53:43 +00:00
Rob Vermaas 69bfabd328 re-enabled darwin patch, gcc-darwin does not support -arch flag
svn path=/nixpkgs/trunk/; revision=21412
2010-04-29 08:19:13 +00:00
Marc Weber 8a79919093 fix flash player debug build
svn path=/nixpkgs/trunk/; revision=21411
2010-04-28 20:02:40 +00:00
Lluís Batlle i Rossell e5ce3e5c8c Revert "OpenSSL-1.0.0" changes, due to the new API breaking too much packages, which still have
not released new versions compatible with openssl 1.0.0

I downgraded to 0.9.8n, that also has the security hole fix.

svn path=/nixpkgs/trunk/; revision=21408
2010-04-28 15:01:06 +00:00
Lluís Batlle i Rossell 6b8de64183 Revert "Install libraries to $out/lib instead of $out/lib64"
This reverts commit 50429b2b63a3ad540e8fcd96be0cdaac46a27da2.

svn path=/nixpkgs/trunk/; revision=21407
2010-04-28 15:01:02 +00:00
Ludovic Courtès 5929f9d3bd GCC 4.5.0.
svn path=/nixpkgs/trunk/; revision=21403
2010-04-28 12:37:11 +00:00
Ludovic Courtès 0df57866a6 pam_login: Really apply `sys-stat-h.patch'.
svn path=/nixpkgs/trunk/; revision=21402
2010-04-28 12:37:06 +00:00
Ludovic Courtès 689914a5b2 update-gcc.sh: Add support for Ada.
svn path=/nixpkgs/trunk/; revision=21401
2010-04-28 12:37:02 +00:00
Ludovic Courtès a2bd7f82d7 Add libelf.
svn path=/nixpkgs/trunk/; revision=21400
2010-04-28 12:36:58 +00:00
Ludovic Courtès 7c038cdc06 Add MPC.
svn path=/nixpkgs/trunk/; revision=21399
2010-04-28 12:36:53 +00:00
Lluís Batlle i Rossell 3fe67eca31 Updating wxGTK 2.8
svn path=/nixpkgs/trunk/; revision=21398
2010-04-28 10:09:40 +00:00
Yury G. Kudryashov 8a1dd10d81 samba: make kerberos optional
svn path=/nixpkgs/trunk/; revision=21397
2010-04-28 09:39:01 +00:00
Yury G. Kudryashov 0089b865e9 Upgrade to heimdal-1.3.2
svn path=/nixpkgs/trunk/; revision=21396
2010-04-28 09:38:55 +00:00
Yury G. Kudryashov 882c847590 enable neon version check in svn
svn path=/nixpkgs/trunk/; revision=21395
2010-04-28 09:38:46 +00:00
Yury G. Kudryashov b7151c4e2c Add neon-0.29.x, make it default
Also stop using "default" neon in all-packages.nix.
Minor versions are not source-compatible, so a package should state needed version explicitly.

svn path=/nixpkgs/trunk/; revision=21394
2010-04-28 08:40:19 +00:00
Yury G. Kudryashov d5601ee60e Install libraries to $out/lib instead of $out/lib64
This should fix a lot of builds

svn path=/nixpkgs/trunk/; revision=21393
2010-04-28 08:40:12 +00:00
Yury G. Kudryashov 415f0fdc9f Also fix neon-0.26 build
svn path=/nixpkgs/trunk/; revision=21392
2010-04-27 22:05:00 +00:00
Yury G. Kudryashov 293cde6747 Fix neon build
Use pkg-config to find openssl

svn path=/nixpkgs/trunk/; revision=21391
2010-04-27 21:54:38 +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
Yury G. Kudryashov 375900a6e7 Add comment, use the patch for darwin
svn path=/nixpkgs/trunk/; revision=21354
2010-04-27 19:05:43 +00:00
Marc Weber ae8d4501b6 adding maybeEnv. This will replace from-env.nix in nixos and will be reused in copySystemConfiguration
svn path=/nixpkgs/trunk/; revision=21353
2010-04-27 18:44:23 +00:00
Yury G. Kudryashov d2b3e548a1 OpenSSL-1.0.0
Big rebuild (though not stdenv-update). Security update, do not revert, please.

svn path=/nixpkgs/trunk/; revision=21352
2010-04-27 18:39:00 +00:00
Andres Löh 932b3d3b79 Some cleanup regarding GHC and profiling support.
svn path=/nixpkgs/trunk/; revision=21351
2010-04-27 18:21:07 +00:00
Andres Löh 8a036d8eb1 Library profiling for cabal packages can now be enabled via a config option.
svn path=/nixpkgs/trunk/; revision=21350
2010-04-27 16:35:01 +00:00
Andres Löh 1db4053fcc Added profiling option to cabal generic builder.
svn path=/nixpkgs/trunk/; revision=21349
2010-04-27 16:34:56 +00:00
Andres Löh 5623a59669 Haskell Platform 2010.1.0.0 low priority until ghc-6.12 becomes default.
svn path=/nixpkgs/trunk/; revision=21348
2010-04-27 14:55:31 +00:00
Armijn Hemel 311dc9299e update to 8.99
svn path=/nixpkgs/trunk/; revision=21347
2010-04-27 14:42:49 +00:00
Eelco Dolstra 18849f0f24 * `--exec-prefix=$out/bin' causes programs to be installed in
$out/bin/bin and $out/bin/sbin, which breaks NixOS (see
  e.g. http://hydra.nixos.org/build/380092).

svn path=/nixpkgs/trunk/; revision=21339
2010-04-27 10:46:41 +00:00
Eelco Dolstra 68d9e26bcb * Linux 2.6.32.12, 2.6.33.3.
svn path=/nixpkgs/trunk/; revision=21338
2010-04-27 09:52:36 +00:00
Ludovic Courtès 76b699eb22 pam_login: Fix build on recent glibc.
svn path=/nixpkgs/trunk/; revision=21337
2010-04-27 09:43:26 +00:00
Ludovic Courtès 7802763b45 Linux nfs-utils 1.2.2.
svn path=/nixpkgs/trunk/; revision=21336
2010-04-27 09:43:22 +00:00
Marc Weber 9ae4b8b11c wpa_supplicant: enable qt gui, deprecate old broken derivation building gui
svn path=/nixpkgs/trunk/; revision=21332
2010-04-27 04:38:41 +00:00
Andres Löh 8bf3f76256 Let GHC wrapper inherit meta from the wrapped expression.
svn path=/nixpkgs/trunk/; revision=21330
2010-04-26 20:39:51 +00:00
Yury G. Kudryashov a4842e0987 Really add policykit support to kdebase-workspace
svn path=/nixpkgs/trunk/; revision=21329
2010-04-26 20:39:08 +00:00
Armijn Hemel de5c9fd9bc update to 1.0.6
svn path=/nixpkgs/trunk/; revision=21328
2010-04-26 20:06:00 +00:00
Eelco Dolstra a011b43d1f * Reverted r21314 because it causes all of Nixpkgs on Linux to be
rebuilt.  Not sure why though.  Maybe "isLinux" is not set in the
  bootstrap stdenv.

svn path=/nixpkgs/trunk/; revision=21327
2010-04-26 18:36:53 +00:00
Ludovic Courtès fff97995f3 pwdutils: Fix compilation with recent glibc.
svn path=/nixpkgs/trunk/; revision=21318
2010-04-26 09:30:53 +00:00
Ludovic Courtès a174ff34b8 Add GNU SASL, GNU GSS-API, and GNU Rush.
Contributed by Brian Gough <bjg@gnu.org>.

svn path=/nixpkgs/trunk/; revision=21315
2010-04-26 08:59:25 +00:00
Ludovic Courtès 9009a04e38 GNU Patch: Fix `stdenvNative' GNU/Linux builds.
Reported by Brian Gough <bjg@gnu.org>.

svn path=/nixpkgs/trunk/; revision=21314
2010-04-26 08:47:20 +00:00
Ludovic Courtès 106ba39180 Add GNU Shishi and GNU Radius.
Contributed by Brian Gough <bjg@gnu.org>.

svn path=/nixpkgs/trunk/; revision=21313
2010-04-26 08:45:23 +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 160e4165f7 Added myself as maintainer for the Haskell Platform.
svn path=/nixpkgs/trunk/; revision=21304
2010-04-25 17:30:55 +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
Ludovic Courtès a89f709a91 GNU/MIT Scheme: Restrict to GNU/* and FreeBSD.
svn path=/nixpkgs/trunk/; revision=21302
2010-04-24 21:03:00 +00:00
Ludovic Courtès 805d99ffc7 Reverting "GNU/MIT Scheme: Attempt to fix Cygwin builds."
svn path=/nixpkgs/trunk/; revision=21301
2010-04-24 21:02:52 +00:00
Ludovic Courtès 9534d10db6 pwdutils: Use GnuTLS instead of OpenSSL.
svn path=/nixpkgs/trunk/; revision=21300
2010-04-24 21:02:42 +00:00
Ludovic Courtès 8e905083ae pwdutils 3.2.6.
svn path=/nixpkgs/trunk/; revision=21299
2010-04-24 21:02:37 +00:00
Alexander Tsamutali 755d7d8883 conkeror: Switched to zip snapshots, because tarballs are different on every fetchurl.
svn path=/nixpkgs/trunk/; revision=21298
2010-04-24 19:09:33 +00:00
Alexander Tsamutali f45cfbe272 conkeror: New nixpkg.
svn path=/nixpkgs/trunk/; revision=21296
2010-04-24 17:34:58 +00:00
Ludovic Courtès 4f9ffa5e59 GNU/MIT Scheme: Attempt to fix Cygwin builds.
svn path=/nixpkgs/trunk/; revision=21295
2010-04-24 16:02:08 +00:00
Alexander Tsamutali 1f3943541b urbanterror: Enabled OpenAL and curl support.
svn path=/nixpkgs/trunk/; revision=21294
2010-04-24 12:39:10 +00:00
Ludovic Courtès 4fcbad8476 GNU/MIT Scheme: Build from the binary distributions when available.
svn path=/nixpkgs/trunk/; revision=21293
2010-04-24 11:09:53 +00:00
Ludovic Courtès 5e0a05e4dc stdenv: Add `isx86_64'.
svn path=/nixpkgs/trunk/; revision=21292
2010-04-24 11:08:24 +00:00
Yury G. Kudryashov 831196dad1 Fix qtscriptgenerator build
svn path=/nixpkgs/trunk/; revision=21288
2010-04-24 09:36:03 +00:00
Alexander Tsamutali a3bac131c3 sakura: Updated to 2.3.8.
svn path=/nixpkgs/trunk/; revision=21287
2010-04-24 00:12:51 +00:00
Ludovic Courtès 0e7e20042b Add the GNU Linear Programming Kit (GLPK).
Contributed by Brian Gough <bjg@gnu.org>.

svn path=/nixpkgs/trunk/; revision=21284
2010-04-23 21:15:48 +00:00
Yury G. Kudryashov 7f8c11af2f Remove obsolete pkgs.synaptics package
svn path=/nixpkgs/trunk/; revision=21278
2010-04-23 18:56:15 +00:00
Andres Löh 776d8267c6 Added a couple of comments to ghc expression and myself as maintainer,
in preparation for adding ghc-6.12.2 ...

svn path=/nixpkgs/trunk/; revision=21268
2010-04-23 12:38:34 +00:00
Eelco Dolstra 9fce3b7efc * Zabbix updated to 1.8.2.
svn path=/nixpkgs/trunk/; revision=21267
2010-04-23 11:58:59 +00:00
Peter Simons bba637c718 pkgs/development/interpreters/python/3.1: renamed this package to "python3"
Python version 3.x is really quite different from 2.x. Using a new name
for the package prevents Nix from performing unintended updates to the
3.x version.

svn path=/nixpkgs/trunk/; revision=21264
2010-04-23 10:42:29 +00:00
Ludovic Courtès 8f995b2e50 GNU tar: Remove obsolete patch.
svn path=/nixpkgs/branches/stdenv-updates/; revision=21262
2010-04-23 09:11:23 +00:00
Lluís Batlle i Rossell bbb833cf8b Fixing the gnused fetchurl hash type, for stdenv-updates to evaluate well
svn path=/nixpkgs/branches/stdenv-updates/; revision=21252
2010-04-22 21:45:56 +00:00
Lluís Batlle i Rossell 6f2fac6466 Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
2010-04-22 21:44:33 +00:00
Lluís Batlle i Rossell 6d62947d71 Making glibc build without any LOCALE_ARCHIVE* environment variable anymore,
setting glibc to look for the locale-archive in the usual nixos
/var/run/current-system/sw/lib/locale path.
This solution may give us less problems.
The last problem involved was the lack of locale-archive in setuid/setgid
programs, due to the risk of letting them take the LOCALE_ARCHIVE variable
contents from the caller.

svn path=/nixpkgs/branches/stdenv-updates/; revision=21249
2010-04-22 21:17:57 +00:00
Lluís Batlle i Rossell 93d2b4b7bf Updating the intel x11 video drivers.
(I know I modified an automatically generated file, but I don't imagine
well the consequences of this)

svn path=/nixpkgs/trunk/; revision=21248
2010-04-22 20:12:26 +00:00
Lluís Batlle i Rossell c12db8f8dc I wrote wrong the openssh url. Btw, I changed the source server, because the old
mirror at Ultrech did not have the latest openssh even 6 days after the
5.5 release.

svn path=/nixpkgs/trunk/; revision=21247
2010-04-22 20:12:09 +00:00
Lluís Batlle i Rossell 5d04ec0364 Updating openssh, fixing libedit for openssh to link well with it, and... here we
finally have sftp with some kind of 'readline'!

svn path=/nixpkgs/trunk/; revision=21246
2010-04-22 18:16:18 +00:00
Sander van der Burg 1bf1500d39 Added Apache Felix gateway and remote shell packages
svn path=/nixpkgs/trunk/; revision=21240
2010-04-22 14:01:57 +00:00
Lluís Batlle i Rossell 2894233ff6 Updating xterm so it releases the effective gid (for setgid to utmp purposes).
svn path=/nixpkgs/trunk/; revision=21239
2010-04-22 14:01:21 +00:00
Eelco Dolstra a745097710 * Give Python 3.1 a lower priority so that it isn't installed by
default when you do "nix-env -i python" and to allow it to be
  installed in the same profile as Python 2.x.
* Disambiguate between the variants of Python 2.x.

svn path=/nixpkgs/trunk/; revision=21237
2010-04-22 13:09:02 +00:00
Lluís Batlle i Rossell 5acee5db82 Fixing xterm's setting of gid in its pts terminals (group tty)
svn path=/nixpkgs/trunk/; revision=21224
2010-04-22 09:57:02 +00:00
Lluís Batlle i Rossell 80862759f2 Updating util-linux, so the 2nd util-linux change in few minutes; that may
annoy less.

svn path=/nixpkgs/trunk/; revision=21221
2010-04-21 21:35:38 +00:00
Lluís Batlle i Rossell 1f942f92bf Making utillinux build also 'write'. (Thank you, niksnut)
svn path=/nixpkgs/trunk/; revision=21219
2010-04-21 20:47:15 +00:00
Eelco Dolstra 7cdad55164 * Use OpenSSL's implementation of MD5, SHA-1 and SHA-256, as they're
a bit faster.

svn path=/nixpkgs/trunk/; revision=21218
2010-04-21 20:07:26 +00:00
Eelco Dolstra 8a4805ba22 * Updated nvidia-x11 to 195.36.15.
svn path=/nixpkgs/trunk/; revision=21209
2010-04-21 14:47:13 +00:00
Eelco Dolstra fca81fa9ee * Reverted a revert that should not have been done :-)
* Add a version number to svnfs.

svn path=/nixpkgs/trunk/; revision=21208
2010-04-21 14:47:13 +00:00
Andres Löh 1c2fa602ee Added gdiff Haskell package.
svn path=/nixpkgs/trunk/; revision=21207
2010-04-21 14:05:17 +00:00
Eelco Dolstra 28695d990c * Thunderbird 3.0.4.
svn path=/nixpkgs/trunk/; revision=21206
2010-04-21 14:02:28 +00:00
Armijn Hemel 1aee2df93a update libpcap to 1.1.1 and wireshark to 1.3.4
svn path=/nixpkgs/trunk/; revision=21205
2010-04-21 13:31:08 +00:00
Eelco Dolstra 108e86ce6c * Update the firmware for the IWL 3945.
svn path=/nixpkgs/trunk/; revision=21204
2010-04-21 12:32:16 +00:00
Sander van der Burg 0de19dec3b - Upgraded SIP to 4.10.2
- Upgraded PyQt to 4.7.3


svn path=/nixpkgs/trunk/; revision=21203
2010-04-21 12:06:28 +00:00
Eelco Dolstra 9e9f8e45b3 * Updated wpa_supplicant to 0.7.2.
svn path=/nixpkgs/trunk/; revision=21200
2010-04-21 11:37:15 +00:00
Eelco Dolstra b86fd1a1ec * Added rfkill, a tool for controlling the wireless kill switch on
Linux.

svn path=/nixpkgs/trunk/; revision=21199
2010-04-21 11:21:15 +00:00
Eelco Dolstra f20c7e9c46 * Cleanup: removed the unused `python-new'.
svn path=/nixpkgs/trunk/; revision=21198
2010-04-21 11:12:06 +00:00
Eelco Dolstra 741cc2fef8 * Cleanup: removed the unused `python-new'.
svn path=/nixpkgs/trunk/; revision=21197
2010-04-21 11:11:42 +00:00
Eelco Dolstra e2a374799f * Reverted most of the recent Python refactorings, as discussed. It's
a worthy goal to move the Python packages that are currently in
  all-packages.nix into a single attribute set, but this doesn't
  require moving python-packages.nix or the other changes made to that
  file.  The Python packages in all-packages.nix should simply be
  moved to python-packages.nix, and ideally changed to use
  buildPythonPackage.

svn path=/nixpkgs/trunk/; revision=21196
2010-04-21 10:51:15 +00:00
Lluís Batlle i Rossell 8d9ac92768 Enabling again the setuptoolsTrial python package, so at least
the nixpkgs tarball does not fail.

svn path=/nixpkgs/trunk/; revision=21195
2010-04-21 10:38:12 +00:00
Eelco Dolstra ac5555e40c * Subversion 1.6.11. Also updated meta.homepage to reflect that it's
now an Apache project.

svn path=/nixpkgs/trunk/; revision=21194
2010-04-21 09:47:26 +00:00
Lluís Batlle i Rossell 85c1a2b7ff "Remind" update.
svn path=/nixpkgs/trunk/; revision=21193
2010-04-21 07:00:49 +00:00
Lluís Batlle i Rossell f2307e2543 Fixing the mechanize python package. That may make calibre build again.
svn path=/nixpkgs/trunk/; revision=21191
2010-04-20 18:29:50 +00:00
Yury G. Kudryashov 445a3e07e9 Don't disable pythonSexy for python 2.6
Otherwise tarball build fails.

svn path=/nixpkgs/trunk/; revision=21187
2010-04-20 17:06:38 +00:00
Yury G. Kudryashov 4cdcafb0f1 Don't pass lib argument to svnfs as it is not expected
svn path=/nixpkgs/trunk/; revision=21186
2010-04-20 17:06:27 +00:00
Yury G. Kudryashov 7a3f602580 Get rid of decibel and tapioca-qt
It never worked, and nothing use it.

svn path=/nixpkgs/trunk/; revision=21185
2010-04-20 17:06:19 +00:00
Lluís Batlle i Rossell 71760b99a5 Fixing the opencv build. As it builds with cmake, it also benefits from 'stdenv2'
to build properly.

svn path=/nixpkgs/trunk/; revision=21184
2010-04-20 15:09:56 +00:00
Rob Vermaas fbc33c5485 maven-build.nix: added extraMvnFlags argurment
svn path=/nixpkgs/trunk/; revision=21181
2010-04-20 14:32:07 +00:00
Sander van der Burg 3921737991 Upgraded jdk to 1.6.0_20
svn path=/nixpkgs/trunk/; revision=21180
2010-04-20 11:29:40 +00:00
Sander van der Burg fb6e817495 SIP 4.10 and PyQt 4.7 are now the default versions
svn path=/nixpkgs/trunk/; revision=21179
2010-04-20 09:36:57 +00:00