Commit Graph

61035 Commits

Author SHA1 Message Date
Tobias Geerinckx-Rice
2252268ee9 pythonPackages.buttersink 0.6.6 -> 0.6.7 2015-10-15 14:22:01 +02:00
Florian Paul Schmidt
729098633c ardour: 4.2 -> 4.3 2015-10-15 14:16:23 +02:00
Mariusz `shd` Gliwiński
eebbf15da9 dex: init at 0.7 2015-10-15 13:58:52 +02:00
Rinaldus
4c626f44d9 wine-{unstable,staging}: update 1.7.48 -> 1.7.52
Close #10238.
2015-10-15 12:01:16 +02:00
Pascal Wittmann
b3bce93ab2 Merge pull request #10397 from teh/master
Use versioned tarball URL for chkrootkit.
2015-10-15 11:24:06 +02:00
Ricardo M. Correia
18cad45480 flashplayer: 11.2.202.521 -> 11.2.202.535 2015-10-15 11:20:38 +02:00
Tom Hunger
ba99563020 Use versioned tarball URL for chkrootkit.
Pointing at the latest version is fragile: Hash updates don't
follow source updates automatically.
2015-10-15 09:56:22 +01:00
Peter Simons
a0376d4666 haskell-conduit: fix build with pre-7.10.x versions of GHC
Thanks to @bennofs for finding this issue!
2015-10-15 10:04:14 +02:00
Peter Simons
a7bddbd4ca hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-17-gacb24c5 using the following inputs:

  - Nixpkgs: d16b4a3e78
  - Hackage: bf464d8754
  - LTS Haskell: 0d493eae36
  - Stackage Nightly: a19cf709b3
2015-10-15 10:04:06 +02:00
Jude Taylor
f4dbf6d7c8 Merge pull request #10187 from NixOS/switch-to-pd
Switch stdenvs to pure-darwin
2015-10-14 16:13:25 -07:00
Vincent Laporte
e468b311bc eliom: requires OCaml >= 4 2015-10-15 00:29:33 +02:00
Arseniy Seroka
9d106f72e2 Merge pull request #10386 from Shados/fix-kodi
kodi: Fix SSA/ASS subtitle support
2015-10-15 00:13:43 +03:00
Arseniy Seroka
6d48e23eb0 Merge pull request #10391 from utdemir/jenkins-633
jenkins: 1.631 -> 1.633
2015-10-15 00:12:07 +03:00
Arseniy Seroka
e71fcfd3c7 Merge pull request #10392 from expipiplus1/nvim-version
neovim: 2015-10-08 -> 2015-10-12
2015-10-15 00:11:52 +03:00
Arseniy Seroka
8bbfec8841 Merge pull request #10393 from expipiplus1/libtermkey-version
libtermkey: 0.17 -> 0.18
2015-10-15 00:11:37 +03:00
goibhniu
66fc345cba Merge pull request #10388 from fps/ardour-update-to-real-4.2
ardour: 4.1 -> 4.2 (fix the git revision and hash to _really_ pull the latest 4.2)
2015-10-14 21:28:52 +02:00
Joe Hermaszewski
bb15c81597 libtermkey: 0.17 -> 0.18 2015-10-14 20:27:36 +01:00
Joe Hermaszewski
d5a364cf8f neovim: 2015-10-08 -> 2015-10-12 2015-10-14 20:15:42 +01:00
Utku Demir
57ad847982 jenkins: 1.631 -> 1.633 2015-10-14 21:21:12 +03:00
Vincent Laporte
37d731790b ocp-index: requires OCaml >= 4 2015-10-14 19:27:33 +02:00
Vincent Laporte
0da6fb5fa5 ocaml-cmdliner: 0.9.7 -> 0.9.8 2015-10-14 19:27:10 +02:00
Vincent Laporte
92e2e18fbb ocaml-ocp-indent: 1.4.2b -> 1.5.2 2015-10-14 19:26:38 +02:00
Vincent Laporte
621b66c3df js_of_ocaml: fix for OCaml < 4.0 2015-10-14 19:25:58 +02:00
Arseniy Seroka
91202fd475 djmount: add missing file 2015-10-14 20:20:30 +03:00
Arseniy Seroka
e2a58a6a03 djmount: init at 0.71 2015-10-14 20:16:29 +03:00
Arseniy Seroka
7b001ed68a Merge pull request #10380 from brodul/scrolls
scrolls: update binary source hash
2015-10-14 18:03:26 +03:00
Arseniy Seroka
88cba6d8b5 yandex-disk: update 0.1.5.905 -> 0.1.5.940 2015-10-14 17:59:12 +03:00
Florian Paul Schmidt
8b847ce3d6 ardour: fix the git revision and hash to _really_ pull the latest 4.2 version 2015-10-14 16:51:04 +02:00
Andraz Brodnik
a6011bb606 scrolls: 2014-03-08 -> 2015-10-13 2015-10-14 16:49:13 +02:00
Desmond O. Chang
b41742414e git-crypt: update maintainer 2015-10-14 21:46:27 +08:00
Eelco Dolstra
013cf1b4f2 syslinux: Strip static libraries
This prevents a retained dependency on gcc.
2015-10-14 14:29:54 +02:00
Pascal Wittmann
af75246b21 perl-Test-Pod: 1.48 -> 1.51 2015-10-14 14:22:31 +02:00
Pascal Wittmann
171147949d perl-Test-Requires: 0.06 -> 0.10 2015-10-14 14:22:31 +02:00
Pascal Wittmann
51b4d6fe02 perl-Test-Shared-Fork: 0.29 -> 0.34 2015-10-14 14:22:31 +02:00
Pascal Wittmann
d443e8795d perl-Test-Spec: 0.47 -> 0.51 2015-10-14 14:22:31 +02:00
Pascal Wittmann
1b40c4bb77 perl-Test-Synopsis: 0.10 -> 0.11 2015-10-14 14:22:31 +02:00
Pascal Wittmann
ac0a757465 perl-Test-TCP: 1.18 -> 2.14 2015-10-14 14:22:31 +02:00
Pascal Wittmann
b8210de891 perl-Test-Trap: 0.2.2 -> 0.3.2 2015-10-14 14:22:31 +02:00
Pascal Wittmann
4e62944d83 perl-Test-Version: 1.002004 -> 2.03 2015-10-14 14:22:31 +02:00
Pascal Wittmann
67861f4b75 perl-Test-Warnings: 0.016 -> 0.021 2015-10-14 14:22:30 +02:00
goibhniu
372e5586b2 Merge pull request #10336 from qknight/borgbackup-0.27
borgbackup: bump to 0.27.0 and rename to correct name borgbackup
2015-10-14 14:11:05 +02:00
Eelco Dolstra
2e098d58d2 libmicrohttpd: Update to 0.9.44
Also move the info pages to a separate output, significantly reducing
the size of the main output.
2015-10-14 13:55:43 +02:00
Eelco Dolstra
11aef37ca6 less: Update to 481 2015-10-14 13:55:43 +02:00
Joe Hermaszewski
d6d88aaa2b neovim: Create symlink to correct python3 binary
The symlink being created pointed to 'python' rather than 'python3'
2015-10-14 11:57:40 +02:00
Alexei Robyn
8162085634 kodi: Fix SSA/ASS subtitle support. 2015-10-14 20:24:53 +11:00
Arseniy Seroka
0eb45e0ff9 Merge pull request #10325 from javaguirre/update-geary
geary: 0.8.2 -> 0.10.0
2015-10-14 01:14:56 +03:00
Arseniy Seroka
bd3e575aec Merge pull request #10363 from expipiplus1/pk-ecc
perl-CryptX: init at 0.025
2015-10-14 01:13:24 +03:00
Peter Simons
c75e30031b Merge pull request #10375 from woehr/llvm-general-3.5-support
Latest llvm-general now requires llvm 3.5
2015-10-13 20:20:51 +02:00
Tobias Geerinckx-Rice
b36ac2c44a netsniff-ng 0.5.9-{98-gb3a9f17 -> 106-g895377c} 2015-10-13 20:07:18 +02:00
Tobias Geerinckx-Rice
3680198bb9 libpsl list 2015-09-25 -> 2015-10-11 2015-10-13 20:07:18 +02:00
Tobias Geerinckx-Rice
8222eeca6e simple-scan 3.18.0 -> 3.18.1 2015-10-13 20:07:18 +02:00
Tobias Geerinckx-Rice
7d8602e78e geolite-legacy 2015-10-09 -> 2015-10-13 2015-10-13 20:07:17 +02:00
Pascal Wittmann
4da5194075 perl-Wx: 0.9923 -> 0.9927 2015-10-13 18:36:12 +02:00
Pascal Wittmann
3d04780e65 perl-X11-XCB: 0.12 -> 0.14 2015-10-13 18:36:12 +02:00
Pascal Wittmann
73030e6812 Merge pull request #10360 from nico202/meterbridge
init: meterbridge 0.9.2
2015-10-13 18:34:54 +02:00
Michael Raskin
8147a3d9d8 dd_rescue: 1.98 -> 1.99 2015-10-13 19:30:51 +03:00
Michael Raskin
4ab39c9358 eudev: 3.1.2 -> 3.1.5 2015-10-13 19:30:29 +03:00
Michael Raskin
5c32df44c1 gajim: 0.16.3 -> 0.16.4 2015-10-13 19:30:01 +03:00
Michael Raskin
e8d82e08cf baresip: 0.4.14 -> 0.4.15 2015-10-13 19:29:43 +03:00
Peter Simons
310d90085b Merge pull request #10297 from dezgeg/pr-verify-tarball-warning-free
make-tarball.nix: Fail if nixpkgs doesn't evaluate without warnings
2015-10-13 16:55:21 +02:00
Peter Simons
f82603b2c8 Merge pull request #10369 from fps/alsa-tools
alsa-tools-1.0.29: add initial package
2015-10-13 16:23:25 +02:00
Jordan Woehr
2b09bfc3c8 Latest llvm-general now requires llvm 3.5 2015-10-13 08:12:52 -06:00
Arseniy Seroka
66141ab1f2 Merge pull request #10374 from ericsagnes/goaccess
goaccess: 0.9 -> 0.9.4
2015-10-13 16:23:52 +03:00
Eric Sagnes
d6c0c0e3c9 goaccess: 0.9 -> 0.9.4 2015-10-13 22:14:27 +09:00
Vladimír Čunát
2f540cbe48 synapse, hamster-time-tracker: get rid of icon-theme.cache
Fixes #10370.
2015-10-13 14:49:05 +02:00
Domen Kožar
8567c5883b reaver-wps: set platforms 2015-10-13 14:45:52 +02:00
Domen Kožar
1c174d107c crashplan: mark as broken 2015-10-13 14:45:18 +02:00
Peter Simons
424be52044 Merge pull request #10372 from nathanielbaxter/dev/teamspeak_client
teamspeak_client: Fixed qt and quazip lib references.
2015-10-13 14:08:44 +02:00
Peter Simons
cb9e2a712c Merge pull request #10371 from tk-ecotelecom/master
oprofile: 1.0.0 -> 1.1.0
2015-10-13 14:08:09 +02:00
Joe Hermaszewski
f704591f2b perl-CryptX: init at 0.025 2015-10-13 13:06:24 +01:00
Nathaniel Baxter
102f70bfb2 teamspeak_client: Fixed qt and quazip lib references. 2015-10-13 22:12:41 +11:00
Florian Paul Schmidt
d2a1785133 alsa-tools: remove non-effective parallelBuilding statement 2015-10-13 13:05:44 +02:00
Pascal Wittmann
c84499968f perl-TreeDAG-Node: 1.09 -> 1.27 2015-10-13 12:54:26 +02:00
Pascal Wittmann
34741b84fe perl-XML-Validator-Schema: fix build 2015-10-13 12:54:26 +02:00
Pascal Wittmann
b88d9f7477 perl-File-Slurp-Tiny: init at 0.004 2015-10-13 12:54:26 +02:00
Pascal Wittmann
46f3fed7fc perl-TreeSimple: 1.18 -> 1.25 2015-10-13 12:54:26 +02:00
Pascal Wittmann
d1460ccea2 perl-XML-DOM: 1.44 -> 1.45 2015-10-13 12:54:26 +02:00
Pascal Wittmann
8006a52db4 perl-XML-LibXML: 2.0121 -> 2.0122 2015-10-13 12:54:26 +02:00
Pascal Wittmann
bc7e3345f5 perl-TimeHiRes: fix url 2015-10-13 12:54:26 +02:00
Pascal Wittmann
8e2aa95922 perl-Unicode-Collate: 1.04 -> 1.14 2015-10-13 12:54:26 +02:00
Pascal Wittmann
0f4ec699a6 perl-Unicode-LineBreak; 2013.11 -> 2015.07.16 2015-10-13 12:54:26 +02:00
Pascal Wittmann
f744774d66 perl-Variable-Magic: 0.53 -> 0.58 2015-10-13 12:54:25 +02:00
Pascal Wittmann
6f528841bc perl-XML-Twig: 3.44 -> 3.49 2015-10-13 12:54:25 +02:00
Pascal Wittmann
87ca45a08d perl-YAML: 0.90 -> 1.15 2015-10-13 12:54:25 +02:00
Pascal Wittmann
d17b367e0c perl-Test-YAML: init at 1.06 2015-10-13 12:54:25 +02:00
Pascal Wittmann
ed96d04832 perl-YAML-Lib-YAML: 0.52 -> 0.59 2015-10-13 12:54:25 +02:00
Florian Paul Schmidt
583f16a87f alsa-tools: do not mention phases explicitly 2015-10-13 12:52:37 +02:00
Florian Paul Schmidt
24b375ac06 alsa-tools: update maintainer 2015-10-13 12:48:03 +02:00
Timofei Kushnir
43c906ea0b oprofile: 1.0.0 -> 1.1.0 2015-10-13 13:27:50 +03:00
Florian Paul Schmidt
3da4f68800 alsa-tools: add initial package building everything except for a few nut cases 2015-10-13 11:33:52 +02:00
Peter Simons
92dec33670 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-18-g943a6d6 using the following inputs:

  - Nixpkgs: 8b34d449ff
  - Hackage: 746b60ae21
  - LTS Haskell: 0d493eae36
  - Stackage Nightly: 6fbf34ed62
2015-10-13 11:20:56 +02:00
Peter Simons
35059e73ff Merge pull request #10346 from tk-ecotelecom/develop
oprofile: depend on kernel headers to correctly compile 'operf' util.
2015-10-13 11:12:55 +02:00
Lluís Batlle i Rossell
4760b6ea6d Fixing the gtk attach file dialog for pond.
I forgot to wrap the programs for the proper XDG_DATA_DIRS. Thanks Lethalman!

(cherry picked from commit 0eb404129f8a0ae2dca7b3c53699f689e0343b65)
2015-10-13 10:32:51 +02:00
Lluís Batlle i Rossell
a8d2f2dfcd Making pond with GUI (gtk).
(cherry picked from commit a1107b2bd2e8946c2b0ab71de5eeb0d9df30a405)
2015-10-13 10:32:47 +02:00
Pascal Wittmann
08193cb0ec Merge pull request #10348 from yochai/master
culmus: init at 0.130
2015-10-13 10:03:25 +02:00
=
20211e25a2 init: meterbridge 0.9.2 2015-10-13 07:50:05 +02:00
Michael Raskin
60dd8f367a LibreOffice: 5.0.1 -> 5.0.2 2015-10-13 07:45:30 +03:00
Sou Bunnbu
f58c9026d5 Merge pull request #10366 from andrewrk/glfw
GLFW: 3.1.1 -> 3.1.2
2015-10-13 12:44:59 +08:00
Yochai
40c0a0b9a2 culmus: init at 0.130 2015-10-13 07:34:33 +03:00
Vincent Laporte
c400e81b81 ocaml-alcotest: 0.3.2 -> 0.4.5 2015-10-13 06:14:25 +02:00
Vincent Laporte
4fa4f6f841 ocaml-gg: 0.9.0 -> 0.9.1 2015-10-13 06:14:25 +02:00
aszlig
197547e4ba
linux-testing: 4.3.0-rc4 -> 4.3.0-rc5
Upstream changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?id=refs/tags/v4.3-rc5

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-13 05:31:43 +02:00
aszlig
37429a2c74
john: Enable parallel building by default.
I've built this a lot of times on different machines without getting
compile errors, so I'd assume this to be safe. Of course, the compile
time is very small in comparison to bigger packages but it's still an
annoyance to wait for up to a few minutes, especially during
development.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-13 04:42:40 +02:00
aszlig
902bcf1422
john: Make package work out of the box.
So far it was only possible to run john if you've either copied over the
default configuration over to ~/.john and substitute $JOHN with the
right path or set $JOHN to the store path directly.

Both methods are not really a very good user experience, so we're now
patching in the resulting paths into the default rules/configurations.

This also splits off configuration files into $out/etc/john instead of
putting everything into $out/share/john and now also properly installs
the auxiliary programs into $out/bin.

Closes #8792.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: devhell <"^"@regexmail.net>
Cc: @offlinehacker
2015-10-13 04:42:40 +02:00
aszlig
cf4e2c426e
john: Disable building with -march=native.
It prevents john from running with older CPUs such as Core2Duo and gives
an illegal hardware instruction error on these CPUs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-13 04:42:39 +02:00
aszlig
2a1bf2a776
john: Clean up and Update to v1.8.0-jumbo-1.
Cleanups are mostly stylistic, like putting src more to the top (to make
sure it won't be missed on updates of the version attribute) or using
mkdir -p instead of ensureDir.

The most significant change here is that we update the package to
1.8.0-jumbo-1, which is the latest tag available and contains community
updates which were already in magnumripper/JohnTheRipper@93f061bc41.

We're now also using fetchurl to ensure that we don't need to clone the
whole repository and keep download times low.

And the derivation name is now "john" instead of "JohnTheRipper",
because most users would expect "nix-env -i john" to work.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-13 04:42:39 +02:00
Peter Simons
1f172c6e7b Merge pull request #10339 from AndersonTorres/nuweb
Nuweb: init at 1.58
2015-10-13 01:07:57 +02:00
Andrew Kelley
da5ffe8cb4 GLFW: 3.1.1 -> 3.1.2 2015-10-12 15:16:27 -07:00
AndersonTorres
da77f21e5f Nuweb: init at 1.58 2015-10-12 18:39:17 -03:00
Pascal Wittmann
afb4a6462b Merge pull request #10364 from igsha/feature/wcalc
wcalc: init at 2.5
2015-10-12 23:17:20 +02:00
Michael Raskin
7671360e91 Force SLimerJS Gecko compatibility even higher 2015-10-13 00:21:44 +03:00
Edward Tjörnhammar
c10caef1a2 Merge pull request #10062 from gebner/sbt-loader-package
sbt: use sbt-launcher-package.
2015-10-12 23:02:58 +02:00
Igor Sharonov
d1b085549f wcalc: init at 2.5 2015-10-12 23:07:45 +03:00
Pascal Wittmann
47aa1da7a0 perl-YAML-Syck: 1.27 -> 1.29 2015-10-12 21:01:16 +02:00
Pascal Wittmann
35e4b7e80f perl-YAML-Tiny: 1.53 -> 1.69 2015-10-12 21:01:15 +02:00
Pascal Wittmann
d8aca13e86 perl-aliased: 0.31 -> 0.34 2015-10-12 21:01:15 +02:00
Pascal Wittmann
765e961dd8 perl-autovivification: 0.12 -> 0.16 2015-10-12 21:01:15 +02:00
Pascal Wittmann
f614915475 perl-bigum: 0.37 -> 0.41 2015-10-12 21:01:14 +02:00
Pascal Wittmann
f6d7a881d7 perl-boolean: 0.32 -> 0.45 2015-10-12 21:01:14 +02:00
Pascal Wittmann
a6ed56a291 perl-constant: 1.27 -> 1.33 2015-10-12 21:01:14 +02:00
Pascal Wittmann
1311aaf0bc perl-constant-defer: 5 -> 6 2015-10-12 21:01:14 +02:00
Pascal Wittmann
4cb510e729 perl-local-lib: 2.000014 -> 2.000017 2015-10-12 21:01:13 +02:00
Pascal Wittmann
270499c3d2 perl-namespace-autoclean: 0.20 -> 0.27 2015-10-12 21:01:13 +02:00
Pascal Wittmann
b48b4a1f2a perl-strictures: 1.005004 -> 2.000001 2015-10-12 21:01:13 +02:00
Pascal Wittmann
cbecf3fbd5 perl-threads: 2.01 -> 2.02 2015-10-12 21:01:12 +02:00
Pascal Wittmann
e5dfd86beb perl-version: 0.9908 -> 0.9912 2015-10-12 21:01:12 +02:00
Pascal Wittmann
56c792956a perl-Autodia: 2.03 -> 2.14 2015-10-12 21:01:12 +02:00
Pascal Wittmann
c92b8cf946 perl-B-Flags: 0.13 -> 0.14 2015-10-12 21:01:11 +02:00
Eelco Dolstra
5ea6330f77 blender: Update to 2.76 2015-10-12 20:05:35 +02:00
Pascal Wittmann
b3cb65dd9f Merge pull request #10352 from expipiplus1/add-text-char-width
CharWidth: init at 0.04
2015-10-12 19:41:58 +02:00
Nikolay Amiantov
0aaadc2b9e gajim: drop LaTeX support
It's in a separate plugin now.
2015-10-12 20:06:12 +03:00
Joe Hermaszewski
12436f09d6 CharWidth: init at 0.04 2015-10-12 16:02:23 +01:00
Nikolay Amiantov
5963d94c3c mumble: use bundled celt library again 2015-10-12 17:55:00 +03:00
Timofei Kushnir
aefa4a181f oprofile: depend on kernel headers to correctly compile 'operf' util. 2015-10-12 17:50:13 +03:00
Peter Simons
d6c83c30e6 configuration-hackage2nix.yaml: update list of broken packages 2015-10-12 16:07:43 +02:00
Peter Simons
18a32bd8cd libmp3splt: enable libid3tag support 2015-10-12 15:57:02 +02:00
Peter Simons
eac57e0289 lts-haskell: add version 3.9 2015-10-12 15:43:18 +02:00
Peter Simons
214955dd04 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-18-g943a6d6 using the following inputs:

  - Nixpkgs: b50d1833ba
  - Hackage: 370eb30278
  - LTS Haskell: 0d493eae36
  - Stackage Nightly: 6fbf34ed62
2015-10-12 15:39:37 +02:00
Arseniy Seroka
124bca6dc1 Merge pull request #10345 from javaguirre/package-phpcs
phpcs: init at 2.3.4
2015-10-12 16:39:05 +03:00
Timofei Kushnir
d7eb1dd8d0 oprofile: depend on kernel headers to correctly compile 'operf' util. 2015-10-12 15:02:01 +03:00
Pascal Wittmann
2cc15968f2 perl-Convert-ASN1: 0.26 -> 0.27 2015-10-12 13:17:29 +02:00
Pascal Wittmann
804d019c6a smbldap-tools: mark as broken
The build fails with the following error

  pod2man: unable to format smbldap-config.cmd
2015-10-12 13:11:12 +02:00
Pascal Wittmann
185a488c27 perl-Connector: 1.15 -> 1.16 and enable tests 2015-10-12 12:59:26 +02:00
Pascal Wittmann
dd3c1e2125 perl-Config-Tiny: 2.20 -> 2.22 2015-10-12 12:50:28 +02:00
Pascal Wittmann
4ea830ec4e perl-Config-General: 2.52 -> 2.58 2015-10-12 12:40:18 +02:00
Pascal Wittmann
53a132a3a4 tgt: fix build
xsltproc tried to download docbook.xsl
2015-10-12 12:27:54 +02:00
Javier Aguirre
9522afae2c phpcs: init at 2.3.4
Adding javaguirre to maintainers
2015-10-12 12:11:54 +02:00
Timofei Kushnir
6ea8f649e6 Create kernel headers dependency to correctly compile 'operf' util. 2015-10-12 13:05:04 +03:00
Pascal Wittmann
0c248d1cb1 perl-Text-Aspell: init at 0.09 2015-10-12 11:57:40 +02:00
Pascal Wittmann
4fa9f66764 perl-Config-Auto-Conf: 0.22 -> 0.311 2015-10-12 11:57:39 +02:00