Commit Graph

27257 Commits

Author SHA1 Message Date
Mathijs Kwik
6937609391 clucene_core: upgrade some packages to clucene_core_2
on my systems, I can now override "clucene_core = clucene_core_2" globally in nixpkgs.
so perhaps we can soon drop v1?
2013-07-01 07:52:13 +02:00
Mathijs Kwik
fe622f6523 upgrade some packages to libusb1
on my systems, I can now override "libusb = libusb1" in all of nixpkgs
so perhaps we can soon drop libusb 0.1 support?
2013-07-01 07:52:13 +02:00
Shea Levy
270ba268d7 Add HYPERVISOR_GUEST for linux 3.10
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-30 21:42:51 -04:00
Shea Levy
0d8025c612 Linux 3.10
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-30 20:55:21 -04:00
Vladimír Čunát
cffec59612 cairo: no openGL on darwin by default (see #692) 2013-06-30 10:47:44 +02:00
Michael Raskin
6d42b3b1dc srtp: fix URL 2013-06-30 12:09:42 +04:00
Jason "Don" O'Conal
1ebaebbd93 php-xdebug: update to latest version 2013-06-30 02:51:20 +02:00
Rob Vermaas
f01588653c Update get_iplayer to 2.83, and fix the package. 2013-06-29 20:50:44 +02:00
Bjørn Forsman
ae1c5a5844 python-demjson: add missing license (LGPLv3 or later) 2013-06-29 20:33:58 +02:00
Bjørn Forsman
33717c4636 python-demjson: new package
demjson is a Python JSON module that reads, writes and validates
JSON-encoded data; compliant with RFC 4627.

It also includes a lint checker, jsonlint, which can be used to validate
JSON documents for strict conformance to the RFC specification; as well
as to reformat them, either by re-indenting or for minimal/canonical
JSON output.

Homepage: http://deron.meranda.us/python/demjson/
2013-06-29 20:17:09 +02:00
Domen Kožar
13017198de Merge pull request #688 from bencahill/master
rmlint: Install to /bin, not /usr/bin
2013-06-29 10:12:39 -07:00
Domen Kozar
175eb450cd Revert "fix rmlint"
This reverts commit 18ddfda81a.
2013-06-29 19:12:11 +02:00
Domen Kozar
efa4aac21e dd-agent: ab14fde6f9 -> 3.8.0 2013-06-29 18:46:37 +02:00
Domen Kozar
18ddfda81a fix rmlint 2013-06-29 18:43:17 +02:00
Domen Kožar
8fb90b71aa Merge pull request #682 from lovek323/vim-debugger
vim-xdebug: add expression
2013-06-29 09:32:03 -07:00
Lluís Batlle i Rossell
e20244fcf7 Fixing linphone crossed lib versions on libosip. 2013-06-29 16:59:08 +02:00
Lluís Batlle i Rossell
169c8ce3f7 Linphone 3.6.1
Lots of updates and new/old libs to get the latest linphone

It segfaults on running.
2013-06-29 16:59:08 +02:00
Domen Kožar
26e9afaa28 Merge pull request #658 from aristidb/master
Pulseaudio 4.0 (and sbc 1.1)
2013-06-29 07:57:18 -07:00
Lluís Batlle i Rossell
7c74edc9bc sipwitch: update to 1.6.1 to fix build 2013-06-29 15:30:05 +02:00
Lluís Batlle i Rossell
a6c1edf947 Updating pjsip to 2.1 2013-06-29 15:14:02 +02:00
Lluís Batlle i Rossell
748a0f607b Updating siproxd to 0.8.1, and libosip. 2013-06-29 15:14:02 +02:00
Bjørn Forsman
b02b7bd162 sqlite: set meta.platforms so that Hydra will build it
I'm sure that sqlite works on more platforms than linux, but I cannot
verify that myself (I only have linux). So I'll leave it up to the users
of other platforms to expand this as needed.
2013-06-29 13:36:08 +02:00
Domen Kožar
f82ba5a2ca Merge pull request #661 from lovek323/php53-xdebug
php53-xdebug: add expression
2013-06-29 03:56:06 -07:00
Domen Kožar
f33ebf88b9 Merge pull request #650 from lovek323/php53
php53: fix on darwin
2013-06-29 03:53:26 -07:00
Domen Kožar
2f643d43d2 Merge pull request #679 from iyzsong/retroarch
add retroarch 0.9.9
2013-06-29 03:28:40 -07:00
Domen Kožar
8971ceeb15 Merge pull request #684 from qknight/mcrypt
added mcrypt
2013-06-29 03:26:40 -07:00
Shea Levy
f3f447ac6f ledger3: Update
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-28 20:16:39 -04:00
Benjamin Cahill
baf822a287 rmlint: Install to /bin, not /usr/bin 2013-06-28 16:48:40 -05:00
Rob Vermaas
4278f778b4 Improve error message for option that is not defined and has now default value. 2013-06-28 21:34:33 +02:00
Vladimír Čunát
9404b2cc12 qt3: fix infinite recursion created by 0b17251c06 2013-06-28 08:33:43 +02:00
aszlig
bf94beff42
chromium: Update dev channel to v29.0.1547.0.
Build tested and works on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-28 07:54:12 +02:00
Karn Kallio
b394ffc3ad racket: fix build broken by new libpng version and advance version to 5.3.5 2013-06-28 07:29:51 +02:00
aszlig
b2973d3b07
python-packages: Add nixpart version 0.1.
This version is preliminary because it quite heavily depends on pykickstart
(through blivet) and the roadmap is to have a nice NixOS attrset-based
specification of partitions.

Currently the main purpose for this is in preparation for the Hetzner nixops
backend, but we might want to make this part of the standard NixOS installer.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-28 04:26:10 +02:00
aszlig
08a9a9b020
radeon-juniper: Update to new JUNIPER_rlc.bin.
Kinda icky to not have archives available here, but I got an error during VM
tests because of an sha256sum mismatch, hence the update. Maybe Hydra has cached
this?

And yes, I checked twice, it wasn't a broken download - there really *is* a new
upstream version available.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-28 04:26:09 +02:00
aszlig
082252bc16
python-blivet: Fix pvscan to not require lvmetad.
The --cache argument to pvscan won't work on NixOS, for specifics about this,
please have a look at:

http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg310821.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-28 04:26:09 +02:00
aszlig
64d2bbc7e8
python-blivet: Patch in paths for mount and lsof.
This adds the correct store paths for mount, umount and lsof to blivet as these
commands are still generic enough to _not_ add them as a dependency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-28 04:26:09 +02:00
aszlig
e3c4acb3dd
python-nevow: Fix indentation of expression.
No functionality change, the expression just got a bit too far to the right :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-28 04:26:08 +02:00
aszlig
7c24918a5f
python-blivet: Fix path and call to wipefs.
First of all, the path to wipefs didn't work at all, and though it is
documented, the "-f" flag only works when used as a long option ("--force").
This is probably fixed upstream in util-linux, but using the long-option will
stay compatible.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-28 04:26:08 +02:00
Mathijs Kwik
ffddc1be9f eclipse: use latest cairo/gtk
Eclipse seems to work fine without this now (after x-updates merge).
2013-06-27 21:35:22 +02:00
Mathijs Kwik
d51c01ac8e firefox 22: use system libpng 2013-06-27 21:35:22 +02:00
Mathijs Kwik
f7b3032da7 ffmpeg-1.x: passthrough vdpauSupport 2013-06-27 21:35:22 +02:00
Mathijs Kwik
bf61d25dac kde 4.10: option to use a libcanberra with gtk support
by default (as it was before), kde depends on a libcanberra with its
gtk dependency removed so a kde system can be gtk-free.

However, both firefox and chromium depend on gtk+ and libcanberra too.
So this leads to 2 versions being installed. this option combats that
by letting the kde use the other libcanberra
2013-06-27 21:35:22 +02:00
Mathijs Kwik
e78b013fe3 libpng: merge apng expression (keep patch disabled by default)
I made sure no rebuild will happen because of this.
Unfortunately this meant merging attrsets instead of just using an
optionalString for postPatch
2013-06-27 21:35:21 +02:00
Mathijs Kwik
0b17251c06 libpng: keep versioning in all-packages.nix, not in individual expressions 2013-06-27 21:35:21 +02:00
Mathijs Kwik
7f413e4d5c whitespace cleaning 2013-06-27 21:35:21 +02:00
Vladimír Čunát
0689016e3e liferea: add -- A GTK-based news feed reader 2013-06-27 20:43:56 +02:00
Vladimír Čunát
38a59aa953 maintainers: change my attrname to be uniform 2013-06-27 20:43:56 +02:00
Rickard Nilsson
916fc48210 moderntimeline: Add extra source URL 2013-06-27 17:49:19 +02:00
Sander van der Burg
9936b7c230 disnix: push to latest 0.3 development release 2013-06-27 15:32:11 +02:00
Eelco Dolstra
2d521d8404 google-talk-plugin: Enable screen sharing 2013-06-27 14:27:46 +02:00
Joachim Schiele
4d3c59f454 added AES crypt 2013-06-27 13:44:29 +02:00
Eelco Dolstra
989c58eb29 Process /etc/fonts/conf.d before upstream fonts/conf.d
Otherwise the user won't be able to override anything specified in
NixOS' /etc/fonts/conf.d, since ~/.config/fontconfig is included from
upstream fonts/conf.5/50-user.conf.
2013-06-27 13:31:35 +02:00
Rickard Nilsson
4800a33b88 Linux 3.4: Doesn't support CONFIG_RC_DEVICES option 2013-06-27 12:13:27 +02:00
Joachim Schiele
b0c946a86a added mcrypt 2013-06-27 12:04:57 +02:00
Domen Kožar
43130a432d Merge pull request #681 from offlinehacker/mrbob_fix
python-mrbob: Make it work, update to 0.1a9 and update python-six to 1.3.0
2013-06-26 23:57:12 -07:00
Evgeny Egorochkin
25cffccc28 Fix binutils_deterministic to not break evaluation in certain cases. Quite a sneaky bug! 2013-06-27 09:50:52 +03:00
Jason "Don" O'Conal
72afda56d5 vim-xdebug: add expression 2013-06-27 11:21:11 +10:00
Jaka Hudoklin
84a4d03b51 python-mrbob: fix it and update to 0.1a9 2013-06-27 00:36:28 +02:00
Jaka Hudoklin
81a0a3d458 python-six: Update to 1.3.0 2013-06-27 00:35:47 +02:00
Lluís Batlle i Rossell
5ff3d84137 Adding sflphone.
Merge branch 'sflphone'
2013-06-27 00:10:13 +02:00
Lluís Batlle i Rossell
538a1d3aa1 Making sflphone build, and its gnome client too. 2013-06-27 00:09:26 +02:00
Lluís Batlle i Rossell
53f38dcbd0 Adding partially sflphone (only daemon, maybe failing to build) 2013-06-26 23:48:55 +02:00
Lluís Batlle i Rossell
d3e7649eee Update ucommon to 6.0.5.
The hope that newer means better.
2013-06-26 23:47:34 +02:00
Lluís Batlle i Rossell
c77f6a0c2f As libccrtp propagates ucommon, it's not needed in libzrtpcpp. 2013-06-26 23:47:09 +02:00
Lluís Batlle i Rossell
3d8cd48c58 Making ccrtp propagate its build time requirement, ucommon. 2013-06-26 23:46:47 +02:00
David Guibert
0db328dde0 String::ToIdentifier::EN: Update to 0.10 2013-06-26 13:37:40 +02:00
Song Wenwu
1e7e9c583d add retroarch 0.9.9 2013-06-26 19:25:09 +08:00
Eelco Dolstra
896da1bf8a Fix reference to firefox21 2013-06-26 11:24:10 +02:00
Moritz Ulrich
978fa98933 avrdude: Add libusb to enable USB support 2013-06-25 22:19:31 +02:00
Rickard Nilsson
489040bf58 Linux 3.2: Doesn't support CONFIG_RC_DEVICES option 2013-06-25 22:17:13 +02:00
Eelco Dolstra
94d9f18e47 firefox: Update to 22.0 2013-06-25 20:58:25 +02:00
Eelco Dolstra
9da4ccaf3d firefox: Rename 21.0.nix to default.nix 2013-06-25 20:58:25 +02:00
Eelco Dolstra
1802152e93 Remove Firefox 20.0 2013-06-25 20:58:25 +02:00
Rickard Nilsson
b7ccfc258a Linux 3.2-3.9: Add CONFIG_RC_DEVICES=y, to enable IR devices that can be used by lirc/devinput 2013-06-25 20:13:11 +02:00
Rickard Nilsson
e382e34f51 qemu: Enable support for VDE networking 2013-06-25 19:47:17 +02:00
Evgeny Egorochkin
9dc3599960 Merge pull request #676 from errge/master
Add regex-tdfa-text
2013-06-25 05:17:34 -07:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
Eelco Dolstra
cbf2526bfd Add nixops 2013-06-25 14:12:16 +02:00
Gergely Risko
9b2a657f42 Add regex-tdfa-text 2013-06-25 13:01:41 +02:00
Rickard Nilsson
0dbb2fdcfe sbt: Remove duplicate package 2013-06-25 12:32:28 +02:00
Rickard Nilsson
8496b31e34 sbt: Use recommended java options 2013-06-25 12:31:44 +02:00
Rickard Nilsson
9e85628fb9 mkpasswd: Update to 5.0.25 2013-06-25 12:20:11 +02:00
Rickard Nilsson
266da813a3 spotify: Update to 0.9.1.55 2013-06-25 12:20:11 +02:00
Rickard Nilsson
270da328b9 qemu: Enable virtfs
This makes it possible to share host directories to qemu guests
using 9P.
2013-06-25 12:20:10 +02:00
Rickard Nilsson
97bf9fbbc8 xbmc: Make it read /etc/zoneinfo 2013-06-25 12:20:10 +02:00
Evgeny Egorochkin
6c9838ad54 Rename repeatableStdenv to deterministicStdenv for consistency.
Make it plug more holes to avoid regular binutils sneaking in and ruining builds.
2013-06-25 11:15:46 +03:00
Evgeny Egorochkin
92a48cb305 Add gcc4.6 wrapped using deterministic binutils 2013-06-25 11:15:45 +03:00
Evgeny Egorochkin
0889bbe88f Patch binutils to produce more deterministic output 2013-06-25 11:15:45 +03:00
Evgeny Egorochkin
f22880408e Kindly ask strip to not mess up timestamps in static libraries 2013-06-25 11:15:45 +03:00
Song Wenwu
f305fe1c02 kmplayer: minor fixes
Wrap mplayer into PATH
Remove unneeded dependency on gtk
2013-06-25 07:32:04 +08:00
aszlig
86d14a5ab2
pykickstart: Run test cases in order of name.
This should ensure the test casnes are always running in the same order,
regardless of the target machine. We're just using the class name here, which
should be sufficient enough to address the issue.

Now the following build should be fixed:

http://hydra.nixos.org/build/5425811

Big thanks to @rbvermaa for being a *really* great help debugging the problem
quickly, because I couldn't reproduce it here (the run order of the test cases
on my machine were 'accidentally' right).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-24 14:06:30 +02:00
aszlig
f04b0db6d3
python-pyparted: Fix test cases for 32bit systems.
Fixes http://hydra.nixos.org/build/5425941

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-24 12:36:44 +02:00
aszlig
b0f4ae64c2
python-packages: Add blivet version 0.16-1.
This still doesn't have all possibly required dependencies, but at least we can
do basic partitioning, which is our primary goal. At least when it comes to the
Hetzner target of nixops. But even for partitioning when installing NixOS this
library could be _very_ useful.

Test cases currently don't work because they're filled with syntax errors and
some references to the mocking library are missing.

As you can see in propagatedBuildInputs, here are the promised overrides for
Python support of libselinux and cryptsetup.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-24 10:33:18 +02:00
aszlig
b785a7192e
cryptsetup: Allow to build with Python support.
This again is only optional to avoid too much dependencies when bootstrapping
small systems or when constrained to RAM disks of lower size. It is needed for
blivet as well, which will override the option in its dependency list.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-24 10:33:18 +02:00
aszlig
e7c4273cb9
python-packages: Add pyblock in version 0.52.
This is needed for blivet in order to work with dmraid and lvm.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-24 10:33:17 +02:00
aszlig
8c46977941
python-packages: Add pyudev in version 0.16.1.
Thought this would be needed for blivet, but it wasn't the case. They seem to
have their own mini-implementation. But it might be useful for other Nixers, who
knows?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-24 10:33:17 +02:00
aszlig
b574d0146f
libselinux: Add option to enable Python support.
The reason this is optional is because we might want to use it for bootstrapping
in some constellations. And we really don't want whole lot of dependencies in
those situations.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-24 10:33:17 +02:00
aszlig
c53918b6f1
python-packages: Add pykickstart version 1.99.32.
Needed for blivet and this is part of Anaconda (Fedora's installation system).
The reason I'm packaging this is because of blivet and because it's quite well
decoupled from Anaconda itself, so it can be used for other purposes.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-24 10:33:16 +02:00
aszlig
63c937ba06
python-packages: Add new package pyparted v3.10.
This is one of our required dependencies for the soon-to-be-packaged blivet
library.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-24 10:33:16 +02:00
aszlig
5228e569e8
gpgme: Update to latest upstream version 1.4.1.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-24 10:33:16 +02:00
aszlig
4e10617bc4
winswitch: Basic somewhat working version.
Wow, this is one of the most dangerous programs I've seen in a while. It not
only tries to probe for a package manager to install dependencies but also
tries to execute a whole bunch of programs in $PATH. That's why I decided to
override the postFixup phase for now in order to get rid of the current $PATH
and meanwhile getting the basics working.

So, I'm still not sure how to do the best implementation here on NixOS without
allowing winswitch to be too invasive and without restricting it too much so
that it's of no use.

But let's figure that out once we trimmed down the radiation level of this
"living" thing ;-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-24 10:33:15 +02:00
Domen Kožar
2e212d5c58 Merge pull request #671 from bjornfor/virtualbox
virtualbox-guestadditions: fix xorg incompatibility
2013-06-23 08:10:33 -07:00
Mathijs Kwik
c913054748 linux-3.2: upgrade to 3.2.47 2013-06-23 17:00:06 +02:00
Mathijs Kwik
e387731b82 youtube-dl: upgrade to 2013.06.21 2013-06-23 16:26:37 +02:00
Domen Kožar
ab3c2b4678 Merge pull request #670 from iyzsong/smplayer
add smplayer 0.8.5
2013-06-23 07:24:49 -07:00
Vladimír Čunát
6c86398ff3 virtualbox: minor update, lock versions with guest-additions
I saw no reason to use requireFile, it seems normally downloadable.
2013-06-23 16:14:31 +02:00
Song Wenwu
4cad420d5c smplayer: add platform and set license to stdenv.lib.licenses.gpl3Plus 2013-06-23 21:26:43 +08:00
Vladimír Čunát
45f7b9c319 virtualbox: make guest additions use driver according to xserver version 2013-06-23 14:16:21 +02:00
Bjørn Forsman
43c9ab900b virtualbox-guestadditions: fix xorg incompatibility
A recent X update broke VirtualBox guest additions (vboxvideo driver version
mismatch, desktop won't start). This fixes it.

Here is the error log:

 (II) "glx" will be loaded by default.
 (II) LoadModule: "glx"
 (II) Loading /nix/store/kzvmnjlps51q4piqmwr7zbmxcg2z9vgk-xorg-server-1.13.4/lib/xorg/modules/extensions/libglx.so
 (II) Module glx: vendor="X.Org Foundation"
 	compiled for 1.13.4, module version = 1.0.0
 	ABI class: X.Org Server Extension, version 7.0
 (==) AIGLX enabled
 Loading extension GLX
 (II) LoadModule: "vboxvideo"
 (II) Loading /nix/store/4kbxi00h8xsmfgbws2qqh674lcfp03h6-VirtualBox-GuestAdditions-4.2.14-3.2.46/lib/xorg/modules/drivers/vboxvideo_drv.so
 (II) Module vboxvideo: vendor="Oracle Corporation"
 	compiled for 10.12.0, module version = 1.0.1
 	Module class: X.Org Video Driver
 	ABI class: X.Org Video Driver, version 12.0
 (EE) module ABI major version (12) doesn't match the server's version (13)
 (II) UnloadModule: "vboxvideo"
 (II) Unloading vboxvideo
 (EE) Failed to load module "vboxvideo" (module requirement mismatch, 0)
 (II) LoadModule: "vboxmouse"
 (WW) Warning, couldn't open module vboxmouse
 (II) UnloadModule: "vboxmouse"
 (II) Unloading vboxmouse
 (EE) Failed to load module "vboxmouse" (module does not exist, 0)
 (EE) No drivers available.

Fatal server error:
 no screens found
2013-06-23 13:06:03 +02:00
Song Wenwu
48e1e1cae6 add smplayer 0.8.5 2013-06-23 17:48:21 +08:00
Peter Simons
0205496d80 Merge pull request #667 from bjornfor/remake
remake: bump from version 3.81+dbg-0.2 to 3.82+dbg-0.6
2013-06-23 01:25:25 -07:00
Song Wenwu
c74b3e26f7 kmplayer: update to 0.11.3d 2013-06-23 14:53:18 +08:00
Domen Kozar
2c8acd9cec oiio: 1.1.8 -> 1.1.12 2013-06-23 00:11:50 +02:00
Aristid Breitkreuz
dbda1a2989 libcap needs to be a propagated build input for pulseaudio 2013-06-22 22:59:55 +02:00
Bjørn Forsman
860161dcb7 remake: bump from version 3.81+dbg-0.2 to 3.82+dbg-0.6
This version needs readline. And the license is GPLv3. Also, add
meta.platforms and meta.maintainers attributes.
2013-06-22 21:09:43 +02:00
Aristid Breitkreuz
ad06d4df18 update pulseaudio to 4.0 and sbc to 1.1 2013-06-22 17:25:47 +02:00
Peter Simons
01bc9204e0 git-annex: fix installation of git-annex-shell 2013-06-22 15:41:37 +02:00
Peter Simons
819dbd2539 haskell-hledger-irr: add version 0.1.1.2 2013-06-22 15:41:37 +02:00
Domen Kožar
7a4b10a51c Merge pull request #665 from offlinehacker/memtest_fix
memtest86: udpate to 4.1.0, fix download url
2013-06-22 05:23:11 -07:00
Domen Kožar
b1b70a02d9 Merge pull request #666 from offlinehacker/python_supervisor
Add supervisor, a system for controlling process state under UNIX
2013-06-22 05:22:54 -07:00
Jaka Hudoklin
2f4d1a5656 memtest86: udpate to 4.1.0, fix download url 2013-06-22 14:11:47 +02:00
Jaka Hudoklin
7b924a9ac4 Add supervisor, a system for controlling process state under UNIX 2013-06-22 14:10:10 +02:00
Peter Simons
933f77f10d Merge pull request #662 from rnons/yesod-bin
yesod-bin: as of yesod 1.2, binaries are kept in yesod-bin.
2013-06-22 05:09:35 -07:00
Evgeny Egorochkin
09e6ae577b Python: add DETERMINISTIC_BUILD env var. If set, python doesn't write timestamps to pyc files. Tested by
building argparse, compiling from cli, compiling using py_compile.
2013-06-22 09:45:01 +03:00
Shea Levy
a3bf1ca3b1 Linux 3.9.7
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-21 17:21:03 -04:00
Domen Kozar
dbe9bf7e59 networkmanagerapplet: 0.9.8.0 -> 0.9.8.2
Upgraded because some icons weren't displaying. Also adds new
dependency libsecret.
2013-06-21 19:59:20 +02:00
Evgeny Egorochkin
a0ba1a20e9 Add a stdenv version which tries harder to make builds repeatable. 2013-06-21 18:22:07 +03:00
Evgeny Egorochkin
76fbbb73c6 Make most of Ruby Gem builds repeatable 2013-06-21 18:22:07 +03:00
rnons
f84119331c yesod-bin: as of yesod 1.2, binaries are kept in yesod-bin. 2013-06-21 22:55:37 +08:00
aszlig
467608f614
synergy: Only pass cryptopp on Linux platforms.
The second failure, and the last one I'm going to try today:

http://hydra.nixos.org/build/5404634

On the bright side there is at least the fact that version 1.4.10 has failed on
Darwin already, so I guess we don't have a lot of Mac users using Synergy.

Latest (failed) build of 1.4.10:

http://hydra.nixos.org/build/5359408

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 13:46:22 +02:00
aszlig
cfd284443e
synergy: Use bundled crypto++ on non-Linux archs.
Seems that crypto++ in nixpkgs doesn't build on Darwin, so let's use bundled
crypto++ until the version in nixpkgs works well.

This refers to the following build:

http://hydra.nixos.org/build/5404516

Hopefully, this will fix it on Mac OS X, because I don't have a Darwin machine
for testing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 13:21:43 +02:00
aszlig
467962b185
synergy: Take over maintenance.
I'm heavily using synergy for daily work, so I'm most probably going to watch
out for changes/improvements/bugs :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:18:21 +02:00
aszlig
60ba4485b1
zabbix2: Add optional XMPP support using iksemel.
This uses recurseForDerivations directly after using callPackage magic to ensure
that the input attributes can be overriden *and* nix-env shows the package as in
recurseIntoAttrs.

The reason for making this optional is because there probably is only a minority
of people who want to use XMPP and we don't want to introduce an additional
dependency for the majority, do we?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:56 +02:00
aszlig
f974573a5e
iksemel: Add new package with version 1.4.
This library is used by Zabbix in order to send XMPP alerts/notifications.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:55 +02:00
aszlig
b0601f6d6f
chromium: Update all channels to latest versions.
Chromium 28.0.1500.52 finally is stable, so the release channels are now:

stable: 28.0.1500.52 (builds fine, tested)
beta:   28.0.1500.52 (same as stable)
dev:    29.0.1541.2  (patch rebased, builds fine, tested)

The user namespace patch doesn't apply for version 29, so I had to rebase it
against the current trunk (revision 207742).

And as version 27 is outdated, we no longer need to distinguish versions for
patching the hardcoded gcc path in core/core.gypi.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:55 +02:00
aszlig
1709571b3f
ninja: Update to v1.3.4 and drop unzip dependency.
Version 1.2.0 is way too old in order to build the latest chromium (29) version,
so let's get it up to date (especially because no other package is referencing
ninja, so it should be non-critical).

The dependency on unzip is not needed here, because GitHub also provides
archives in tar.gz format.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:55 +02:00
aszlig
8b425e2ae3
chromium: Mark beta and dev versions lowPrio.
I'm still wondering why noone has reported this, but I found out about this
while trying to introduce someone to NixOS, eventually wondering why it is going
to install version 29 when using "nix-env -i chromium".

So, in hope that everyone out there using the package is using the attribute,
let's make _stable_ the default here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:54 +02:00
aszlig
e0ea957d64
php53: Don't use bundled version of libgd.
This fixes a copy & paste error I made in 486e918, which resulted in PHP being
built with the bundled version of GD instead of the one we have in nixpkgs.

Thanks to @peti for noticing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:54 +02:00
aszlig
9a37a306b8
synergy: Enable unit tests.
Integration tests don't seem to work right now, so let's see if we can figure
out a way to enable them later. But at least running unit tests is better than
not running any tests :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:54 +02:00
aszlig
d9e0c355a0
synergy: Add support for Xinput2.
This is needed in order to support devices such as gamepads or tablets.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:53 +02:00
aszlig
ea4afb73d8
synergy: Add support for XrandR.
Nowadays, multiple monitor setups are quite common, so I suppose we'd want
support for that. Especially because users might get confused if synergy is
unable to pick the right screen resolution and thus cause edges to be cut off
from the available pointing area.

The postPatch hook is to force cmake into thinking that we have XRRNotifyEvent,
which we _do_ have with the xrandr version shipped in nixpkgs. Automatic
detection from CMakeLists.txt fails here because it tries to search for the
symbol within the libX11 store path.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:53 +02:00
aszlig
57dee2a27e
synergy: Update to new upstream version 1.4.12.
This brings in support for encryption and thus requires the crypto++ library as
an additional dependency. Unfortunately the upstream integration isn't quite the
way we'd like it to be, so we need to add a small patch to ignore the bundled
version and use the package from nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:53 +02:00
Lluís Batlle i Rossell
1b8548fc72 Updating umurmur to 0.2.13
Now opus works.
2013-06-21 12:16:15 +02:00
Lluís Batlle i Rossell
34cf9baaa6 Update mumble to 1.2.4
Now it should have opus. The source code of opus comes with mumble.
2013-06-21 11:10:41 +02:00
Domen Kožar
9177be20b6 Merge pull request #660 from lovek323/vim-coffee-script
vim-coffee-script: add expression
2013-06-20 23:21:47 -07:00
Domen Kožar
5a0902456e Merge pull request #648 from lovek323/vim
vim_configurable: fix python on darwin
2013-06-20 23:19:51 -07:00
Jason "Don" O'Conal
d195372eba php53-xdebug: add expression 2013-06-21 15:12:21 +10:00
Jason "Don" O'Conal
60fd718856 vim-coffee-script: add expression 2013-06-21 15:11:07 +10:00
Lluís Batlle i Rossell
b38308553b Adding cjdns.
The executable runs; I haven't tried to run a node.
2013-06-20 20:53:37 +02:00
Vladimír Čunát
2cfbe7b292 wpa_supplicant: update 1.1 -> 2.0
It works fine for me, GUI as well.
2013-06-20 19:13:29 +02:00
Lluís Batlle i Rossell
3b67955fcf skype: update from 4.1.0.20 to 4.2.0.11 2013-06-20 17:13:46 +02:00
Shea Levy
97b95d60d8 Chromedriver: update to 2.0
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-20 09:21:25 -04:00
Vladimír Čunát
87fca9cf72 audacious: update 3.2.2 -> 3.3.4, now needs gtk3
Also build on Linux platforms.
Seems to work fine for me.
2013-06-20 14:24:19 +02:00
Domen Kozar
ebd26e2d67 tarman: 1.0 -> 1.0.1 2013-06-20 13:43:32 +02:00
Peter Simons
8c2b28b4a6 haskell-mongoDB: update to version 1.4.1 2013-06-20 12:37:54 +02:00
Peter Simons
b2b6c81d4c haskell-ghc-heap-view: update to version 0.5.1 2013-06-20 12:37:54 +02:00
Peter Simons
513d717d47 Merge pull request #654 from lovek323/sup
sup: update to latest version
2013-06-20 03:09:46 -07:00
Jason "Don" O'Conal
a7746e3585 php53: restore nix gd version 2013-06-20 19:58:00 +10:00
Jason "Don" O'Conal
6ae1241934 php53: add optional pcntl flag 2013-06-20 17:42:09 +10:00
Domen Kožar
a80642ccbf Merge pull request #656 from offlinehacker/amdappsdk_fix
amdappsdk: Fix download urls and some other things, so derivations for older sdk versions now build succesfully
2013-06-19 23:57:51 -07:00
Evgeny Egorochkin
8cb0da5dd1 Merge pull request #653 from lovek323/irssi
irssi: fix build on darwin
2013-06-19 19:37:04 -07:00
Evgeny Egorochkin
7ddbfaed8e Merge pull request #652 from lovek323/guile
guile: remove gcc_s dep, skip check on darwin
2013-06-19 19:30:45 -07:00
Jaka Hudoklin
d16f175934 amdappsdk: Fix download urls and some other things, so derivations for older sdk versions now build succesfully 2013-06-20 02:22:18 +00:00
Jason "Don" O'Conal
cf2b5daa15 sup: update to latest version 2013-06-20 10:09:15 +10:00
Jason "Don" O'Conal
657ef3959b irssi: fix build on darwin
* use `gccApple` (so we can cope with `-no-cpp-precompile`)
* add `libintlOrEmpty`
2013-06-20 09:25:54 +10:00
Jason "Don" O'Conal
438034483a guile: remove gcc_s dep, skip check on darwin 2013-06-20 09:11:04 +10:00
Jason "Don" O'Conal
f4d648ed5c shishi: fix compilation on darwin 2013-06-20 09:08:09 +10:00
Lluís Batlle i Rossell
5f28fb15af Note about the source of previous build fix in glext85 2013-06-19 17:38:38 +02:00
Lluís Batlle i Rossell
d4aa6099bd Fixing vaapi-vdpau build with newer mesa. 2013-06-19 17:33:44 +02:00
Lluís Batlle i Rossell
4c6a981070 Adding 'weka'. 2013-06-19 16:19:06 +02:00
Peter Simons
962e2aede8 haskell-postgresql-simple: update to version 0.3.3.2 2013-06-19 10:42:43 +02:00
Peter Simons
c7097891e0 haskell-persistent-template: update to version 1.2.0.2 2013-06-19 10:42:43 +02:00
Peter Simons
f14d6839b1 haskell-hakyll: update to version 4.3.1.0 2013-06-19 10:42:43 +02:00
Peter Simons
5e5b04d00a haskell-JuicyPixels: update to version 3.1 2013-06-19 10:42:43 +02:00
Peter Simons
7154e32f65 Dropped obsolete Haskell packages primitive-0.4.1, vector-0.9.1, and vector-0.10. 2013-06-19 10:42:42 +02:00
Vladimír Čunát
4255b343e8 pango, gtk3: non-Linux attempts to fix 2013-06-19 09:00:06 +02:00
Evgeny Egorochkin
6b4eaf71fe Merge pull request #636 from craff/glsurf
Glsurf (3D drawing of implicit surfaces and curves)
2013-06-18 22:34:08 -07:00
Jason "Don" O'Conal
ed3a63b5d7 php53: fix on darwin
* add libssh2 to build inputs (configure fails without this)
* link with stdc++
* add icu/lib directory to DYLD_LIBRARY_PATH (and wrap binaries with this
  environment variable
* add libiconv to build inputs
* fix --with-iconv configure flag (was --with-iconv-dir which is not a valid
  flag)
2013-06-19 14:15:55 +10:00
Christophe Raffalli
102216f8c9 Drop useless dependencies in glsurf 2013-06-19 05:03:42 +02:00
Christophe Raffalli
101aad1467 camlimages ... still wasn't ok. Now better. 2013-06-19 04:39:55 +02:00
Evgeny Egorochkin
e77a7d21dc Fix attr name to match version 2013-06-19 05:15:05 +03:00
Jason "Don" O'Conal
719b488b10 vim_configurable: fix python on darwin
* was not linking to the correct python library on darwin (using the OS
  X framework, which is not what we want)
2013-06-19 12:06:55 +10:00
Evgeny Egorochkin
f5f76e6446 ocamlPackages.deriving: fix version 2013-06-19 03:20:00 +03:00
Evgeny Egorochkin
ec349e58b7 Merge pull request #647 from ocharles/vector-0.9.1
haskellPackages: vector-0.9.1 fix 'primitive' dependency
2013-06-18 17:18:11 -07:00
Evgeny Egorochkin
bfd5bc0ba7 Merge pull request #645 from errge/master
Update xpra to 0.9.5
2013-06-18 17:16:30 -07:00
Marc Weber
d25d1e4d24 ocaml adding deriving 2013-06-19 03:07:27 +03:00
Marc Weber
ccb2e9a832 Adding multiple versions of sbt. Probably you want to use the latest(default). 2013-06-19 02:45:40 +03:00
Oliver Charles
81b564b52e haskellPackages: vector-0.9.1 fix 'primitive' dependency 2013-06-19 00:28:30 +01:00
Moritz Ulrich
4d60fa66f1 Add sha256 for python-obfsproxy.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-06-19 01:02:57 +02:00
Vladimír Čunát
e366dc565a Fix the hash changes accidentally caused in 98436616
Moreover I'm not sure It's legal to add *lists inside* buildInputs.
2013-06-18 23:59:23 +02:00
Vladimír Čunát
1f81984293 non-Linux: more adjustments
Also reordered stuff in all-packages.nix.
2013-06-18 23:59:23 +02:00
Lluís Batlle i Rossell
83dee22f4a Fixing a crash bug in dropbear. 2013-06-18 23:35:53 +02:00
Lluís Batlle i Rossell
ae98b61850 dropbear: update to 2013.58, and build dynamically
I had to do a trick with GNU make, to allow it to find libs.
2013-06-18 23:35:53 +02:00
Vladimír Čunát
f0417726d1 Merge pull request #533 from MarcWeber/submit/eclipses
eclipse: add latest stable eclipse (sdk), fix 3.7 urls, introducing more...
2013-06-18 14:20:10 -07:00
Domen Kozar
35431a7d7b libgnomeprint: build on linux 2013-06-18 22:50:15 +02:00
Domen Kozar
d7be74adc0 acpid: build on linux 2013-06-18 22:48:34 +02:00
Domen Kozar
1a23f715f4 tig: built for linux 2013-06-18 22:42:12 +02:00
Vladimír Čunát
2058d95eb4 non-Linux platforms: extend to some important pkgs 2013-06-18 22:03:35 +02:00
Vladimír Čunát
3cba755596 qt48: minimize default dependencies on non-Linux 2013-06-18 22:03:35 +02:00
Sander van der Burg
98436616a5 Replaced ad-hoc gettext buildinput by libintlOrEmpty 2013-06-18 22:01:40 +02:00
Vladimír Čunát
92ecf99373 qt48, gstreamer: attempt to fix on non-Linux 2013-06-18 18:34:25 +02:00
Vladimír Čunát
3adf8e6429 vala, libusb1, deps of libjpeg: attempt to fix on non-Linux 2013-06-18 17:52:09 +02:00
Vladimír Čunát
ab7d7333be dbus: attempt to fix build on FreeBSD and Darwin
Also build it there.
2013-06-18 17:52:09 +02:00
Sander van der Burg
aeaaa0a7e7 libv8 still broken in chroots, but this scons patch script fixes it 2013-06-18 17:14:17 +02:00
Gergely Risko
79c2db389c Update xpra to 0.9.5 2013-06-18 15:36:42 +02:00
Vladimír Čunát
a8f153267c qt48: security fix for CVE-2013-0254
Taken from Gentoo.
2013-06-18 13:57:15 +02:00
Peter Simons
d815e5eba2 gnucash: fix build (by removing the obsolete potfiles patch) 2013-06-18 13:11:03 +02:00
Peter Simons
e006c2fd49 celestia: fix compilation and linking after x-updates merge 2013-06-18 13:11:03 +02:00
Sander van der Burg
1d4c7f50ec libv8 ruby gem has hardcoded reference to /usr/bin/env, so that it won't build in a chroot -> fix this 2013-06-18 13:05:43 +02:00
Domen Kozar
cd1b531867 gnucash: add me as maintainer 2013-06-18 13:04:05 +02:00
Vladimír Čunát
53fa11cfc9 poppler: attempt to fix missing libiconv on non-Linux 2013-06-18 12:53:19 +02:00
Peter Simons
efac6d8e73 celestia: help the package find the gtk related libraries 2013-06-18 12:44:24 +02:00
Peter Simons
3e241c3f83 celestia: add patch to support libpng 1.6 2013-06-18 12:44:24 +02:00
Peter Simons
e6c48a73f8 celestia: update hashes for the downloaded patches 2013-06-18 12:44:23 +02:00
Sander van der Burg
37b25a712e Fix graphviz building on darwin 2013-06-18 12:24:40 +02:00
Sander van der Burg
23f43527e1 harfbuzz needs libintl on non glibc platforms 2013-06-18 10:36:28 +02:00
Michael Raskin
4ecbe3bf5d Adding pandas - Python data analsysis library 2013-06-18 11:51:35 +04:00
Jason \"Don\" O'Conal
85bfa943f7 glib: fix on darwin (merge #644)
* include Foundation.h header
* add myself to maintainers
* build with gccApple

@vcunat: minor refactoring.
2013-06-18 08:17:36 +02:00
Evgeny Egorochkin
5de6c72638 Merge pull request #640 from lovek323/pygit
pygit: add DYLD_LIBRARY_PATH to compile on darwin
2013-06-17 22:40:45 -07:00
Evgeny Egorochkin
0e57725261 Merge pull request #633 from lovek323/httpd
apacheHttpd: fix build on darwin
2013-06-17 22:38:29 -07:00
Evgeny Egorochkin
d8806940d6 Merge pull request #641 from lovek323/ruby19
ruby-1.9: disable tk when compiling on darwin
2013-06-17 22:36:44 -07:00
Jason "Don" O'Conal
9b409f2cae tree: fix compilation on darwin 2013-06-18 14:02:21 +10:00
Jason "Don" O'Conal
02eef5b0f4 ruby-1.9: disable tk when compiling on darwin 2013-06-18 13:59:00 +10:00
Jason "Don" O'Conal
f3fade60fc pygit: add DYLD_LIBRARY_PATH to compile on darwin 2013-06-18 13:23:52 +10:00
Evgeny Egorochkin
88eff1efac Merge pull request #619 from lovek323/sdcv
sdcv: add expression
2013-06-17 16:29:53 -07:00
Eelco Dolstra
5bc8275075 nix: Update to 1.5.3 2013-06-18 00:56:00 +02:00
Eelco Dolstra
efde9567d1 flightgear: Remove from channel
It's 264 MiB compressed...
2013-06-17 22:51:37 +02:00
Vladimír Čunát
6bcf790d05 Merge branch 'master' into x-updates 2013-06-17 22:08:16 +02:00
Vladimír Čunát
afdc7fdfb6 fix evaluation on non-Linux, should fix tarball 2013-06-17 22:06:36 +02:00
Vladimír Čunát
0b875c8706 Merge pull request #635 from lovek323/ruby
ruby19: fix on darwin
2013-06-17 10:39:06 -07:00
Domen Kožar
25777d2aca Merge pull request #637 from the-kenny/fix-dropbox-cli
Fix dropbox cli
2013-06-17 08:54:40 -07:00
Domen Kozar
ad14e4c90d add tarman-0.1 2013-06-17 17:53:46 +02:00
Vladimír Čunát
0f7e530c9d mesa_noglu: make it meaningful even on darwin
In future we should change the mess, e.g. have libGL, libGLU and similar
attributes.
2013-06-17 16:14:46 +02:00
Shea Levy
8179bad658 Merge branch 'allow-imports-in-submodules' into upstream-master
This allows submodules to use the full power of the module system.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-17 10:06:08 -04:00
Shea Levy
abfca0ad14 When printing submodule keys, print just the file name if known
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-17 10:05:46 -04:00
Peter Simons
d5dac74d94 gnuplot: update to version 4.6.3 2013-06-17 15:25:03 +02:00
Eelco Dolstra
f83a4dd41d Add Forks::Super 2013-06-17 15:14:40 +02:00
Jason \"Don\" O'Conal
8ce7550a9f cairo-1.12.2: fix pixman include path 2013-06-17 14:14:09 +02:00
Lluís Batlle i Rossell
2c71506929 nlopt: build octave plugins 2013-06-17 12:47:45 +02:00
Vladimír Čunát
cba6d9b11a qt48: I give up, switching off parallel building
I was unable to find a reliable fix for the problems.
I seem to get either this http://hydra.nixos.org/build/5326327/nixlog/1/tail-reload
or that http://hydra.nixos.org/build/5297462/nixlog/1/tail-reload .
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch x-updates
# You are currently rebasing branch 'x-updates' on '81b7f5f'.
#   (all conflicts fixed: run "git rebase --continue")
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   pkgs/development/libraries/qt-4.x/4.8/default.nix
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	core
#	dev.diff
#	pkgs/applications/networking/browsers/firefox/cairo-test.patch
#	pkgs/applications/video/flowblade/
#	pkgs/desktops/gnome-3/core/dconf/
#	pkgs/desktops/gnome-3/core/eog/
#	pkgs/desktops/gnome-3/core/libsecret/
#	pkgs/development/libraries/ncurses/builder.sh
#	pkgs/servers/x11/xorg/download-cache/
#	pkgs/servers/x11/xorg/still-missing.txt
2013-06-17 10:06:23 +02:00
Peter Simons
a33fd118f5 pkgs/top-level/release-haskell.nix: move this file into a separate repository
Hydra doesn't build this file anyway, so there seems to be no point in
having it in Nixpkgs.
2013-06-17 10:00:34 +02:00
Peter Simons
41a0ef966b haskell-Chart: use the homepage URL specified in the cabal file 2013-06-17 09:57:37 +02:00
Gergely Risko
7a602e5f86 Hackage: upgrade Chart to 0.17, timeplot to 1.0.21 and add Chart-gtk 2013-06-17 09:53:28 +02:00
Domen Kožar
50a0d55b3e Merge pull request #638 from offlinehacker/cgminer
Add cgminer, crypto currency mining application and all relevant dependecies
2013-06-16 23:37:31 -07:00
Jaka Hudoklin
4d76f87c13 Add cgminer: gpu, fpga and asic crypto currencies mining application 2013-06-16 21:51:27 +00:00
Eelco Dolstra
da862fb61b Add Net::Amazon::S3
As usual with Perl modules, adding one pulls in 30 more...
2013-06-16 23:45:50 +02:00
Moritz Ulrich
edaca7bdf0 Add myself as a maintainer of dropbox-cli.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-06-16 23:40:43 +02:00
Jaka Hudoklin
a826c359c2 Add amdadl-sdk: amd display library sdk, usefull for ati gpu statistics 2013-06-16 21:39:54 +00:00
Jaka Hudoklin
4817f34f2b Add amdapp-sdk: accelerated parallel processing sdk with OpenCL support 2013-06-16 21:39:43 +00:00
Moritz Ulrich
1570336325 Fix dropbox-cli.
Dropbox doesn't version the CLI. This broke the download. This patch
also fixes the `dropbox-cli start' command.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-06-16 23:38:33 +02:00