Lluís Batlle i Rossell
f54c4c99e3
tcpdmup/libpcap udpate
2013-05-29 19:23:40 +02:00
Lluís Batlle i Rossell
21cb347f20
Adding babeld.
2013-05-29 19:16:02 +02:00
Lluís Batlle i Rossell
08f8371a50
Adding ahcpd.
2013-05-29 19:16:01 +02:00
Lluís Batlle i Rossell
55eccc68bb
Adding oslrd.
2013-05-28 22:37:59 +02:00
Eelco Dolstra
6c03d641fa
openvpn: Update to 2.3.1
2013-05-28 14:48:56 +02:00
Lluís Batlle i Rossell
7e7b669b3e
megatools: fixing the network part
...
It requires some env vars to work
2013-05-25 00:08:42 +02:00
Lluís Batlle i Rossell
a403f55ccf
Adding megatools
2013-05-24 23:43:26 +02:00
Ricardo M. Correia
200fd97b04
chrony: Add readline and libcap (on Linux) as dependencies
...
libcap is needed for chronyd to drop privileges when starting up.
readline was added as a convenience for when using chronyc.
2013-05-23 02:11:21 +00:00
Lluís Batlle i Rossell
f93971ef0c
filegive: update to 0.6.1
2013-05-22 19:21:11 +02:00
Ricardo M. Correia
e28b51360d
Add chrony.
...
Chrony is a pair of programs which are used to maintain the accuracy of the system clock on a computer.
2013-05-22 00:41:58 +02:00
Lluís Batlle i Rossell
8160f816af
mtr: adding ncurses support
2013-05-20 17:43:27 +02:00
Ricardo M. Correia
84e69bf619
tinc: update to 1.0.21 (fixes CVE-2013-1428) (merge #545 )
2013-05-20 17:18:28 +02:00
Petr Rockai
7abebbad4d
curl: Optionally add support for GSSAPI (Kerberos).
...
@vcunat also did some configureFlags refactoring
2013-05-18 13:24:30 +02:00
Lluís Batlle i Rossell
61e7a72931
mosh: update to 1.2.4
2013-05-18 13:17:41 +02:00
Domen Kozar
b38ae22a2d
make openvpn work with networkmanagerapplet
2013-05-11 19:17:48 +02:00
Domen Kozar
1aaa1a7b5b
add networ-manager-openvpn, WIP
2013-05-10 19:17:51 +02:00
Eelco Dolstra
84b0bf63b7
pwnat: Fix evaluation
2013-05-09 13:21:10 +02:00
Lluís Batlle i Rossell
e9cbe5439e
Adding udptunnel
...
(Fixing a semicolon in pwnat expr too)
2013-05-08 22:51:39 +02:00
Lluís Batlle i Rossell
a8b576ecaf
Adding pwnat.
2013-05-08 22:51:39 +02:00
Lluís Batlle i Rossell
e087ce095e
filegive: update to 0.5.2
...
(fixing miniupnpd support)
2013-05-07 12:19:38 +02:00
Lluís Batlle i Rossell
a5adbf19a6
filegive: fixing licence, adding maintainer
2013-05-04 10:08:52 +04:00
Lluís Batlle i Rossell
5465a118e1
filegive: update to 0.5.1
...
nat-pmp, fixed upnp bugs, ...
2013-05-04 01:04:17 +04:00
Moritz Ulrich
24466df152
Update isync to 1.0.6
2013-05-03 11:03:49 +02:00
Evgeny Egorochkin
6414a306a4
filegive: bump version to 0.3.1
2013-05-02 13:15:50 +03:00
Lluís Batlle i Rossell
28f87c0eb5
Adding description to filegive
2013-05-02 11:34:42 +04:00
Lluís Batlle i Rossell
bd55358159
Adding filegive, my file sending program
2013-05-02 11:32:58 +04:00
Lennart Kats
aa555c56ac
lftp: use a download location that keeps old versions around
2013-05-01 10:58:32 +02:00
Lluís Batlle i Rossell
678e983f5e
Adding reaver-wps.
2013-04-26 17:14:09 +04:00
Eelco Dolstra
607437122b
dhcpcd: Update to 5.6.8
2013-04-26 14:06:32 +02:00
Lluís Batlle i Rossell
b4687c6966
tahoe-lafs: update to 1.9.2
...
I had to update a python package too (foolscap)
2013-04-24 22:41:17 +04:00
Eelco Dolstra
d44ffc5338
curl: Update to 7.30.0
...
CVE-2013-1944
2013-04-23 14:54:51 +02:00
Rok Garbas
f1184916dd
Merge pull request #477 from coroa/offlineimap
...
offlineimap: enable support for the sqlite status backend
2013-04-23 03:47:15 -07:00
Jonas Hoersch
93c39d24b5
offlineimap: enable support for the sqlite status backend
2013-04-22 10:40:36 +02:00
Vladimír Čunát
1c22316af6
Merge pull request #429 from ierton/wicd-fixes
...
wicd: some fixes
2013-04-20 01:32:29 -07:00
Peter Simons
d6bdc558c7
nbd: update to version 3.3
2013-04-14 21:33:04 +02:00
Eelco Dolstra
4d5ba15ea9
openssh: Update to 6.2p1
2013-04-12 15:27:13 +02:00
Eelco Dolstra
8fc1fe9f6b
socat: Update to 1.7.2.1
...
CVE-2012-0219
2013-04-12 15:01:01 +02:00
Cillian de Róiste
277816eb00
lftp: update to 4.4.5
2013-04-10 14:13:27 +02:00
Rickard Nilsson
08f1b426bc
stunnel: Update to 4.56
...
Note, I had to add "fips = no" to my stunnel configuration after
the update.
2013-04-09 16:34:59 +02:00
Sergey Mironov
8b3b208f33
wicd: rename icons/hicolour to icons/hicolor
2013-04-09 09:27:45 +04:00
Peter Simons
48a2fb0aaa
httpie: update to version 0.4.1 to fix the build
2013-04-08 01:19:20 +02:00
Peter Simons
2fe970d6f2
httpie: the build input 'requests014' doesn't exist anymore, it's now called 'requests'
2013-04-08 01:17:44 +02:00
Sergey Mironov
18681ae58e
wicd: remove unused patches, remove ast with plain rm
2013-04-04 13:44:43 +04:00
Cillian de Róiste
69ad5c5c04
Fix the path to ping
...
iputils-20101006/sbin/ping has moved to iputils-20121221/bin/ping
Wicd uses ping to test the connection and produced and error message.
2013-04-03 23:34:02 +02:00
Sergey Mironov
6901f6346d
wicd: [HACK] fix various gtk issues
...
* hack around s.translate situation
* fix KeyError exception in error dialog
* fix Russian translation
2013-03-31 18:10:28 +00:00
Domen Kozar
ea4b0c33d8
Set correct paths when using nm-applet without desktop
2013-03-31 20:08:01 +02:00
Sergey Mironov
ee921d9df4
wicd: fix missing application icon
2013-03-31 13:06:31 +04:00
Sergey Mironov
f7efab5fd8
wicd: bring translations back.
2013-03-31 13:06:27 +04:00
Sergey Mironov
a8a3cc00fd
wicd: fix dhclient interaction
...
wicd used to write dhclient config file into $out/var/lib/wicd directory attempting
to change nix-store. That didn't work and thats why we couldn't use dhclient.
With this patch wicd will generate temporary file name for this purpose. File is
generated each time the daemon starts.
2013-03-31 13:06:24 +04:00
Domen Kozar
9a31d2ef0d
aircrack-ng: bump
2013-03-29 19:02:51 +01:00
Rob Vermaas
2fa4e36946
Add weighttp 0.3
2013-03-29 15:04:59 +01:00
Cillian de Róiste
924be9b524
Wicd: #379 Also add the gtk-2.0 directory in pygobject to the PYTHONPATH
2013-03-16 08:34:14 +01:00
Cillian de Róiste
0037e518b0
Merge branch 'wicd-gobject'
2013-03-15 01:00:19 +01:00
Cillian de Róiste
ef3da5eecd
#379 wicd: Add ifconfig and ping to the PATH
...
/var/log/wicd/wicd.log showed that it failed to find ifconfig
that was probably the main issue (after the gobject import failure)
2013-03-15 00:59:17 +01:00
Cillian de Róiste
2393f6b96f
#379 Update wicd to 1.7.2.4, fix patches, disable translations
2013-03-15 00:14:30 +01:00
Cillian de Róiste
0d191de368
Fix wicd to find the python gobject on its PYTHONPATH
2013-03-14 01:22:55 +01:00
Peter Simons
746bf427a8
pkgs/tools/networking/snx/snx_install.sh: delete file accidentally checked in earlier
2013-03-11 11:01:28 +01:00
David Guibert
856f6c2aea
fix iftop
2013-03-08 09:08:57 +01:00
Peter Simons
5f32207dfc
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-02-24 19:27:08 +01:00
Vladimír Čunát
4768a0cea6
netboot: change to a fixed version, fix build
2013-02-23 23:19:35 +01:00
Rok Garbas
6b30610672
offlineimap: updating license and add myself as maintainer
2013-02-23 10:55:11 +01:00
Rok Garbas
71a9716fd4
offlineimap: update to 6.5.5-rc2
2013-02-23 10:51:14 +01:00
Shea Levy
acd4299e75
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/top-level/all-packages.nix
Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
Peter Simons
45eb9f5589
snx: add version 800007027 of the CheckPoint SSL Network Extender
2013-02-21 15:56:16 +01:00
Shea Levy
aacca1902c
Merge branch 'upstream-master' into stdenv-updates
2013-02-19 10:09:39 -05:00
Eelco Dolstra
3a1d3990e5
openssh: Just use a mirror of the HPN patch
2013-02-19 11:03:10 +01:00
Lluís Batlle i Rossell
cde20d6951
Fixing openssh hpn support for 6.1p1
...
I had to write a weird download derivation to overcome their download procedure.
2013-02-19 10:50:50 +01:00
Cillian de Róiste
f81dbf4893
wicd: NixOS/nixos#88 add resolvconf to PATH for wicd
...
with this patch resolvconf is used to set the DNS via wicd, although
this doesn't seem to stop dhcpcd from clobbering /etc/resolv.conf
2013-02-18 21:46:15 +01:00
Shea Levy
c42d77aa35
Merge remote-tracking branch 'upstream/master' into stdenv-updates
2013-02-17 08:19:40 -05:00
Eelco Dolstra
954d519af7
minidlna: Update to 1.0.25 and use ffmpeg instead of libav
2013-02-16 21:49:55 +01:00
Vladimír Čunát
b79c0bd2f3
httpie: fix
2013-02-16 19:56:21 +01:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Eelco Dolstra
a3da633b84
openresolv: Update to 3.5.4
2013-02-11 17:46:29 +01:00
Eelco Dolstra
7c2e9cf2bf
dhcpcd: Update to 5.6.7
2013-02-11 17:46:29 +01:00
Shea Levy
e2abed75ec
Revert "Revert "curl: Update to version 7.29.0.""
...
This reverts commit ec4f56b347
.
With the added patch, the curl segfault seems to be fixed.
2013-02-10 13:44:00 -05:00
Shea Levy
ec4f56b347
Revert "curl: Update to version 7.29.0."
...
This reverts commit fd2cff9479
.
nix's substituter fails with this curl, so revert it until that's fixed.
2013-02-10 11:37:14 -05:00
aszlig
fd2cff9479
curl: Update to version 7.29.0.
...
This version contains a security fix for CVE-2013-0249, for details please have
a look at:
http://curl.haxx.se/docs/adv_20130206.html
Thanks to @roconnor for pointing this out.
I'm pushing this to stdenv-updates because I'm not quite sure if it will break
other things because 7.29.0 is now non-blocking by default. Plus the security
vulnerability only affects IMAP, POP3 and SMTP protocol support.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cherry-picked into master, this won't change stdenv.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-02-08 18:27:52 -05:00
aszlig
8e08e9ccf0
curl: Update to version 7.29.0.
...
This version contains a security fix for CVE-2013-0249, for details please have
a look at:
http://curl.haxx.se/docs/adv_20130206.html
Thanks to @roconnor for pointing this out.
I'm pushing this to stdenv-updates because I'm not quite sure if it will break
other things because 7.29.0 is now non-blocking by default. Plus the security
vulnerability only affects IMAP, POP3 and SMTP protocol support.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 09:03:22 +01:00
Eelco Dolstra
938afe971c
nss_myhostname: Remove
...
This package is now part of systemd.
2013-02-04 15:49:20 +01:00
Rickard Nilsson
789154b119
Add fping, a more scriptable ping
2013-02-04 10:45:47 +01:00
Lluís Batlle i Rossell
959dd6399c
wget: update to 1.14
...
The 1.13.4 took for me 2G of RAM while doing:
wget -r -l 1 -k https://fosdem.org/2013/schedule/events/
2013-02-01 22:18:17 +01:00
Eelco Dolstra
4718d430cc
mailutils: Fix build
...
http://hydra.nixos.org/build/3875816
2013-01-28 17:19:02 +01:00
Eelco Dolstra
08b8512ce4
lftp: Update to 4.4.0 and fix build
...
http://hydra.nixos.org/build/3896385
2013-01-28 17:19:01 +01:00
Lluís Batlle i Rossell
3b26ba7019
Merge remote-tracking branch 'central/master' into stdenv-updates
...
Conflicts:
pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
Rickard Nilsson
999480a0e4
nm-applet: Update to 0.9.6.4
2013-01-23 09:04:16 +01:00
Eelco Dolstra
0a47a28f1d
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-01-22 23:23:53 +01:00
Eelco Dolstra
331e7ac221
Merge remote-tracking branch 'origin/master' into systemd
2013-01-21 13:01:00 +01:00
James Cook
04194c576e
tinc: GPLv2+, not GPLv2.
2013-01-19 13:33:32 -08:00
James Cook
3066f86e0d
Fixed tinc license.
2013-01-19 11:25:43 -08:00
James Cook
2ba4f46752
tinc: A VPN daemon with full mesh routing.
2013-01-17 22:52:15 -08:00
Eelco Dolstra
eeda226b02
Merge branch 'master' into systemd
2013-01-15 12:11:07 +01:00
Peter Simons
b33ad366a1
Merge branch 'master' into stdenv-updates.
2013-01-11 15:46:10 +01:00
Shea Levy
e11365c0a5
dd-agent: No need to propagate sysstat, dd-agent doesn't belong in user profiles anyway
2013-01-08 16:17:21 -05:00
Shea Levy
a23c70c492
dd-agent: Add meta
2013-01-08 12:55:55 -05:00
Shea Levy
76076ea9cf
dd-agent: Propagate sysstat
2013-01-08 12:48:24 -05:00
Shea Levy
bc2e957308
dd-agent: Add python so patchShebangs can patch python scripts
2013-01-08 12:42:11 -05:00
Shea Levy
4b2632e54a
dd-agent: Move /usr stuff to directly
2013-01-08 12:35:41 -05:00
Shea Levy
74c92f5f4a
First attempt at packaging dd-agent
2013-01-08 12:32:47 -05:00
Eelco Dolstra
c6c1bc6b0f
Merge branch 'master' into systemd
2013-01-07 00:34:25 +01:00
Eelco Dolstra
53efca6946
nzbget: Update to 9.0
2013-01-06 22:31:16 +01:00
Peter Simons
9e9cd7b529
Merge branch 'master' into stdenv-updates.
2013-01-04 21:00:53 +01:00
Jan Malakhovski
ef926f21e6
maildrop: add version 2.6.0
2013-01-04 03:07:46 +00:00
Rickard Nilsson
38a14fac65
NetworkManager: cooperate better with systemd
2013-01-03 18:14:38 +01:00
Rickard Nilsson
db292a74c0
Merge remote-tracking branch 'upstream/master' into systemd
...
Conflicts:
pkgs/tools/networking/network-manager/default.nix
2013-01-03 13:44:47 +01:00
Rickard Nilsson
ed226c9496
NetworkManager: Update to 0.9.6.4
2013-01-03 13:06:59 +01:00
Antono Vasiljev
38e5443d86
httpie: fix description
2012-12-29 01:09:01 +02:00
Antono Vasiljev
f2c2d18a07
Added httpie
...
HTTPie is a command line HTTP client. Its goal is to make CLI
interaction with web services as human-friendly as possible.
2012-12-29 00:28:34 +02:00
Lluís Batlle i Rossell
b58780c43d
Merge remote-tracking branch 'eelco/master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/gcc/4.7/default.nix
Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
88b11196c1
Clean up redundant "if condition then true else false"
2012-12-28 19:57:47 +01:00
Eelco Dolstra
3fa03df78c
openssh: Remvoe unused Perl dependency
...
Since "buildNativeInputs" was misspelled, Perl is not actually used.
2012-12-28 19:26:28 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5be0a9acd7
Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
...
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Rok Garbas
5872a8eae8
aircrack-ng: update
2012-12-28 02:16:31 +01:00
Eelco Dolstra
99f7c4e324
Merge branch 'master' into systemd
2012-12-27 01:28:25 +01:00
Antono Vasiljev
2828729b9b
mu0 -> mu, version bump
2012-12-25 21:59:48 +02:00
Eelco Dolstra
f364619e22
Merge remote-tracking branch 'origin/master' into stdenv-updates
2012-12-12 17:01:20 +01:00
Eelco Dolstra
6a0288d14b
network-manager: Fix building against systemd
...
http://hydra.nixos.org/build/3473319
2012-12-12 16:26:03 +01:00
aszlig
e42dc52f42
samplicator: New package, version 1.3.7-beta6.
...
A small and lightweight UDP redirector if you don't want to bend a fly on the
wheel using socat.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
aszlig
abb7c98cfe
wbox: New package, version 5.
...
Yet another HTTP benchmarking tool, which is really quite minimalistic and in
ANSI C.
This package maybe isn't even worth putting it in its own file and directory but
I did it for the sake of consistency.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
aszlig
7cd641a4e7
hping: New package, version 20051105.
...
Quite a lot of patching involved here, but the upstream package is no longer
maintained anymore. Nevertheless the tool is still useful in some environments.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:17 +01:00
Eelco Dolstra
5e256ccc88
Merge remote-tracking branch 'origin/master' into stdenv-updates
2012-12-04 17:12:35 +01:00
Michael Raskin
e2b68cb9dc
Update GVPE
2012-12-04 10:21:11 +04:00
aszlig
faf5d42621
mtr: Update to new upstream version 0.82.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-03 11:10:16 +01:00
Eelco Dolstra
5553546c21
Remove a bunch of unreferenced files
...
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Jack Cummings
9d6f5f79e4
Add 'connect' for traversing SOCKS proxies
2012-11-28 14:29:11 -08:00
Cillian de Róiste
dbe7377d28
Fix Tahoe-LAFS tests (thanks to zooko)
...
Zooko pointed out on IRC that running python setup.py build, before running the tests will create /bin/tahoe (which is necessary for running the tests).
2012-11-27 01:03:59 +01:00
Peter Simons
f67d5a9a39
Merge branch 'master' into stdenv-updates.
...
Conflicts have been resolved in:
pkgs/tools/misc/file/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Rickard Nilsson
98ad245200
nss-pam-ldapd: Upgrade to 0.8.11
2012-11-18 09:44:30 +01:00
Rickard Nilsson
67f478d1ed
ddclient: Upgrade to 3.8.1
2012-11-08 13:54:53 +01:00
Eelco Dolstra
0efbc7d3bf
dnsmasq: Update to 2.63
2012-10-26 16:23:30 +02:00
Peter Simons
c0b393866f
curl: update to version 7.28.0
2012-10-26 10:32:04 +02:00
Eelco Dolstra
5af277bbd1
Merge remote-tracking branch 'origin/master' into x-updates
2012-10-15 12:16:58 -04:00
Mathijs Kwik
e9f0cae00f
miniupnpd: upgrade to 1.7.20121005
2012-10-13 20:39:40 +02:00
Eelco Dolstra
41e9f7cfed
Merge remote-tracking branch 'origin/master' into x-updates
2012-10-08 13:48:30 -04:00
Eelco Dolstra
d72adde530
Add nss-myhostname
2012-10-07 14:59:29 -04:00
Eelco Dolstra
b78256fbd7
Merge remote-tracking branch 'origin/master' into x-updates
2012-10-01 11:43:43 -04:00
Rok Garbas
70ee9a6bb6
aircrack-ng: updating hash
2012-09-28 17:02:19 +02:00
Eelco Dolstra
d5758c99a3
Merge remote-tracking branch 'origin/master' into x-updates
...
Conflicts:
pkgs/misc/maven/maven-1.0.nix
pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00
Lluís Batlle i Rossell
5ba1df3811
mosh: update to 1.2.2
2012-09-26 09:38:36 +02:00
Eelco Dolstra
9b8d21bd80
wget: Update to 1.14
...
Also fixes the gets() problem in wget.
2012-09-24 17:43:47 -04:00
Eelco Dolstra
4952fa98ee
inetutils: Update to 1.9.1 and fix compilation
...
http://hydra.nixos.org/build/3052788
2012-09-21 13:39:20 -04:00
Rickard Nilsson
267c54921f
modemmanager: Update to 0.5.4.0
2012-09-19 15:19:33 +02:00
Eelco Dolstra
2322899a1f
openssh: Update to 6.1p1
2012-09-18 17:01:08 -04:00
Rickard Nilsson
7c43b041d9
Add nss-pam-ldapd version 0.8.10
...
nss-pam-ldapd is a fork of nss_ldap that uses a daemon (nslcd) to
connect to the LDAP server, instead of going directly from PAM/NSS.
This improves performance and separation, and increases security
if you connect to LDAP with a password, since only the nscd daemon
needs to know the password, not every user of PAM/NSS.
This commit will be followed by a commit to NixOS which enables the
use of the nslcd daemon.
2012-09-14 00:06:25 +02:00
Eelco Dolstra
fcb1d64322
curl: Update to 7.27.0
2012-09-13 11:36:34 -04:00
Mathijs Kwik
c1c9c9d2a1
network-manager: use libnl3, as libnl1 is no longer maintained
2012-09-09 13:04:13 +02:00
Lluís Batlle i Rossell
fcfa8908ca
miniupnpc: update to 1.7.
2012-09-01 00:10:43 +02:00
Rickard Nilsson
abf6366f87
Add surfraw 2.2.8
2012-08-31 10:55:23 +02:00
Yury G. Kudryashov
448b7cce53
Merge branch 'fix-NM-pptp'
2012-08-26 22:09:56 +04:00
Lluís Batlle i Rossell
2ecb9fdb58
aircrackng, kismet: update them to latest trunk and release respectively
2012-08-11 14:42:35 +02:00