Commit graph

1333 commits

Author SHA1 Message Date
Shea Levy
b2c87fbf98 lib: Add test for composeExtensions 2017-04-12 12:40:24 -04:00
Profpatsch
9b7b950832 /lib/default.nix: Add file docstring & unit test hint 2017-04-12 00:01:38 +02:00
Franz Pletz
3ab45f4b36
treewide: use boolToString function 2017-04-11 18:18:53 +02:00
Shea Levy
52f998a2ce Merge branch 'composeExtensions' 2017-04-11 11:16:29 -04:00
Yann Hodique
f4ff67099b keychain: add sigma as maintainer 2017-04-09 22:28:27 -07:00
snyh
273f1e56af deepin-terminal: init at 2.3.3 2017-04-09 23:12:43 +08:00
Cole Scott
98a287e733
lib/maintainers.nix add colescott 2017-04-09 01:06:33 +02:00
Jörg Thalheim
cb6d1fdfd9 Merge pull request #24331 from LumiGuide/ssmtp-AuthPassFile
ssmtp: use the authPassFile option instead of authPass
2017-04-08 17:22:26 +02:00
Jörg Thalheim
f7b97df2cd Merge pull request #24730 from Infinisil/buku-2.9
buku: 2.8 -> 2.9
2017-04-08 13:24:45 +02:00
Silvan Mosberger
c2a0f2584a
buku: 2.8 -> 2.9 2017-04-08 08:56:35 +02:00
Shea Levy
0a15af2ed1 lib: Add composeExtensions for composing extension functions 2017-04-07 14:30:05 -04:00
Emanuele Peruffo
b52a3d90fe robomongo: 0.8.4 -> 0.9.0 2017-04-07 12:19:19 +02:00
Tim Steinbach
4984e7e053 Merge pull request #24624 from taku0/source-han-serif
add Source Han Serif font
2017-04-06 13:48:00 -04:00
Jean Potier
09b1414acd cups-toshiba-estudio: init at 7.51 (#24676) 2017-04-06 15:00:02 +01:00
taku0
2994f14edb add source-han-serif-japanese, source-han-serif-korean, source-han-serif-simplified-chinese, source-han-serif-traditional-chinese: An open source Pan-CJK serif typeface 2017-04-06 21:57:13 +09:00
Taahir Ahmed
438ac662aa nomacs: init at 3.4 (#24580)
* nomacs: init at 3.4

* nomacs: add gsettings for gtk open dialogs

* nomacs: use fetchurl instead of fetchFromGitHub
2017-04-03 10:28:34 +02:00
Utku Demir
db6a2918b9 kt: init at 11.1.0 2017-04-03 16:10:30 +12:00
Joachim F
144d1e7be4 Merge pull request #24424 from dsferruzza/add-veracrypt
veracrypt: init at 1.19
2017-04-02 15:43:25 +01:00
David Sferruzza
cc4fa379cb maintainers: add dsferruzza 2017-04-02 16:37:11 +02:00
Dmitry Tsygankov
57a813f3df
bitcoin-unlimited: init at 1.0.1.3
Add the Bitcoin Unlimited client to the altcoins directory, so that all sides of the Bitcoin scaling debate are represented.
2017-04-01 23:34:36 +02:00
Daiderd Jordan
607a21b7c0 Merge pull request #24380 from fuzzy-id/haproxy-overworked4
haproxy: PCRE and LUA support via configurable options
2017-03-31 08:46:14 +02:00
John Ericson
4c0d7da183 Get rid of all with { inherit... } and just used let inherit...
The old forms presumably predates, or were made in ignorance of,
`let inherit`. This way is better style as the scoping as more lexical,
something which Nix can (or might already!) take advantage of.
2017-03-30 03:05:05 -04:00
Thomas Bach
ea80cd1f11 haproxy: added fuzzy-id to the list of maintainers 2017-03-29 12:27:50 +02:00
Shawn Dellysse
c87c0f2144
messenger-for-desktop: init at 2.0.6 2017-03-28 19:55:17 -04:00
Bas van Dijk
1d52c677be ssmtp: use the authPassFile option instead of authPass
This gives users the option of storing the authPass outside the
world-readable Nix store.
2017-03-29 00:34:23 +02:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Vasiliy Solovey
eef066d05c way-cooler: init at 0.5.2 2017-03-26 21:39:58 +03:00
Daniel Ehlers
20a5b5bead sshguard: new package 2017-03-26 14:46:22 +02:00
Frederik Rietdijk
f4a1eab239 Merge pull request #23863 from plumps/add-vulnix
vulnix: init at 1.2.2
2017-03-24 11:12:50 +01:00
Baptist BENOIST
7d72b9b74e Remove bbenoist from maintainers
Sorry guys but I did not used Nix since months and cannot spend time
maintaining my previous work...
2017-03-23 03:03:04 +01:00
Piotr Bogdan
77b5d22df3 gmtp: init at 1.3.10 (#24178) 2017-03-22 15:20:16 +01:00
jansol
f9e688e8a1 renderdoc: init at version 0.34pre (#23769)
* renderdoc: init at version 0.34pre

Initialising a few commits after the latest release due to some upstream
improvements to the build system.

* fix maintainer
2017-03-21 21:36:26 +01:00
Tim Steinbach
e361bc4556 Merge pull request #24108 from adelbertc/coursier-1-0-0-M15
coursier: init at 1.0.0-M15
2017-03-21 09:26:47 -04:00
Adelbert Chang
8d182a7e6b coursier: makeWrapper as nativeBuildInputs, add adelbertc and nequissimus as maintainers 2017-03-20 09:04:40 -07:00
zimbatm
3bbab17575 Merge pull request #23929 from Profpatsch/lib-lists-doc
Improve lib/trivial and lib/lists docs
2017-03-20 14:42:58 +00:00
Victor Calvert
fee7e73538 Adding self as maintainer 2017-03-20 00:55:32 -04:00
Daiderd Jordan
52c6d6770f Merge pull request #24050 from shanemikel/package_htmldoc
htmldoc: add darwin support
2017-03-19 22:39:36 +01:00
Profpatsch
4f1d977877 lib/tests: add more tests for fold functions
Also the invocation of tests is documented.
2017-03-19 22:06:53 +01:00
Profpatsch
cb9ff8bfa7 lib/lists: rename fold to foldr & improve fold docs
In order to better distinguish foldr from foldl the default name is changed to
foldr, but fold is still a synonym.

Additionally the docs are improved and examples added.
2017-03-19 22:06:49 +01:00
Jörg Thalheim
8490317fef Merge pull request #24020 from xvapx/add/libnacl-1.5.0
pythonPackages.libnacl: init at 1.5.0
2017-03-19 21:02:03 +01:00
Marti Serra
c883cefc6f pythonPackages.libnacl: init at 1.5.0 2017-03-19 20:11:50 +01:00
Nathan Isom
b82f3f6943 mpvc: init at unstable-2017-03-18 (#24037)
* mpvc: init at unstable-2017-03-18

* mpvc: simplify build

* mpvc: add maintainer
2017-03-19 18:17:52 +01:00
Orivej Desh
02126b69e5
lib.readPathsFromFile: simplify, /cc #24036
This part isn't needed after 36de745e1b.
2017-03-19 14:52:47 +01:00
Vladimír Čunát
36de745e1b
readPathsFromFile: fixup after #23851
The final newline would produce an empty string;
let's filter all empty lines as well.
2017-03-19 10:19:20 +01:00
Shane Pearlman
63bd364cf9 htmldoc: add darwin support
I also added a long description and updated the homepage to point to
the author’s new github.io site.
2017-03-18 21:44:55 -07:00
Michael Raskin
e8d7014dac Merge pull request #22722 from patternspandemic/kodestudio
kodestudio: init at 17.1
2017-03-18 17:18:10 +01:00
Vladimír Čunát
742b120ddc
Merge branch 'master' into staging
Nontrivial rebuilds from master, again :-/
2017-03-18 11:00:31 +01:00
patternspandemic
bb728268b5
kodestudio: init at 17.1 2017-03-16 15:50:01 -07:00
Sergii Paryzhskyi
18a272ef75 sbt-0.12.4: add an older stable version (#23933) 2017-03-15 21:17:23 +00:00
Léo Gaspard
da6619cffe libs: make splitString also split last separator (#23851)
* libs: make splitString also split last separator

* libs: add tests for splitStrings
2017-03-15 21:16:04 +00:00
Profpatsch
b052a36294 lib/trivial: expand function docs 2017-03-15 18:29:33 +01:00
Maksim Bronsky
97f26ee39a initial release: vulnix 2017-03-15 15:09:19 +01:00
Jörg Thalheim
212efab7ac Merge pull request #23768 from benley/lib-whitespace
lib: fix mixed tab/space indents, trailing whitespace, etc
2017-03-12 22:28:29 +01:00
Bo Bakker
1d948ddc01
caf: init at 0.15.3
fixes #23772
2017-03-12 21:53:49 +01:00
Benjamin Staffin
d9123a2329 lib: fix mixed tab/space indents, trailing whitespace, etc
Nix style seems to have settled on not using spaces between bound
variable names and the lambda : so I also tried to make those somewhat
more consistent throughout.
2017-03-11 17:48:43 -05:00
David Johnson
2151e3b8eb
packetdrill: init at 1.0
Closes https://github.com/NixOS/nixpkgs/pull/23679
2017-03-10 23:35:26 +01:00
Jörg Thalheim
eb8b6022ed Merge pull request #23640 from PierreR/master
pythonPackages.pepper: init at 0.5.0
2017-03-09 12:05:24 +01:00
zimbatm
ac1c3c95e1 alphabetize maintainers list 2017-03-09 11:00:43 +00:00
Pierre Radermecker
de363e8706 pepper: add 'pierrer' as a maintainer 2017-03-09 10:44:39 +01:00
NWDD
0f72dee000 add xnwdd <Guillermo NWDD> as a maintainer 2017-03-07 20:32:46 +01:00
Jörg Thalheim
7576bea49d Merge pull request #23551 from nthorne/clog-derivation
clog-cli: init at 0.9.2
2017-03-06 14:54:12 +01:00
Niklas Thörne
8d87f8addd clog-cli: init at 0.9.2
Updated with maintainer information.
2017-03-06 13:45:39 +01:00
Shea Levy
56e71f62dc Add locateDominatingFile lib function 2017-03-04 13:15:23 -05:00
Bjarki Ágúst Guðmundsson
62be972de9 google-play-music-desktop-player: init at 4.2.0 2017-03-04 16:19:31 +00:00
Ji-Haeng Huh
85d0348e2a
eflite: init at 0.4.1
fixes #23336
2017-03-03 16:33:16 +01:00
Daiderd Jordan
d88721e440
modules: add support for module replacement with disabledModules
This is based on a prototype Nicolas B. Pierron worked on during a
discussion we had at FOSDEM.

A new version with a workaround for problems of the reverted original.
Discussion: https://github.com/NixOS/nixpkgs/commit/3f2566689
2017-03-03 13:45:22 +01:00
Vladimír Čunát
fcec3e1c72
Revert "modules: add support for module replacement with disabledModules"
This reverts commit 3f2566689d for now.
Evaluation of the tested job got broken, blocking nixos-unstable.
2017-03-01 21:56:01 +01:00
Daiderd Jordan
37705ac1b1 use relative path for module tests 2017-02-28 00:14:48 +01:00
Daiderd Jordan
3f2566689d modules: add support for module replacement with disabledModules
This is based on a prototype Nicolas B. Pierron worked on during a
discussion we had at FOSDEM.
2017-02-28 00:14:48 +01:00
Thomas Tuegel
b39e491eb5
lib.makeScope: Save package set function 2017-02-27 11:49:43 -06:00
Peter Hoeg
e564a399d9 Merge pull request #22770 from NickHu/master
fdr: init at 4.2.0
2017-02-25 14:50:04 +08:00
Nick Hu
cbe765043f fdr: init at 4.2.0 2017-02-24 11:00:02 +00:00
Asumu Takikawa
85fb29bb49 ndpi: init at 1.8 2017-02-22 00:20:10 -08:00
Jörg Thalheim
048c04654d
maintainers: update my email address 2017-02-19 18:35:53 +01:00
Joachim F
82044248a3 Merge pull request #22993 from Ma27/update/geogebra
geogebra: 5-0-328-0 -> 5-0-331-0
2017-02-19 18:25:26 +01:00
Domen Kožar
50da0b3019 Merge pull request #22912 from teh/sourceRegex
lib: Add a function to filter sources by regular expressions.
2017-02-19 17:38:35 +01:00
Maximilian Bosch
10a453c61b
geogebra: add ma27 as maintainer 2017-02-19 16:51:01 +01:00
Rene Treffer
5236e23502 prometheus-bind-exporter: init at 20161221
prometheus-bind-exporter: init at 20161221
2017-02-18 13:43:59 +01:00
Tom Hunger
cb96ed615e lib: Add a function to filter sources by regular expressions. 2017-02-17 18:56:39 +00:00
Robin Gloster
b3c58dc38b Merge pull request #22222 from afldcr/polybar-3.0.3
polybar: init at 3.0.4
2017-02-17 02:49:44 +01:00
Kristoffer Søholm
0ed06bcce7 pypandoc: 1.2.0 (broken) -> 1.3.3 (#22782) 2017-02-15 15:28:23 +00:00
Tom Doggett
c2a21d4d7b gcalcli: init at 3.4.0 (#22725) 2017-02-14 23:25:42 +01:00
Thomas Tuegel
a5b8d468a5 Merge pull request #18455 from danbst/override
add .overrideDerivation and .overrideAttrs to packages created with callPackages
2017-02-14 13:17:13 -06:00
Thomas Tuegel
549f5b7d13
Update e-mail address for ttuegel 2017-02-13 16:02:51 -06:00
ndowens
a77705748b worker: init at 3.8.5
modified:   pkgs/top-level/all-packages.nix

    pick 8096649e47 worker: init at 3.8.5
    squash 9267acbd46 modified:   pkgs/top-level/all-packages.nix

worker: updated default.nix license field

Added myself to lib/maintainers.nix

    squash 28173341fa worker: updated default.nix license field
    squash b22407cf5c Added myself to lib/maintainers.nix

Fixed indent and added missing > in maintainers.nix

Fixed curly bracket indent
2017-02-12 17:45:42 -06:00
danbst
9d55479e07 add .overrideDerivation and .overrideAttrs to packages created with callPackages/callPackagesWith
nix/nixUnstable, tomcatN and postgresqlNN use `callPackages` pattern, they have .override
attribute, but lack .overrideDerivation and recent .overrideAttrs.
Packages created with `callPackage` have all of those. Because .overrideDerivation function
is used in public, without this we can break code when refactoring callPackage -> callPackages.
2017-02-12 14:00:28 +00:00
Changlin Li
f6dd263d42 bfg-repo-cleaner: init at 1.12.15 2017-02-12 01:53:08 -05:00
David Terry
a3523022e7 range-v3: init at 2017-01-30 (#22661) 2017-02-11 19:10:46 +01:00
Frederik Rietdijk
c9f4d714fe Merge pull request #22417 from edanaher/move-neovim-remote
neovim-remote: move from python-packages to /neovim/neovim-remote.
2017-02-10 17:47:25 +01:00
Evan Danaher
ee4f732633 neovim-remote: add meta section.
Also add myself to maintainers; it's time to admit I'm not leaving
anytime soon ;)
2017-02-10 11:43:42 -05:00
Carles Pagès
4059a29394 Merge pull request #22512 from paperdigits/dateutils
dateutils: init at 0.4.1
2017-02-10 11:55:15 +01:00
Stefan Siegl
f800a4b197 tomboy: init at 1.15.7 (#22589) 2017-02-09 14:17:35 +00:00
Mica Semrick
70a7fe9d03 dateutils: init at 0.4.1 2017-02-08 19:31:31 -08:00
Andrew Cann
3082647e74 trezord: init at 1.2.0 (#22054) 2017-02-08 17:18:22 +01:00
Celine Mercier
78c052e91a
ecopcr: init at 0.8.0 2017-02-06 16:01:08 +01:00
James Alexander Feldman-Crough
0f905b0dc8
polybar: init at 3.0.4
Polybar is a status bar in the vein of xmobar or i3bar.
2017-02-05 10:57:02 -08:00
Hannu Hartikainen
d91b39b3f9 illum: init at 0.4 2017-02-04 20:22:51 +02:00
Remy Goldschmidt
d1aa065a5d dotnetPackages.Boogie: init at 2017-01-03 2017-02-04 15:27:18 +01:00
Nikolay Amiantov
5b759293e0 modules lib: type description in type error message 2017-02-03 11:28:33 +01:00
Benjamin Staffin
53e6431d61 Merge pull request #22358 from yorickvP/asteriskupd
asterisk: add lts version
2017-02-03 02:30:34 -05:00
Nikolay Amiantov
5247140e57 Merge pull request #21875 from abbradar/gateway-interface
Allow specifying interface for default gateway
2017-02-03 02:26:31 +03:00
Yorick van Pelt
59fd1c802e asterisk: add maintainer 2017-02-02 15:15:53 +01:00
Nikolay Amiantov
fcb20b9fee module tests: add tests for coercedTo 2017-02-02 01:53:00 +03:00
Nikolay Amiantov
5cbcd3af69 types library: add coercedTo 2017-02-02 01:53:00 +03:00
Daiderd Jordan
bc735d4a1b Merge pull request #22324 from rongcuid/kmix
kmix: init at 16.12.1
2017-02-01 22:58:32 +01:00
Eelco Dolstra
9d6a55aefd
~/.nixpkgs -> ~/.config/nixpkgs
The former is still respected as a fallback for config.nix for
backwards compatibility (but not for overlays because they're a new
feature).
2017-02-01 16:07:55 +01:00
Rongcui Dong
c1250e96f3 kmix: init at 16.12.1
Signed-off-by: Rongcui Dong <rongcuid@outlook.com>
2017-01-31 22:41:58 -08:00
Orivej Desh
d409d23945 pidgin-xmpp-receipts: init at 0.7 2017-01-31 09:33:30 +01:00
Alexey Shmalko
682e7a3643 Merge pull request #22281 from vifino/master
wmutils-opt: init at v1.0
2017-01-30 22:44:30 +02:00
Adrian Pistol
f6e2772cd3 wmutils-opt: init at v1.0 2017-01-30 20:42:16 +00:00
Eelco Dolstra
c20cc6d0b3
Excise use of importJSON
Putting information in external JSON files is IMHO not an improvement
over the idiomatic style of Nix expressions. The use of JSON doesn't
add anything over Nix expressions (in fact it removes expressive
power). And scattering package info over lots of little files makes
packages less readable over having the info in one file.
2017-01-30 11:44:08 +01:00
Tuomas Tynkkynen
7b8e93bda9 platforms.nix: Add aarch64 to mesaPlatforms 2017-01-29 02:08:04 +02:00
Tuomas Tynkkynen
e2a2f6d595 Merge pull request #22117 from dezgeg/aarch64-for-merge
Aarch64 (ARM64) support
2017-01-26 17:52:28 +02:00
Pradeep Chhetri
60c26bc9f5 riemann-c-client: 1.7.0 -> 1.9.1 2017-01-26 17:04:37 +05:30
Vladimír Čunát
15219fe15e
licenses.eupl11: unify with the other licenses
... as it *is* present in the SPDX list.
2017-01-25 23:31:25 +01:00
oleks
98e830efe2
licenses: add EUPL v1.1 license 2017-01-25 23:18:33 +01:00
Daiderd Jordan
204a2354bd Merge pull request #22037 from jpierre03/pr-hubicfuse
hubicfuse: 2.1.0 -> 3.0.0
2017-01-24 23:08:06 +01:00
Tuomas Tynkkynen
7c8a060c09 stdenv: Bringup aarch64 architecture support 2017-01-25 00:01:51 +02:00
Jean-Pierre PRUNARET
11f878a0e5 add a maintainer 2017-01-24 13:05:58 +01:00
Marius Bergmann
00444cbf25 journalbeat service: init at 5.1.2
Journalbeat is a log shipper from systemd/journald to
Logstash/Elasticsearch. I added a package as well as a NixOS service
module for it.
2017-01-23 18:28:55 +01:00
Alistair Bill
15b4a37027 neofetch: init at 2.0.2 2017-01-22 21:46:31 +01:00
Carles Pagès
fd400ced6b Rename page to cpages to match github
I also updated the mail.
2017-01-20 16:55:29 +01:00
Michael Raskin
90e7568bfc Merge pull request #21973 from nixy/init/hy
hy: init at 0.11.1
2017-01-19 09:32:09 +00:00
Andrew R. M
b8acb928cc hy: init at 0.11.1
This is the hy language, a dialect of lisp designed to be closely
intergrated with python.
2017-01-18 09:32:59 -05:00
Lee Machin
3e86a0b496 Add rubocop linter for Ruby (#21934)
Use gemdir and pname as suggested by @zimbatm

Fix silly typo
2017-01-17 09:55:23 +00:00
Johannes Bornhold
17c61810e3 Add johbo to maintainers 2017-01-15 00:32:20 +01:00
Michael Raskin
9b00d43ed5 Merge pull request #21750 from knedlsepp/fix-grib-problems
grib-api: 1.14.4 -> 1.19.0
2017-01-09 09:28:07 +00:00
pngwjpgh
071481ca7d debianutils: init at 4.8.1 (#21739) 2017-01-09 06:41:06 +01:00
Josef Kemetmueller
64e4b7ac42 grib-api: 1.14.4 -> 1.19.0
- Remove downloading of testdata during buildPhase to
  - fix hydra build
  - remove impurity
  - reduce traffic
- Bump version
- Add myself as a maintainer
2017-01-08 12:42:25 +01:00
Sarah Brofeldt
760710efd1 qualia: init at 1.0.0
tests disabled
maintainer srhb
2017-01-07 21:24:44 +01:00
jgertm
52a7b6549f bitbucket-server-cli: init at 0.7.0 (#21616) 2017-01-05 10:21:06 +00:00
Graham Christensen
fa89f84c54
maintainers: rename mdipietro to polyrod to match their github name 2017-01-03 20:39:20 -05:00
Maurizio Di Pietro
e0878ce316
chase: init at 0.5.2 2017-01-03 20:32:59 -05:00
Daiderd Jordan
3daa019125 Merge pull request #21551 from zauberpony/vultr-init
vultr: init at 1.12.0
2017-01-04 00:08:04 +01:00
Daiderd Jordan
3ac20e92e8 Merge pull request #21598 from danielfullmer/rclone-1.35
rclone: 1.33 -> 1.35
2017-01-03 01:51:11 +01:00
Daniel Fullmer
76d37ce3b7 rclone: 1.33 -> 1.35 2017-01-02 19:27:42 -05:00
Elmar Athmer
bd0595ea80 vultr: init at 1.12.0 2017-01-01 20:57:52 +01:00
Jörg Thalheim
84a50084c3 Merge pull request #21444 from league/fix/gphoto2-udev
gphoto2: nixos programs module to configure udev
2017-01-01 11:16:28 +01:00
Daiderd Jordan
6e6334a514 Merge pull request #21529 from ivan-tkatchev/master
makerpm: init at 1.0
2016-12-31 21:35:14 +01:00
tkatchev
4073aaa7e1 makerpm: init at 1.0 2016-12-31 23:19:31 +03:00
Roman Naumann
87ef766f6b Merge branch 'master' of github.com:nixos/nixpkgs into add_pkg_gorilla 2016-12-29 14:02:52 +01:00
oida
8376f5cc3a
prometheus-snmp-exporter: init at v0.1.0 2016-12-29 02:03:12 +01:00
Roman Naumann
ec57a4bc50 Merge branch 'master' into add_pkg_gorilla 2016-12-28 23:33:56 +01:00
Roman Naumann
e5cd718974 gorilla: init at 1.5.3.7 2016-12-28 23:25:50 +01:00
David Pätzel
3414470d9d urlscan: init at 0.8.3 2016-12-28 12:13:36 +01:00
Michael Raskin
e1b1df2bd9 Merge pull request #20028 from zraexy/qsyncthingtray
qsyncthingtray: init at 0.5.5rc2
2016-12-28 10:40:18 +00:00
Christopher League
6eead52e12 gphoto2: nixos programs module to configure udev
Closes #21420.
2016-12-27 17:47:38 -05:00
Jason Daniel Augustine Gilliland
59ca5d213f freebayes: init at 1.1.0
Signed-off-by: zimbatm <zimbatm@zimbatm.com>
2016-12-22 14:10:37 +00:00
volth
ac97fbab3a fte: init at 0.50.02 2016-12-19 16:15:59 +01:00
Marcin Janczyk
bc6e9af7fa keepass-keefox: add myself as a maintainer 2016-12-18 19:04:35 +01:00