Commit graph

35815 commits

Author SHA1 Message Date
Cillian de Róiste 02e693c400 synthv1: update from 0.4.0 to 0.4.1 2014-04-12 11:58:29 +02:00
Cillian de Róiste 440a174e2d samplv1: update from 0.4.0 to 0.4.1 2014-04-12 11:58:13 +02:00
Cillian de Róiste aee930586f drumkv1: update from 0.4.0 to 0.4.1 2014-04-12 11:57:43 +02:00
Vladimír Čunát 83cb0354e9 clang_34: make it evaluate to 3.4 even on Darwin 2014-04-12 09:46:37 +02:00
Austin Seipp 172dc1336f nixos: add grsecurity module (#1875)
This module implements a significant refactoring in grsecurity
configuration for NixOS, making it far more usable by default and much
easier to configure.

 - New security.grsecurity NixOS attributes.
   - All grsec kernels supported
   - Allows default 'auto' grsec configuration, or custom config
   - Supports custom kernel options through kernelExtraConfig
   - Defaults to high-security - user must choose kernel, server/desktop
     mode, and any virtualisation software. That's all.
   - kptr_restrict is fixed under grsecurity (it's unwriteable)
 - grsecurity patch creation is now significantly abstracted
   - only need revision, version, and SHA1
   - kernel version requirements are asserted for sanity
   - built kernels can have the uname specify the exact grsec version
     for development or bug reports. Off by default (requires
     `security.grsecurity.config.verboseVersion = true;`)
 - grsecurity sysctl support
   - By default, disabled.
   - For people who enable it, NixOS deploys a 'grsec-lock' systemd
     service which runs at startup. You are expected to configure sysctl
     through NixOS like you regularly would, which will occur before the
     service is started. As a result, changing sysctl settings requires
     a reboot.
 - New default group: 'grsecurity'
   - Root is a member by default
   - GRKERNSEC_PROC_GID is implicitly set to the 'grsecurity' GID,
     making it possible to easily add users to this group for /proc
     access
 - AppArmor is now automatically enabled where it wasn't before, despite
   implying features.apparmor = true

The most trivial example of enabling grsecurity in your kernel is by
specifying:

    security.grsecurity.enable          = true;
    security.grsecurity.testing         = true;      # testing 3.13 kernel
    security.grsecurity.config.system   = "desktop"; # or "server"

This specifies absolutely no virtualisation support. In general, you
probably at least want KVM host support, which is a little more work.
So:

    security.grsecurity.enable = true;
    security.grsecurity.stable = true; # enable stable 3.2 kernel
    security.grsecurity.config = {
      system   = "server";
      priority = "security";
      virtualisationConfig   = "host";
      virtualisationSoftware = "kvm";
      hardwareVirtualisation = true;
    }

This module has primarily been tested on Hetzner EX40 & VQ7 servers
using NixOps.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-11 22:43:51 -05:00
Austin Seipp cf24cf1184 capstone: attempt to fix Linux build, remove Darwin build
The Darwin build seems fixable but I can't test right now.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-11 21:41:14 -05:00
Austin Seipp 036a7708a2 libseccomp: attempt to fix Hydra build
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-11 21:37:19 -05:00
Austin Seipp acd5a9d8b4 spiped: attempt to fix linux Hydra build
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-11 21:35:08 -05:00
Austin Seipp 71d7bec227 p0f: build fix attempt for Hydra
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-11 21:32:30 -05:00
Mathijs Kwik b21853f255 Fix initrd breaking by recent repeatable-builds changes
See the comments at f67015cae4
for more information.

Please note: this makes initrd unrepeatable again, but most people will prefer that above an unbootable system.
2014-04-12 00:06:30 +02:00
Mathijs Kwik 5a3fa7f88f nvidia-x11: patch for kernel 3.14 support 2014-04-11 23:40:16 +02:00
Peter Simons 50b1a8ea0b haskell-diagrams-postscript: update to version 1.0.2.4 2014-04-11 22:33:12 +02:00
Peter Simons d2e61750df haskell-diagrams-lib: update to version 1.1.0.6 2014-04-11 22:33:11 +02:00
Peter Simons ce15e84af3 haskell-diagrams-contrib: update to version 1.1.1.4 2014-04-11 22:33:11 +02:00
Peter Simons 716cffc1bb haskell-language-c-inline: re-generate with cabal2nix 2014-04-11 22:33:11 +02:00
Peter Simons f32be2da85 haddock: update to version 2.14.2 2014-04-11 22:33:11 +02:00
Peter Simons 86177f06e9 haskell-haskell-src: add version 1.0.1.6 2014-04-11 22:33:11 +02:00
Peter Simons f5dd4d383b haskell-HTTP: update to version 4000.2.12 2014-04-11 22:33:11 +02:00
Peter Simons fd376138b2 haskell-yesod-core: update to version 1.2.12 2014-04-11 22:33:11 +02:00
Peter Simons e77f2cd689 haskell-texmath: update to version 0.6.6.1 2014-04-11 22:33:11 +02:00
Peter Simons 43a77ee1ab haskell-monoid-extras: update to version 0.3.3.2 2014-04-11 22:33:11 +02:00
Peter Simons 2379850cad haskell-monad-logger: update to version 0.3.6 2014-04-11 22:33:11 +02:00
Peter Simons ecbb36caf1 haskell-hxt: update to version 9.3.1.4 2014-04-11 22:33:11 +02:00
Peter Simons 35e8034716 haskell-hxt-unicode: update to version 9.0.2.2 2014-04-11 22:33:11 +02:00
Peter Simons 7cc83c8c74 haskell-dual-tree: update to version 0.2.0.2 2014-04-11 22:33:11 +02:00
Peter Simons c203d9c5fa haskell-cereal-conduit: update to version 0.7.2.1 2014-04-11 22:33:11 +02:00
Peter Simons a0264d3db8 haskell-active: update to version 0.1.0.12 2014-04-11 22:33:11 +02:00
Peter Simons e1bdc5c164 haskell-statistics: add version 0.11.0.0 2014-04-11 22:33:11 +02:00
Peter Simons ea95516bf8 haskell-parsers: add version 0.11 2014-04-11 22:33:11 +02:00
Peter Simons 4604d52df4 GHC version 7.8.1 has been deprecated because of a serious bug.
We'll have version 7.8.2 out soon.

http://www.haskell.org/pipermail/ghc-devs/2014-April/004605.html
http://www.haskell.org/pipermail/ghc-devs/2014-April/004616.html
2014-04-11 22:33:11 +02:00
Peter Simons 5b211b9a9b Merge pull request #2207 from jwiegley/master
Add c2hsc to haskell-packages.nix
2014-04-11 22:30:49 +02:00
Domen Kožar baf2a4d4b9 ugly tarball fix for llvmPackages support on Darwin 2014-04-11 21:28:43 +02:00
John Wiegley 8026caec43 Add c2hsc to haskell-packages.nix 2014-04-11 10:34:56 -05:00
Ricardo M. Correia b8a6eef6fa gradm: Attempt to fix build failure by using older flex
Thanks to @thoughtpolice for noticing and suggesting the fix!
2014-04-11 16:38:24 +02:00
Peter Simons 2396e9d036 perlPackages.PackageStash: Revert "update from 0.34 to 0.36"
This reverts commit 5adbf4d447. The update broke
the test suite of perl-Moose [1], which is required by Hydra.

[1] http://hydra.nixos.org/build/10268974
2014-04-11 15:23:34 +02:00
Mathijs Kwik d87ae02fc1 synergy: upgrade to 1.4.17 2014-04-11 14:09:07 +02:00
Mathijs Kwik 62521d9ec6 openttd: upgrade to 1.4.0 2014-04-11 13:49:19 +02:00
Eelco Dolstra ed82f188f9 nix-repl: Update 2014-04-11 12:54:54 +02:00
Oliver Charles 3befd72618 Merge pull request #2201 from offlinehacker/pkgs/postgresql93/darwin_fix
postgresql93: fix darwin builds
2014-04-11 11:38:49 +01:00
Eelco Dolstra 2da09363bf nix: Update to 1.7 2014-04-11 12:24:48 +02:00
Peter Simons b5773eeccb R: update to version 3.1.0 2014-04-11 12:07:00 +02:00
Peter Simons 9818422bc0 Merge pull request #2203 from fmap/language-c-inline
New derivation: language-c-inline (haskell)
2014-04-11 11:45:45 +02:00
Peter Simons 846906fc53 ipsec-tools: fix build by passing old version of flex 2014-04-11 11:09:59 +02:00
Peter Simons e35c2f6d4c all-packages.nix: drop trailing whitespace 2014-04-11 10:06:19 +02:00
Peter Simons 6913650adc maude: use old flex version; the new one causes build errors
This issue has been fixed in the latest alpha release.
2014-04-11 10:06:18 +02:00
Peter Simons f741be954c Offer consistently named attributes for the two available flex versions. 2014-04-11 10:06:18 +02:00
Vladimír Čunát 8c12816d59 pango on darwin: amend the wrong fix
I didn't realize pango doesn't depend on flex directly,
only through introspection which caused build problems by itself, too.
2014-04-11 09:57:26 +02:00
Vladimír Čunát e2e74154e2 fix tarball (dragonegg missing in llvmPackages on darwin) 2014-04-11 09:57:25 +02:00
Peter Simons b62ac3995c haskell-hastache: remove obsolete version 0.5.1 2014-04-11 09:53:16 +02:00
Peter Simons cf000e0d0f haskell-yesod-persistent: update to version 1.2.2.3 2014-04-11 09:53:15 +02:00
Peter Simons 8c3a7ea68c haskell-yesod-form: update to version 1.3.8.2 2014-04-11 09:53:15 +02:00
Peter Simons a72ef2976c haskell-yesod-auth: update to version 1.3.0.4 2014-04-11 09:53:15 +02:00
Peter Simons 967027576b haskell-thyme: update to version 0.3.3.0 2014-04-11 09:53:15 +02:00
Peter Simons 9b2b87379c haskell-tf-random: update to version 0.5 2014-04-11 09:53:15 +02:00
Peter Simons 37b804f7df haskell-semigroups: update to version 0.13.0.1 2014-04-11 09:53:15 +02:00
Peter Simons 977aa979bf haskell-quickcheck-instances: update to version 0.3.8 2014-04-11 09:53:15 +02:00
Peter Simons 237bf0f8b7 haskell-language-c: update to version 0.4.4 2014-04-11 09:53:15 +02:00
Peter Simons 47a7805337 haskell-hxt-xpath: update to version 9.1.2.1 2014-04-11 09:53:15 +02:00
Peter Simons 8fb3c001ee haskell-hmatrix: update to version 0.15.2.1 2014-04-11 09:53:15 +02:00
Peter Simons 5b0bd8e16e haskell-fay: update to version 0.19.2 2014-04-11 09:53:15 +02:00
Peter Simons e39071103e haskell-diagrams-core: update to version 1.1.0.2 2014-04-11 09:53:14 +02:00
Peter Simons 73b6fdefa8 haskell-criterion: update to version 0.8.0.2 2014-04-11 09:53:14 +02:00
Peter Simons 820757f402 haskell-classy-prelude: update to version 0.9.0 2014-04-11 09:53:14 +02:00
Peter Simons 3dd79d7e62 haskell-classy-prelude-conduit: update to version 0.9.0 2014-04-11 09:53:14 +02:00
Peter Simons 6cbf27406d haskell-binary-conduit: update to version 1.2.1.1 2014-04-11 09:53:14 +02:00
Peter Simons b0d1df0f8f haskell-aws: update to version 0.9 2014-04-11 09:53:14 +02:00
Peter Simons 6c0ce0abf7 haskell-active: update to version 0.1.0.11 2014-04-11 09:53:14 +02:00
Peter Simons d65daf11b0 haskell-HTF: update to version 0.11.3.4 2014-04-11 09:53:14 +02:00
Michael Raskin 31f3755327 Adding TCPFlow: a tool to separate tcp streams when capturing 2014-04-11 11:08:51 +04:00
vi 7839df9a09 New derivation: language-c-inline (haskell) 2014-04-11 10:20:21 +08:00
Vladimír Čunát 07dc578572 llvm(Packages) on darwin: attempts to fix
- mark llvm34 as broken on darwin (so it doesn't install by default with nix-env)
- don't use our gcc for llvm_34 (might fix the build)
- switch also clang default to 3.3 on darwin (llvm was before)
2014-04-10 21:19:40 +02:00
Jaka Hudoklin 88691049ae postgresql93: fix darwin builds
ossp-uuid does not build on darwin
2014-04-10 21:00:26 +02:00
Vladimír Čunát 297bcd2088 pango on darwin: attempt to fix build
Supply older flex (new doesn't build), and disable introspection.
2014-04-10 20:37:52 +02:00
Carles Pagès 8aa84644f9 libtxc_dxtn_s2tc: add v1.0 (close #2194)
S2TC is a patent-free S3TC compatible implementation and provides texture
compression to mesa.
2014-04-10 20:19:49 +02:00
Rickard Nilsson fe7599b2b2 openldap: Update from 2.4.38 to 2.4.39 2014-04-10 14:10:33 +02:00
Rob Vermaas c3c045c59d Add logstash-forwarder. 2014-04-10 13:31:23 +02:00
Peter Simons 8392c8ba9f Merge pull request #2195 from linquize/git-1.9.2
git: Update to 1.9.2
2014-04-10 12:42:53 +02:00
Peter Simons 3c7f5870e3 Merge pull request #2197 from offlinehacker/pkgs/lxc/rootfs_fix
lxc: set rootfs path somewhere outside /nix/store
2014-04-10 12:34:08 +02:00
Mathijs Kwik 3ada08785f avidemux: make faacSupport optional 2014-04-10 11:57:20 +02:00
Mathijs Kwik bf929ef73b faac is redistributable, hydra is allowed to build it. 2014-04-10 11:57:20 +02:00
Mathijs Kwik 4219eb430d intel-microcode: upgrade to 20140122 2014-04-10 11:57:20 +02:00
Jaka Hudoklin c7e94de91f lxc: set rootfs path somewhere outside /nix/store
This commit fixes lxc to eventually work
2014-04-10 11:46:06 +02:00
Shea Levy 9dcffe951d Merge branch 'cjdns' of git://github.com/ehmry/nixpkgs
cjdns: update to 20130303
2014-04-09 20:34:32 -04:00
Linquize ab12d10f87 git: Update to 1.9.2 2014-04-10 02:02:59 +02:00
Domen Kožar d912cdf264 gstreamer-1.0: use different function name for env hook than gstreamer-0.10 2014-04-09 23:04:57 +00:00
Ricardo M. Correia 5dfc6584a5 grsecurity: Update stable patch from 3.0-3.2.56-201404062126 -> 3.0-3.2.57-201404091758 2014-04-10 00:37:33 +02:00
Ricardo M. Correia c50abd0e13 linux: Update to 3.2.57 2014-04-10 00:37:33 +02:00
Ricardo M. Correia 76551abef2 icedtea7_web: Fix configure phase not finding bash 2014-04-10 00:15:53 +02:00
Ricardo M. Correia f6799983bd icedtea7_web: Update from 1.4.2 -> 1.5
Fixes CVE-2012-4540.
2014-04-10 00:15:53 +02:00
Ricardo M. Correia 442e1bbaab icedtea7: Fix building v2.4.6 by backporting fix
See http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1726
2014-04-10 00:15:47 +02:00
Ricardo M. Correia a644b7ba60 icedtea7: Update from 2.4.5 -> 2.4.6 2014-04-10 00:14:44 +02:00
Ricardo M. Correia 8fdf8984d2 chromium: Update stable channel from 33.0.1750.152 -> 34.0.1847.116 2014-04-10 00:14:44 +02:00
Aristid Breitkreuz 5d12cbf1c2 add back old version of flex for grub2 2014-04-09 20:42:08 +02:00
Domen Kožar d54a805281 gnome3: downgrade 3.12 packages to 3.10 2014-04-09 18:56:54 +02:00
Emery Hemingway 316e809ff8 cjdns: update to 20130303
build system is now nodejs based
new nixos module to start cjdns
2014-04-09 10:30:57 -04:00
Jaka Hudoklin 1bb391e2bb pythonPackages: sqlalchemy-imageattach, fix tests on darwin 2014-04-09 16:10:42 +02:00
Domen Kožar e5e27cfd64 Merge pull request #2153 from lethalman/gnome3
accounts-daemon service, fix gnome-shell, add libgnomekbd, musicbrainz5, sushi, gnome-contacts
2014-04-09 15:01:17 +02:00
Peter Simons 1bf2bd612c haskell-HTF: update to version 0.11.3.0 2014-04-09 13:33:30 +02:00
Peter Simons 011f22e49b haskell-yesod-core: update to version 1.2.11.1 2014-04-09 13:33:30 +02:00
Peter Simons a138d54df2 haskell-websockets: update to version 0.8.2.1 2014-04-09 13:33:30 +02:00
Peter Simons cde2e2839a haskell-warp: update to version 2.1.4 2014-04-09 13:33:30 +02:00
Peter Simons b67feb0990 haskell-warp-tls: update to version 2.0.3.3 2014-04-09 13:33:30 +02:00
Peter Simons 0a74f6d3e7 haskell-wai: update to version 2.1.0.2 2014-04-09 13:33:30 +02:00
Peter Simons 2986e7cb24 haskell-streaming-commons: update to version 0.1.1 2014-04-09 13:33:30 +02:00
Peter Simons f063e5e592 haskell-network-simple: update to version 0.3.1 2014-04-09 13:33:30 +02:00
Peter Simons 7fdd6b1880 haskell-monad-logger: update to version 0.3.5.1 2014-04-09 13:33:30 +02:00
Peter Simons b34cc2cd2e haskell-mime-types: update to version 0.1.0.4 2014-04-09 13:33:30 +02:00
Peter Simons 346f6037c0 haskell-hashed-storage: update to version 0.5.11 2014-04-09 13:33:29 +02:00
Peter Simons 51c6724fa3 haskell-esqueleto: update to version 1.3.10 2014-04-09 13:33:29 +02:00
Peter Simons 7ff62b5ddc haskell-direct-sqlite: update to version 2.3.12 2014-04-09 13:33:29 +02:00
Peter Simons 8cd9a5145b haskell-scotty: update to version 0.7.2 2014-04-09 13:33:29 +02:00
Oliver Charles 18039f52bb Merge pull request #2181 from fmap/stuff
Derivations for HandsomeSoup and hxt-xpath (Haskell.)
2014-04-09 12:04:55 +01:00
Peter Simons fd9ea0f639 ltrace: fix build with latest gcc (by disabling -Werror) 2014-04-09 12:41:11 +02:00
Peter Simons 2d4919dbb4 apacheHttpd_2_4: update from 2.4.7 to 2.4.9 2014-04-09 12:41:11 +02:00
Peter Simons 740c502a77 swiProlog: update from 6.6.2 to 6.6.3 2014-04-09 12:41:11 +02:00
Peter Simons 2cc462eb11 lxc: update from 1.0.1 to 1.0.3 2014-04-09 12:41:10 +02:00
Peter Simons b7d0a9a614 ltrace: update from 0.5.3 to 0.7.3 2014-04-09 12:41:10 +02:00
Peter Simons 9def193598 libsigcxx: update from 2.2.11 to 2.3.1 2014-04-09 12:41:10 +02:00
Peter Simons 1682bde4e0 gitAndTools.svn2git: update from 2.2.2 to 2.2.5 2014-04-09 12:41:10 +02:00
Peter Simons c244d6e1b8 gitAndTools.stgit: update from 0.16 to 0.17.1 2014-04-09 12:41:10 +02:00
Peter Simons 44e8fe67d0 flex: update from 2.5.35 to 2.5.39 2014-04-09 12:41:10 +02:00
Peter Simons 37f327acfd fail2ban: update from 0.8.12 to 0.8.13 2014-04-09 12:41:10 +02:00
Peter Simons 715a61ad7a docbook5_xsl: update from 1.75.2 to 1.78.1 2014-04-09 12:41:10 +02:00
Peter Simons 30aa995a42 busybox: update from 1.21.1 to 1.22.1 2014-04-09 12:41:10 +02:00
Peter Simons cf5ac3bded zsh: update from 5.0.2 to 5.0.5 2014-04-09 12:41:10 +02:00
vi 09e245b3ab Derivations for HandsomeSoup and hxt-xpath (Haskell.) 2014-04-09 18:36:49 +08:00
Peter Simons 9b4e914dac Merge pull request #2171 from ocharles/remove-lens-aeson
Remove haskellPackages.lensAeson
2014-04-09 11:53:07 +02:00
Domen Kožar d2efe82eaa munin: 2.0.19 -> 2.0.20 2014-04-09 11:29:47 +02:00
Mathijs Kwik fccf059216 Merge pull request #2159 from lethalman/gst-no-faac
gst-plugins-bad: disable faac by default because it's unfree
2014-04-09 06:47:16 +02:00
Austin Seipp 29c0d0047f luajit: adopt, upgrade, optimize
- Build the 'amalgamation' by default - more RAM needed to build, but
   better overall performance
 - Upgrade to version 2.0.3
 - Adopt as maintainer

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-08 21:16:33 -05:00
Austin Seipp 692ee73af1 libseccomp: version 2.1.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-08 19:37:47 -05:00
Austin Seipp 3ff158289a lockdep: refactor into non-kernel package
Lockdep doesn't *really* require the kernel package - just the kernel
sources. It's really a user-space tool just compiled from some portable
code within the kernel, nothing more.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-08 19:21:55 -05:00
Luca Bruno ba200a2c3c gnome-dictionary: remove the duplicated entry under desktop/ 2014-04-09 00:36:53 +02:00
Luca Bruno 9219c503c9 file-roller: fix gsettings schemas 2014-04-09 00:36:52 +02:00
Luca Bruno 8553993887 telepathy-mission-control: add dbus service, enabled by default on gnome3 2014-04-09 00:36:52 +02:00
Luca Bruno f88597d6e4 gnome-contacts: new package
Contacts is GNOME's integrated address book

https://wiki.gnome.org/Apps/Contacts
2014-04-09 00:36:52 +02:00
Luca Bruno 2bc0f7b701 evolution-data-server: fix gsettings schemas and add dbus service 2014-04-09 00:36:51 +02:00
Eelco Dolstra 331fa06c79 Add a flag ‘config.allowBroken’ 2014-04-09 00:13:52 +02:00
Eelco Dolstra 627923d5b7 Replace $HYDRA_DISALLOW_UNFREE with $NIXPKGS_ALLOW_UNFREE
We've never used this environment variable in Hydra (except for a few
days). This is also more consistent with $NIXPKGS_ALLOW_BROKEN.
2014-04-09 00:12:48 +02:00
Eelco Dolstra e09250d41c Disable allowUnfree by default
Fixes #2134.
2014-04-09 00:09:31 +02:00
Austin Seipp dcd0e68b17 stunnel: adopt, bump to version 5.01
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-08 16:13:52 -05:00
Luca Bruno 3010e63fb7 gst-plugins-bad: disable faac by default because it's unfree
A lot of packages are not built in hydra due to gst-plugins-bad
being unfree. Make faac dependency optional.
2014-04-08 22:53:07 +02:00
Peter Simons e49e74ebf4 haskell-twitter-types: update to version 0.2.20140407 2014-04-08 21:37:58 +02:00
Peter Simons bed88f0ff7 haskell-twitter-conduit: update to version 0.0.2.1 2014-04-08 21:37:58 +02:00
Peter Simons ef5661c01f haskell-tasty: update to version 0.8.0.4 2014-04-08 21:37:58 +02:00
Peter Simons b885ecf16c haskell-http-client-multipart: update to version 0.3.0.0 2014-04-08 21:37:58 +02:00
Peter Simons 556736cc2b haskell-hakyll: update to version 4.5.1.0 2014-04-08 21:37:58 +02:00
Peter Simons 363d62dbfd haskell-ghc-mod: update to version 4.0.2 2014-04-08 21:37:58 +02:00
Peter Simons 26972702e0 haskell-dyre: update to version 0.8.12 2014-04-08 21:37:58 +02:00
Peter Simons 485dc4d93b haskell-Chart: update to version 1.2.2 2014-04-08 21:37:58 +02:00