1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

9764 commits

Author SHA1 Message Date
Bjørn Forsman 6f48eb5866 actdiag: new package
Actdiag generates activity-diagram image from spec-text file (similar to
Graphviz).
2013-09-22 23:04:38 +02:00
Bjørn Forsman d048685af5 seqdiag: new package
Seqdiag generates sequence-diagram image from spec-text file (similar to
Graphviz).
2013-09-22 23:04:38 +02:00
Bjørn Forsman 2f238d82a0 blockdiag: new package
Blockdiag generates block-diagram image from spec-text file (similar to
Graphviz).

Also add its needed dependencies, funcparserlib and webcolors.
2013-09-22 23:04:37 +02:00
Peter Simons e613d30c3c haskell-data-pprint: add version 0.2.1.5 2013-09-22 13:29:56 +02:00
Peter Simons 876047edf7 haskell-monad-par: update to version 0.3.4.5 2013-09-22 13:25:10 +02:00
Peter Simons 71bb69c5c1 haskell-enummapset: add version 0.5.2.0 2013-09-22 13:25:08 +02:00
Peter Simons b962730e27 haskell-keys: add version 3.0.3 2013-09-22 13:25:08 +02:00
Peter Simons 90a8abc0dc haskell-Cabal: update to version 1.18.1 2013-09-22 13:25:07 +02:00
Domen Kožar bbbfe7a783 python-nose: trivial change to rebuild 2013-09-22 10:36:12 +02:00
Domen Kožar e0fc8d9f7e Merge pull request #990 from jbedo/master
Added expression for PLINK
2013-09-22 00:26:43 -07:00
Oliver Charles d33ca4abae haskellPackages.pipesBytestring: New expression 2013-09-21 09:46:49 +01:00
Peter Simons 5d43f559a3 haskell-llvm-general: renamed some files to follow our naming convention 2013-09-21 09:56:34 +02:00
Mathijs Kwik a12f0fad69 idris: fix by using llvm-general 3.3.5.*
I tried jailbreaking, but this didn't work as llvm-general is an
optional (but enabled by default) dependency.

Manual patching revealed idris gets confused over the
llvm-general/llvm-general-pure split.
2013-09-20 23:51:37 +02:00
Mathijs Kwik bfdfdaf084 llvm-general: bring back version 3.3.5.* 2013-09-20 23:51:36 +02:00
Lluís Batlle i Rossell ad1971a1d1 Fixing typo in previous merge. 2013-09-20 10:49:39 +02:00
Lluís Batlle i Rossell 8f73cdeac2 Merging the changes to get systemd with lvm2 working 2013-09-20 09:45:33 +02:00
Lluís Batlle i Rossell c0fd88748a Making lvm2 install systemd stuff, and combine all in a single derivation. 2013-09-20 09:20:14 +02:00
Rok Garbas 90092e629d adding grunt-sed node package 2013-09-19 01:57:58 +02:00
Justin Bedo c38ffa7b7d Added expression for PLINK 2013-09-19 09:39:14 +10:00
Domen Kožar 42c2a579a7 Merge pull request #973 from errge/master
Disable tests for perlPackages.ack
2013-09-18 16:34:19 -07:00
Domen Kožar 8505cf5f77 python-selenium: 2.25.0 -> 2.35.0 2013-09-18 20:42:37 +02:00
Peter Simons dc4e44a241 haskell-pandoc-citeproc: add version 0.1.1 2013-09-18 17:45:16 +02:00
Peter Simons eb21eb3f67 haskell-rfc5051: add version 0.1.0.2 2013-09-18 17:45:07 +02:00
Peter Simons 11eb9ac282 haskell-aeson-pretty: add version 0.7 2013-09-18 17:44:57 +02:00
Vladimír Čunát 571881b647 haskellPackages: add list-tries 2013-09-18 17:17:33 +02:00
Peter Simons 7ea98e8775 haskell-GLUT: update to version 2.5.0.1 2013-09-18 17:17:32 +02:00
Peter Simons 54124516de haskell-happy: add version 1.19.0 2013-09-18 17:17:31 +02:00
Peter Simons 5bc2f6ce02 haskell-alex: add version 3.1.0 2013-09-18 17:17:31 +02:00
Peter Simons 137e8ef0f1 haskell-stringable: add version 0.1.2 2013-09-18 17:17:31 +02:00
Peter Simons 2a1c1869c0 haskell-hslua: add version 0.3.6.1 2013-09-18 17:17:31 +02:00
Peter Simons 4ebaf041ab haskell-GLURaw: add version 1.4.0.0 2013-09-18 17:17:31 +02:00
Peter Simons 5030e0b776 haskell-GLUT: add version 2.5.0.0 2013-09-18 17:17:31 +02:00
Peter Simons 8d907ea19e haskell-OpenGL: add version 2.9.0.0 2013-09-18 17:17:31 +02:00
Peter Simons 1e42892af0 haskell-OpenGLRaw: add version 1.4.0.0 2013-09-18 17:17:31 +02:00
Peter Simons 2db9368919 haskell-hashable: update ghc-HEAD to version 1.2.1.0 2013-09-18 17:17:31 +02:00
Peter Simons 0d72bb5226 Merge pull request #985 from ocharles/perl
perlPackages.WWWMechanizeCGI: Use substituteInPlace, should fix darwin build
2013-09-18 08:09:25 -07:00
Mathijs Kwik d506c662e8 remove sqlite alias now there is only 1 version 2013-09-18 14:37:38 +02:00
Mathijs Kwik 2d1e91cced remove obsolete sqlite 3.7.14 2013-09-18 14:37:38 +02:00
Mathijs Kwik ef50aab1ee remove obsolete sqlite 3.7.9 2013-09-18 14:37:38 +02:00
Eelco Dolstra 7d2364def4 mountall: Remove
It's no longer used since we switched to systemd.
2013-09-18 13:05:23 +02:00
Oliver Charles 3433e62e3f gtimelog: New expression 2013-09-18 11:45:23 +03:00
Oliver Charles 21cb877e11 perlPackages.WWWMechanizeCGI: Use substituteInPlace, should fix darwin build 2013-09-17 20:19:57 +01:00
Domen Kožar a10742f392 add sigal, gallery static generator 2013-09-17 20:47:35 +02:00
Shea Levy 59bd1ba586 Add virtuoso 7
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-09-17 14:28:26 -04:00
Jonas Hoersch 34513244ca python-pandas: update to 0.12.0 2013-09-17 16:41:56 +02:00
Eelco Dolstra 095fc0ebaa nix-repl: Add 2013-09-17 11:26:12 +02:00
Rok Garbas fc2210300f plone: update to 4.3.2 2013-09-17 11:18:45 +02:00
aszlig 1f1420d3d8
python-pykickstart: Update to version 1.99.39.
As well as pyblock, the SHA256 changed here as well. Although the
changes between 1.99.32 and 1.99.39 aren't as minor as with pyblock,
this shouldn't have any impact on nixpart so I think it's safe to
upgrade (we'll see later, should we end up with failed tests in nixpart
or <nixos/tests/partition.nix>.

Of course we're now using the release tarball from the repo site here as
well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-09-17 11:01:47 +02:00
aszlig a5037b8858
python-pyblock: Update to version 0.53.
As the SHA256 changed in the meantime and there are only minor changes
between 0.52 and 0.53, I've updated this to the release tarball, which
hopefully won't change anytime soon.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-09-17 11:01:46 +02:00
Rob Vermaas 8041a33726 Add MegaCli, a command line tool to manage certain RAID cards. 2013-09-16 15:56:55 +02:00
Oliver Charles 9fc836e206 perlPackages: Add ocharles to maintainers for all packages he's contributed
Close #979.

vcunat edit: in one case the lines were added into "src" attribute
instead of "meta".
2013-09-16 14:42:08 +02:00
Sander van der Burg 72c42d8987 Added js-yaml node package + update node packages 2013-09-16 12:11:11 +02:00
Peter Simons 93239d33cc all-packages.nix: strip trailing whitespace 2013-09-16 11:50:20 +02:00
Peter Simons 9c45b91002 lua-5: update default version from 5.1.4 to 5.1.5 and add version 5.2.2 2013-09-16 11:50:20 +02:00
Peter Simons 6665c1e6b0 Merge pull request #971 from ocharles/esqueleto
haskellPackages.esqueleto: New expression
2013-09-16 02:03:31 -07:00
Domen Kožar 4d913bf0f6 Merge pull request #976 from jcumming/netatalk.130915
netatalk-3.0.5
2013-09-15 23:15:57 -07:00
Jack Cummings 122b19c429 netatalk-3.0.5 2013-09-15 22:54:57 -07:00
Gergely Risko b882b82033 Disable tests for perlPackages.ack 2013-09-15 21:00:36 +02:00
Jonas Hoersch 986b34580d add mathematica version 9.0.0
Wolfram Mathematica based on the makeself archive found on the Mathematica installation DVD.
2013-09-15 18:33:13 +02:00
Vladimír Čunát ce07819201 PerlMagick: fix build via update (broken by imagemagick update)
I found nothing in Changelog, hopefully OK.
2013-09-15 18:27:08 +02:00
Oliver Charles 6dfd36781f haskellPackages.esqueleto: New expression 2013-09-15 17:24:36 +01:00
cillianderoiste e5e3d47a68 Merge pull request #969 from coroa/ipdbplugin
python-ipdbplugin: update to version 1.14
2013-09-15 06:52:19 -07:00
Jonas Hoersch 9c533f4745 python-ipdbplugin: update to version 1.14 2013-09-15 14:34:46 +02:00
Domen Kožar 656184f89c FlexGet: 1.0.3353 -> 1.1.121 2013-09-15 12:18:04 +02:00
Lluís Batlle i Rossell 00abf42fc6 Adding the reference to bird 2013-09-15 11:39:24 +02:00
Marc Weber 513dad6527 colord, gusb: package.
Part of #517.
2013-09-15 11:53:11 +03:00
Edward Tjörnhammar 953eecb0fc ssvnc: The Enhanced TightVNC Viewer, SSVNC, adds encryption security to VNC connections.
Close #950.
2013-09-15 10:50:59 +03:00
Oliver Charles af8a83c378 haskellPackages.amqp: New expression.
Close #965.
2013-09-15 06:25:14 +03:00
Oliver Charles c537d07f21 haskellPackages.snapletAcidState: New Expression (close #966) 2013-09-15 05:51:24 +03:00
Jason \"Don\" O'Conal e0fd701942 enscript: fix build on darwin (close #933, really this time) 2013-09-14 16:03:20 +02:00
Jason \"Don\" O'Conal 2a73189a9c deluge: fix build on darwin (close #930) 2013-09-14 15:26:48 +02:00
Jason \"Don\" O'Conal ad454f3511 emacs24: fix build on darwin (clos #932) 2013-09-14 15:19:54 +02:00
Zef Hemel 8d001c1a08 Darwin support for Go 1.1 (close #952) 2013-09-14 15:13:26 +02:00
Danie Roux 76ca653d7b coreutils: 8.20 does build on Darwin
Where gcc is:

i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.11.00)
2013-09-14 14:45:06 +02:00
Evgeny Egorochkin 35cd18503e Merge pull request #958 from wizeman/linux_3_2
Update linux-3.2 & grsecurity
2013-09-13 21:07:11 -07:00
Sander van der Burg 28d8e93871 My attempt to get Steam working in NixOS. It uses a function called buildFHSChrootEnv {} that composed chroot environments. In such a chroot environment, I could run Steam without much problem 2013-09-13 23:58:59 +02:00
Domen Kožar e67a2479e1 add poedit 2013-09-13 20:42:49 +02:00
Domen Kožar afdc44df8d pip: 1.2.1 -> 1.4.1 (CVE-2013-1888, CVE-2013-1629) 2013-09-13 12:37:43 +02:00
Ricardo M. Correia 342fcfc82f grsecurity: Update to 2.9.1-3.2.51-201309101928 2013-09-13 05:13:25 +02:00
Bjørn Forsman fe520e6d1f ditaa: new package
Ditaa is a small command-line utility written in Java, that can convert
diagrams drawn using ascii art ('drawings' that contain characters that
resemble lines like | / - ), into proper bitmap graphics.

Homepage: http://ditaa.sourceforge.net/
2013-09-12 17:25:09 +02:00
Peter Simons 51604bf13f haskell-llvm-general-pure: add version 3.3.8.1 2013-09-11 20:48:05 +02:00
Peter Simons a1cca8226a happy: add version 1.18.11 2013-09-11 19:58:34 +02:00
Vladimír Čunát aa8e8303e1 Merge branch 'x-updates' into master 2013-09-11 08:37:03 +02:00
Peter Simons b728835bc1 Merge pull request #953 from errge/statvfs
Add statvfs haskell library
2013-09-10 15:32:34 -07:00
Peter Simons e08fab28f5 Um, make that 'linuxHeaders26'. Sorry. 2013-09-10 21:16:33 +02:00
Peter Simons 5a75874b96 all-packages.nix: add 'linuxHeaders36' attribute
We have that version of the kernel headers in Nixpkgs already, there was
just no attribute for them.
2013-09-10 21:15:41 +02:00
Rickard Nilsson d1882a1940 trac: Update to 1.0.1. The old version did not work at all with the current genshi package (0.7). 2013-09-10 19:19:27 +02:00
Eelco Dolstra b73deae714 nix: Update to 1.6 2013-09-10 17:53:29 +02:00
Vladimír Čunát bb6b42385d Merge PR #901: adding Storm
vcunat edit: use symlink instead of hardlink (failed for me with a
cross-device error), minor whitespace cleanup
2013-09-10 16:18:31 +02:00
Gergely Risko b2c97f6ca5 Add statvfs haskell library 2013-09-10 16:06:56 +02:00
Domen Kožar 1628c03c4e upgrade deform and deform_bootstrap 2013-09-10 12:28:10 +02:00
Peter Simons aeefa7b070 Cabal-1.18.0: this version won't build without deepseq 1.3 or later 2013-09-09 15:07:38 +02:00
Peter Simons 0c5cf00829 tcpcrypt: add current HEAD of the Github master branch 2013-09-09 12:56:22 +02:00
Peter Simons 2282809b35 libnetfilter_queue: add version 1.0.2 2013-09-09 12:52:31 +02:00
Peter Simons 9f6d539707 cabal-install-1.18.0.1: this package requires Cabal 1.18.x to compile 2013-09-09 12:23:00 +02:00
Peter Simons efce71f023 haskell-system-posix-redirect: add version 1.1 2013-09-08 22:56:25 +02:00
Peter Simons d7748daf2c haskell-unordered-containers: add version 0.2.3.2 2013-09-08 22:56:25 +02:00
Peter Simons 2aa0411562 cabal-install: update to version 1.18.0.1 2013-09-08 22:56:25 +02:00
Peter Simons 98fd7e3872 Merge pull request #947 from ocharles/pipes
pipes: Add Haskell 'pipes' family of libraries
2013-09-08 13:46:05 -07:00
Jason "Don" O'Conal f5768c5da1 pythonPackages.powerline: update to latest develop 2013-09-08 21:09:14 +02:00
Vladimír Čunát d55fb56690 Merge branch 'master' into x-updates 2013-09-08 16:39:09 +02:00
Sergey Mironov 3a1626e1a1 upower: revert libusb1 version to 1.0.9
That workarounds the coldplug problem

$ sudo ./libexec/upowerd -v
TI:18:38:27     Starting upowerd version 0.9.19
...
TI:18:38:27     registering subsystem : usb
TI:18:38:27     failed to coldplug /sys/devices/pci0000:00/0000:00:1c.4/0000:03:00.0/usb1
<upowerd EXITS>
2013-09-08 16:38:00 +02:00
Oliver Charles a0ab379c00 pipes: Add Haskell 'pipes' family of libraries 2013-09-08 15:10:56 +01:00
Vladimír Čunát c1ed13dad0 Merge branch 'master' into x-updates 2013-09-08 12:04:20 +02:00
Jason \"Don\" O'Conal 834cd6c886 beret: Fix build on darwin (close #923) 2013-09-08 10:32:25 +02:00
Vladimír Čunát b1be46e932 Merge branch 'master' into x-updates 2013-09-07 16:19:46 +02:00
Evgeny Egorochkin 138c42b5e3 Merge pull request #928 from grwlf/fuse-exfat
fuse-exfat: add FUSE-mounter for exFAT devices
2013-09-06 16:07:22 -07:00
Peter Simons 71f04ebe84 haskell-regex-compat-tdfa: add version 0.95.1.2 2013-09-06 23:49:32 +02:00
Peter Simons 2692c6e170 haskell-rosezipper: add version 0.2 2013-09-06 23:35:12 +02:00
Peter Simons c2c66fcda9 haskell-cmdtheline: add version 0.2.3 2013-09-06 23:35:11 +02:00
Peter Simons 0e8bf4f075 haskell-Strafunski-StrategyLib: add version 5.0.0.3 2013-09-06 23:35:11 +02:00
Peter Simons 4f827ec7d0 haskell-syz: add version 0.2.0.0 2013-09-06 23:35:11 +02:00
Peter Simons 880ca8abbc cabal-install: add version 1.18.0 2013-09-06 23:35:10 +02:00
Peter Simons 9ed90073b3 haskell-Cabal: add version 1.18.0 2013-09-06 23:35:10 +02:00
Peter Simons a508572731 haskell-cipher-{blowfish,camellia,des}: add new packages 2013-09-06 23:35:10 +02:00
Peter Simons 7527c19c27 Merge pull request #917 from errge/thyme
Add thyme haskell library
2013-09-06 14:29:48 -07:00
Sergey Mironov fe6b021ee1 fuse-exfat: add FUSE-mounter for exFAT devices 2013-09-07 01:25:30 +04:00
Gergely Risko b4a9ab5bd6 Add thyme haskell library 2013-09-06 10:37:21 +02:00
Jason "Don" O'Conal ab0ca44ffb texliveAggregationFunction: fix eval
vcunat edited to fix all cases (not just asymptote),
and a two "licnese" typos :-)
2013-09-06 10:34:09 +02:00
Rok Garbas 1f68487337 Merge pull request #919 from edwtjo/abook-0.6.0pre2
Added abook 0.6.0pre2
2013-09-06 01:22:06 -07:00
Jason "Don" O'Conal c93d33b74e asymptote: fix build on darwin 2013-09-06 10:19:46 +02:00
Jason "Don" O'Conal bcec0454e9 texLive: fix build on darwin
vcunat edit: use ruby19 on all platforms now.
See #700 for discussion related to the changes.
2013-09-06 10:11:54 +02:00
Edward Tjörnhammar 485d22f862 Added abook 0.6.0pre2
Abook is a text-based addressbook program designed to use with mutt mail
client.
2013-09-06 05:37:28 +02:00
Jason "Don" O'Conal 9f19d23282 perlPackages.ack: fix build on darwin 2013-09-06 10:03:35 +10:00
Moritz Ulrich be9b6c0fe2 GNU Stow: package - Symlink manager which makes it easy to manage dotfiles 2013-09-05 15:49:35 +03:00
Sander van der Burg 1642e3a6d7 libX11 is not in vice's rpath. this fixes it 2013-09-04 22:34:08 +02:00
Bjørn Forsman 99942d1fad source-highlight: unbreak by using boost 1.53
One of the tests started failing when boost was bumped from 1.53 to 1.54
(in July). Instead of skipping the tests, fix it by using boost 1.53.
2013-09-04 20:00:27 +02:00
Rok Garbas 9ffc2dff98 updating node packages and adding few to the json list
- bower
 - grunt-cli
 - grunt-contrib-jshint
 - grunt-contrib-requirejs
 - grunt-contrib-less
 - grunt-contrib-cssmin
 - grunt-contrib-uglify
 - grunt-karma
 - karma-mocha
 - karma-coverage
 - karma-requirejs
 - karma-sauce-launcher
 - karma-chrome-launcher
 - karma-junit-reporter
 - almond
 - lcov-result-merger
 - coveralls
2013-09-04 19:29:15 +02:00
Mathijs Kwik 03c9a1fb33 linux 3.11
works fine for me, but nvidia binary driver fails once again
2013-09-04 09:29:00 +02:00
Peter Simons c33d00bd64 Merge pull request #906 from ivan/fix-perl-1
Fix broken perl packages
2013-09-03 04:52:15 -07:00
Ivan Kozik 95b44f1adc Update some perl packages 2013-09-03 09:58:06 +00:00
Ricardo M. Correia a1bb7c1cfa scrypt: New package 2013-09-03 01:49:58 +00:00
Evgeny Egorochkin ddd1f7b52b Get rid of old rake derivation that doesn't build 2013-09-02 23:51:03 +03:00
Peter Simons 0c5c9e31ff haskell-groups: add version 0.3.0.0 2013-09-02 14:05:21 +02:00
Peter Simons 748c44df6f haskell-crypto-random: add version 0.0.5 2013-09-02 14:05:21 +02:00
Peter Simons ffe90114bd haskell-case-insensitive: add version 1.1 2013-09-02 14:05:21 +02:00
Peter Simons b3367cdfb9 haskell-packages.nix: transformers is a core package starting with ghc 7.7 2013-09-02 14:04:50 +02:00
Danny Wilson c4b1bbc1c8 Improved Storm package.
- Add config to defaults.yaml, to allow topologies to include their own storm.yaml.
- Symlink extra jars in lib/ since it's nearly impossible to add a classpath to Storm's config.
- Include native jzmq library in java.library.path
- Use package default args.
2013-09-02 12:20:24 +02:00
Danny Wilson d6a812332c Make Storm conf and log path configurable via symlinks.
- The bin/storm script makes too many assumptions about file locations and java classpath that I couldn't figure out a better way.

Fix jzmq build on NixOS: java source was treated as ASCII.
2013-09-02 12:20:16 +02:00
Danny Wilson 04a232f28b Add storm package. 2013-09-02 12:20:06 +02:00
Danny Wilson c5750ea3e9 Add jzmq package. 2013-09-02 12:19:35 +02:00
Bjørn Forsman b7d4c94d52 unoconv: new package
unoconv is a tool that converts between any document format supported by
LibreOffice/OpenOffice.

Example of how to convert an .odt file to .pdf:
  unoconv -f pdf some-file.odt

Homepage: http://dag.wieers.com/home-made/unoconv/

Implementation notes:
unoconv must use the same python version as libreoffice (unless it will
not be able to load the pyuno module from libreoffice). And because we
recently switched to libreoffice 4.x, which uses python3, I had to
include unoconv-python3.patch. The patch comes from upstream unoconv.git
repo, so it will be included in the next release.
2013-09-02 07:11:58 +02:00
Evgeny Egorochkin 793fa68806 Merge pull request #892 from MarcWeber/submit/storebackup
adding store-backup
2013-08-31 16:23:23 -07:00
Marc Weber 6f6bc030f9 adding store-backup 2013-08-31 22:16:22 +02:00
Marc Weber cf762c8f58 firebirdSuper settings
document why its better to not use --with-system-icu

See patch for nixos adding firebird service

Signed-off-by: Marc Weber <marco-oweber@gmx.de>
2013-08-31 23:05:32 +03:00
Gergely Risko 8dac1a5d0f Add final haskell library 2013-08-31 16:10:09 +02:00
Bjørn Forsman 0526403461 basex: new package
BaseX is a very fast and light-weight, yet powerful XML database and
XPath/XQuery processor, including support for the latest W3C Full Text
and Update Recommendations. It supports large XML instances and offers a
highly interactive front-end (basexgui). Apart from two local standalone
modes, BaseX offers a client/server architecture.

Homepage: http://basex.org/

Implementation notes:
 - I'm using the pre-built java package (because it's simple)
 - I copied the basex.svg icon file from the Ubuntu package because I
   couldn't find it anywhere else. It's 9.3 KiB.
2013-08-31 14:27:40 +02:00
Bjørn Forsman 36564b72fe uncrustify: new package
Uncrustify is a source code beautifier for C, C++, C#, ObjectiveC, D,
Java, Pawn and VALA.

Homepage: http://uncrustify.sourceforge.net/
2013-08-31 09:42:20 +02:00
Aristid Breitkreuz 0c4185d37a haskell: export callPackage to be able to create packages outside haskell-packages.nix 2013-08-30 19:45:51 +00:00
Bjørn Forsman e8e76ac12e dstat: enable color output
Give dstat access to the "curses" module in the Python standard library
so that it can color its output. This is similar to how other distros
package it (e.g. Fedora, Ubuntu).
2013-08-30 18:43:54 +02:00