mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 21:17:46 +00:00
Code Issues Wiki Activity
121529 commits 190 branches 125 tags 9.1 GiB
Commit graph

23555 commits

Author SHA1 Message Date
Orivej Desh eb23772c10 double-conversion: rename attr from double_conversion 2017-11-22 23:39:03 +00:00
Luke Adams de51e4a35b qwt6_qt4: enableParallelBuilding 2017-11-22 16:40:49 -06:00
Luke Adams 97c5cf0bf2 qwt6_qt4: preFixup: Repair relative reference in darwin framework output 2017-11-22 16:40:49 -06:00
Jan Tojnar 52c6c64f5c
libinput: 1.9.1 → 1.9.2 
https://lists.freedesktop.org/archives/wayland-devel/2017-November/035817.html
 2017-11-22 22:17:52 +01:00
John Ericson 405412dfd9
Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files 
stdenv setup: Always use both propagated files
 2017-11-22 15:23:37 -05:00
Vincent Laporte 1f5c2fe90a
gnumeric: 1.12.35 -> 1.12.36 
goffice: 0.10.35 -> 0.10.36
 2017-11-22 18:52:31 +00:00
David McFarland 4434843d9c libgssglue: init at 0.4 2017-11-22 12:33:32 -04:00
Luke Adams f90ddc99f6 qwt6_qt4: Fix darwin build by adding AGL input 2017-11-22 02:10:51 -06:00
Luke Adams c3cfa106af qwt6_qt4: 6.1.2 -> 6.1.3 2017-11-22 02:10:51 -06:00
Orivej Desh 816843333d
Merge pull request #30946 from LumiGuide/opencv-3.3.1 
opencv: 3.3.0 -> 3.3.1
 2017-11-22 07:04:31 +00:00
Orivej Desh 4d50d79bc8 atlas: disable parallel building 2017-11-22 06:49:21 +00:00
Orivej Desh b8e1e7191e Merge branch 'master' into staging 
* master: (80 commits)
  lkl: Supports aarch64
  wimlib: nitpicks
  gitAndTools.git-codeowners: 0.1.1 -> 0.1.2
  wimlib: init at 1.12.0
  kernel: improve modDirVersion error message
  releaseTools.sourceTarball: Clean up temporary files
  dotnetPackages.SmartIrc4net: rehash source
  migmix: make it a fixed-output derivation
  vm: Create /dev/full
  samba: 4.6.8 -> 4.6.11 to address CVEs CVE-2017-14746 & CVE-2017-15275
  microcodeIntel: 20170707 -> 20171117
  sshd: Remove ripemd160 MACs
  kernel config: Enable MEDIA_CONTROLLER
  linux: 4.4.99 -> 4.4.100
  linux: 4.9.63 -> 4.9.64
  nix-bash-completions: 0.4 -> 0.5
  linux: 4.14 -> 4.14.1
  linux: 4.13.14 -> 4.13.15
  nix-zsh-completions: 0.3.3 -> 0.3.5
  dns-root-data: use a stable URL that I maintain anyway
  ...
 2017-11-21 22:48:36 +00:00
Orivej Desh 71a2a5ae40 qt4: enable parallel building 
Please let me know if it fails to build in parallel so we could fix it, because
overwise it is a bottleneck of mass rebuilds.
 2017-11-21 19:30:18 +00:00
Orivej Desh d5e3935a6a atlas: enable parallel building 2017-11-21 19:29:10 +00:00
Orivej Desh 5421d2908f boehm-gc: enable parallel building 2017-11-21 17:58:48 +00:00
John Ericson da19c34d0f stdenv setup: Always use both propagated files 
This continues #23374, which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.

This is an incremental step to fully keeping the dependencies separate
in all cases.
 2017-11-21 10:44:44 -05:00
Vladimír Čunát 3772338be5
SDL2: disable parallel make 
Example failure: https://hydra.nixos.org/build/64494600
It could be fixed more properly, but for me it builds under 80 secs anyway.
 2017-11-21 12:55:47 +01:00
Daniel Peebles 81cc9bb41d
Merge pull request #31701 from matthewbauer/wesnoth-mac 
Wesnoth MacOS
 2017-11-20 22:42:59 -05:00
Orivej Desh 3f7751ecd4 flite: 1.9.0 -> 2.0.0, fix build with Nix 1.12 
It is failing with:

     RPATH of binary /nix/store/...-flite-.../bin/flite contains a forbidden reference to /build

because of the rpath entry `../build/x86_64-linux-gnu/lib`.
 2017-11-21 01:14:34 +00:00
Renaud 1d6f3ea265
Merge pull request #31573 from c0bw3b/pkg/pkcs11 
opencryptoki, pkcs11-helper, simple-tpm-pk11
 2017-11-20 22:40:58 +01:00
Joerg Thalheim 2ac6343d56 wayland-protocols: 1.10 -> 1.11 2017-11-20 17:20:18 +00:00
Joerg Thalheim c30d535c7b wayland: 1.12.0 -> 1.14.0 2017-11-20 17:20:17 +00:00
Orivej Desh ac387e3918 libstroke: replace dead links 2017-11-20 13:07:40 +00:00
Orivej Desh 54c281fa39 bullet283: delete old version 2017-11-20 10:55:47 +00:00
Orivej Desh ab0d141f44 Merge branch 'master' into staging 
* master: (23 commits)
  silver-searcher: patch bash completions location
  shairplay: init at 2016-01-01
  ocamlPackages.rope: 0.5 -> 0.6
  ocamlPackages.ocaml_gettext: 0.8.7 -> 0.8.8
  mupdf: Patch openjpeg version
  nextcloud-client: fix build after qt updates
  gstreamer.gst-plugins-bad: Patch openjpeg version
  silver-searcher: move bash completion to etc/bash-completion.d/
  neomutt: use mime.types from dedicated mime-types derivation
  mime_types: rename to mime-types
  XMLLibXML: 2.0129 -> 2.0132 fixes failing tests & CVE-2017-10672
  nixos/matrix-synapse: remove unused log_file config
  nixos: run parted with --script option (3rd)
  nixos: run parted with --script option (2nd)
  nixos/release: add nixos/tests/switch-test.nix to tested job
  nixos/system: make switch-to-configuration script pure.
  nixos/release: include mutableUsers test to release tests.
  nixos/tests: Add a test for config.users.mutableUsers.
  corebird: 1.7.2 -> 1.7.3
  nixos/matrix-synapse: make home directory configurable
  ...
 2017-11-20 09:21:51 +00:00
Lancelot SIX 14a754ff63
nettle: 3.3 -> 3.4 
See http://lists.gnu.org/archive/html/info-gnu/2017-11/msg00007.html
for release information
 2017-11-20 09:45:17 +01:00
adisbladis 09683a0a19
gstreamer.gst-plugins-bad: Patch openjpeg version 2017-11-20 14:49:25 +08:00
Franz Pletz fa824e6c58
Merge branch 'master' into staging 2017-11-19 19:39:04 +01:00
Franz Pletz 4e5725605b
openjpeg: 2.1.2 -> 2.3.0 for multiple CVEs 
Fixes:

 * CVE-2016-10504
 * CVE-2016-10505
 * CVE-2016-10506
 * CVE-2016-10507
 * CVE-2016-9112
 * CVE-2016-9113
 * CVE-2016-9114
 * CVE-2016-9115
 * CVE-2016-9116
 * CVE-2016-9117
 * CVE-2016-9118

cc #30959
 2017-11-19 19:33:42 +01:00
Franz Pletz 58218d4d8e
libsndfile: add patches for multiple CVEs 
Fixes the patches names for security tools to parse CVEs.

Adds patch to fix CVE-2017-14634.

cc #30959
 2017-11-19 18:51:22 +01:00
Franz Pletz a6044ad793
audiofile: add patches for multiple CVEs 
Fixes:
 * CVE-2017-6827
 * CVE-2017-6828
 * CVE-2017-6829
 * CVE-2017-6830
 * CVE-2017-6831
 * CVE-2017-6832
 * CVE-2017-6833
 * CVE-2017-6834
 * CVE-2017-6835
 * CVE-2017-6836
 * CVE-2017-6837
 * CVE-2017-6838
 * CVE-2017-6839

cc #30959
 2017-11-19 18:26:49 +01:00
Orivej Desh b089c21506 Merge branch 'master' into staging 
* master: (39 commits)
  python.pkgs.pybfd: move to python-modules
  documentation: python 2.6 is no more
  documentation: python3Packages is python36Packages
  wireguard: 0.0.20171101 -> 0.0.20171111
  php_excel: init at 1.0.2
  libxl: init at 3.8.1
  matrix-synapse: 0.24.1 -> 0.25.1
  grafana: 4.6.1 -> 4.6.2
  linux: 4.4.98 -> 4.4.99
  linux: 4.9.62 -> 4.9.63
  linux: 4.13.13 -> 4.13.14
  nixos/zsh: add the type for enableAutosuggestions option
  zsh-powerlevel9k: init at 2017-11-10
  fio: 3.1 -> 3.2
  filebench: rehash source
  nano: 2.8.7 -> 2.9.0
  bonnie: replace dead source link
  less: 520 -> 529
  strace: 4.19 -> 4.20
  iperf: 3.2 -> 3.3
  ...
 2017-11-19 08:30:14 +00:00
Markus Mueller 8d499c2b3d
libxl: init at 3.8.1 2017-11-19 04:22:26 +01:00
Orivej Desh af748afe33
Merge pull request #31777 from romildo/upd.catch 
catch: 1.9.6 -> 1.11.0
 2017-11-17 22:46:14 +00:00
Orivej Desh b5148cec8f libjson-rpc-cpp: enable parallel building 2017-11-17 22:44:01 +00:00
Orivej Desh c8e5b07350
Merge pull request #31776 from veprbl/fastjet_330 
fastjet: 3.2.0 -> 3.3.0
 2017-11-17 22:36:46 +00:00
José Romildo Malaquias 0c3a544f91 catch: 1.9.6 -> 1.11.0 2017-11-17 20:10:19 -02:00
Daiderd Jordan 36818207e9 Merge branch 'master' into staging 2017-11-17 22:45:34 +01:00
Dmitry Kalinkin 2f1816de5b
fastjet: 3.2.0 -> 3.3.0 2017-11-17 16:23:42 -05:00
Orivej Desh e283833d9c
Merge pull request #31764 from adisbladis/libmsgpack-gcc7 
Libmsgpack gcc7 fixes
 2017-11-17 20:48:42 +00:00
Orivej Desh 1352789cfc
Merge pull request #31765 from adisbladis/czmq-gcc7 
czmq: Fix build with gcc-7
 2017-11-17 20:47:57 +00:00
Nikolay Amiantov 88105ee018 gtk3: compute DPI properly when Xft options are not used 
Taken from #25892

Fixes #25023
 2017-11-17 20:45:49 +00:00
Orivej Desh ca86a25061
Merge pull request #31400 from gnidorah/gtk3 
gtk3: 3.22.24 -> 3.22.26
 2017-11-17 20:09:35 +00:00
Orivej Desh 88abcdb53a
Merge pull request #31710 from adisbladis/nodejs-9_2_0 
nodejs: 9.0.0 -> 9.2.0 & libuv: 1.15.0 -> 1.16.1
 2017-11-17 19:22:37 +00:00
Orivej Desh 1161741351 Merge branch 'master' into staging 
* master: (28 commits)
  go_1_9: skip flaky TestWaitGroupMisuse2
  erlangR18: fix patch hashes with fetchpatch
  xml2: replace dead links
  nixos/pam: fix docs about path to u2f_keys file
  cinelerra: add a note about parallel building
  msmtp: install docs and examples (#31769)
  kernel: Fix out-of-tree modules on aarch64
  nixos/tests/acme: update terms of service to fix test
  gixy: init at 0.1.8
  pythonPackages.ConfigArgParse: 0.9.3 -> 0.12.0, refactor, move to python-modules
  mono: init at 4.8
  wal-g: fix license so not to break evaluation
  wal-g: init at 0.1.2
  maintainers: add backuitist
  nixos/prometheus: Correct documentation for external_labels
  spidermonkey: replace broken links
  vagrant: removed custom rake gem
  vagrant: 2.0.0 -> 2.0.1
  nixos/prometheus: add external_labels option
  nixos/prometheus: add scrape_configs.honor_labels
  ...
 2017-11-17 18:06:22 +00:00
Daiderd Jordan 45b6c9c8f1
Merge pull request #31760 from LnL7/darwin-gstreamer 
gstreamer: fix darwin build
 2017-11-17 18:59:11 +01:00
adisbladis f9cb7a0322
czmq: Fix build with gcc-7 2017-11-17 15:04:27 +08:00
Orivej Desh 035b589245 glibc: support obsolete "compat" in nsswitch.conf 
Fixes #31700. See https://bugs.archlinux.org/task/54592.
 2017-11-17 06:37:25 +00:00
adisbladis 253d9b6c57
libmsgpack-2_0: Drop package. Broken with gcc-7 and not depended on. 2017-11-17 14:27:08 +08:00
adisbladis 26f1ae6ee4
libmsgpack-1_4: Drop package. Broken with gcc-7 and not depended on. 2017-11-17 14:26:52 +08:00
Orivej Desh d99a2fc093 Merge branch 'master' into staging 
* master: (293 commits)
  go_1_9: skip flaky TestServerCancelsReadTimeoutWhenIdle
  qsyncthingtray: fix build
  qt56.qtwebengine: fix build
  stdman: d860212 -> 2017.04.02
  jackett: use mono50
  hg-git: disable with python3
  hg-git: 0.8.5 -> 0.8.10
  xfce4-settings: enable parallel building
  gcc-snapshot: mark as broken
  heaptrack: 2017-02-14 -> 2017-10-30
  nixos-container: Modify existing test to cover show-ip command
  nixos-container: Make show-ip work together with ipv4 + netmask
  linux-copperhead: 4.13.12.a -> 4.13.13.a
  matterbridge: 1.1.0 -> 1.4.1
  nixos/nghttpx: add module for the nghttpx proxy server (#31680)
  mattermost: 4.3.0 -> 4.4.0
  breakpad: delete
  simp_le: 0.2.0 -> 0.6.1
  certbot: 0.11.1 -> 0.19.0
  afl: 2.51b -> 2.52b
  ...
 2017-11-17 05:35:09 +00:00
Vladimír Čunát 020a6663d3 SDL2: disable parallel building 
Example failure: https://hydra.nixos.org/build/63996552

(cherry picked from commit 80e8e555b4)
 2017-11-17 03:43:46 +00:00
Orivej Desh 61090c8c66
Merge pull request #31654 from bkchr/kde_frameworks_5_40 
kde-frameworks: 5.39 -> 5.40
 2017-11-17 03:37:48 +00:00
Orivej Desh 031367af2b qt56.qtwebengine: fix build 
Delete the patch, it has been integrated into Qt 5.6.3.
 2017-11-17 02:51:58 +00:00
Daiderd Jordan 0029c7051e
gstreamer: fix darwin build 2017-11-16 22:54:09 +01:00
Orivej Desh a955f0b88d
Merge pull request #31529 from gazally/update-libusb1 
libusb1: 1.0.20 -> 1.0.21
 2017-11-16 21:24:24 +00:00
Orivej Desh 8bd10a17c6 breakpad: delete 
This library does not compile with the current glibc and is unused since
74f7db075a.
 2017-11-16 20:43:33 +03:00
AndersonTorres 011773edec libwnck: 3.4.7 -> 3.24.1 2017-11-16 06:16:45 -02:00
Orivej Desh 3835526a94 libaal: fix build with glibc 2.26 
I have extracted this patch by Jan Engelhardt from [1] because I have not found
any direct or persistent link to it.

[1] http://tube.opensuse.org/repositories/filesystems/SLE_11_SP4/src/libaal-1.0.6-107.1.src.rpm

Tracking issue: #31696
 2017-11-16 02:02:44 +00:00
Renaud 958d6038e3
Merge pull request #31712 from stephengroat/patch-1 
cmocka: 1.0.1 -> 1.1.1
 2017-11-15 23:37:44 +01:00
Stephen bec7c22dca cmocka: 1.0.1 -> 1.1.1 2017-11-15 14:29:08 -08:00
Renaud 7a32e68393 libx86emu: 1.5 -> 1.12 2017-11-15 22:46:00 +01:00
Orivej Desh f96b3bf871 ptlib: fix build with glibc 2.26 
Tracking issue: #31696
 2017-11-15 21:42:26 +00:00
adisbladis 3aa914ceeb
libuv: 1.15.0 -> 1.16.1 2017-11-16 01:57:15 +08:00
John Ericson 7c2834d428 Merge branch 'ericson2314-cross-base' into staging 2017-11-15 12:01:47 -05:00
John Ericson 9a24437411 libbfd, libopcodes: Fix eval on Darwin 
Not sure how I missed this...
 2017-11-15 11:59:54 -05:00
Bastian Köcher dec40045f7 kde-frameworks: 5.39 -> 5.40 2017-11-15 15:52:09 +01:00
Jan Tojnar e1b8636181
dleyna-server: init at 0.6.0 2017-11-15 14:02:37 +01:00
Jan Tojnar a04cfdea12
dleyna-renderer: init at 0.6.0 2017-11-15 14:02:37 +01:00
Jan Tojnar eea8e78f0d
dleyna-connector-dbus: init at 0.3.0 2017-11-15 14:02:36 +01:00
Jan Tojnar f2bf15a20c
dleyna-core: init at 0.6.0 2017-11-15 14:02:36 +01:00
Jan Tojnar 6c6f6a4008
gupnp_dlna: init at 0.10.5 2017-11-15 14:02:36 +01:00
Jan Tojnar 7d33f7fba8
gupnp: 0.20.16 → 1.0.2 2017-11-15 14:02:36 +01:00
Jan Tojnar d676108f45
gupnp_av: 0.12.2 → 0.12.10 2017-11-15 14:02:34 +01:00
Bjørn Forsman b06c5a678d libfaketime: 0.9.6 -> 0.9.7 
* Project is hosted on github.com.
* The -Wno-nonnull-compare fix is included in 0.9.7, so remove it from
  this package expression.
 2017-11-15 08:06:27 +01:00
Jan Tojnar 1f79b943c0
glib: recognize NIX_GSETTINGS_OVERRIDES_DIR variable 
For some reason, the GNOME 3.26 update broke the overrides. It turns
out the overrides now need to come before the overriden schemas in the
XDG_DATA_DIRS variable. This is not possible in general due to applications
prefixing the variable (e.g. in wrapGAppsHook).

To fix this, a new environment variable NIX_GSETTINGS_OVERRIDES_DIR
was introduced. It has greater priority than XDG_DATA_DIRS but lower
than GSETTINGS_SCHEMA_DIR. A separate variable was chosen in order not
to block the built-in one for users.
 2017-11-15 03:45:24 +01:00
Rok Garbas 7dce6c88d2 neovim: 0.2.0 -> 0.2.1 
* neovimLibvterm: 5a748f97 -> 4ca7ebf7
* neovim ruby: 0.5.0 -> 0.5.1
* pythonPackages.neovim: 0.1.13 -> 0.2.0
* libmpack: 1.0.3-rev80bd55ea6 -> 1.0.5
* luaPackages.mpack: switched to new source location, 1.0.7_ef025224a7
* only one set of lua packages, switched to luajit
 2017-11-15 01:21:46 +01:00
John Ericson 728446f755
Merge pull request #30484 from obsidiansystems/libbfd 
bfd, opcodes: Init separate derivations for binutils libraries
 2017-11-14 12:10:44 -05:00
Michael Raskin cacd7209f8
Merge pull request #31661 from taku0/firefox-bin-57.0 
firefox: 56.0.2 -> 57.0 [Security fixes]
 2017-11-14 18:01:45 +01:00
Michael Raskin eac38d0b1e
Merge pull request #31617 from orivej/clisp 
clisp_2_44_1, libsigsegv_25: delete
 2017-11-14 09:42:20 +01:00
Vladimír Čunát f80a55ca37
libbsd, libtiger: fix meta evaluation 
I suppose we'll one day transition to forced automatic checks of some
basic things before pushing/merging.
 2017-11-13 21:53:10 +01:00
Vladimír Čunát e04339db80
Merge branch 'staging' 2017-11-13 21:50:29 +01:00
Daiderd Jordan 897398e07e
Merge pull request #31589 from matthewbauer/libbsd-update 
libbsd: update Darwin patch
 2017-11-13 20:31:59 +01:00
Daiderd Jordan 1165c03fbc
Merge pull request #31591 from matthewbauer/libtiger-fix 
libtiger: fix on Darwin
 2017-11-13 20:28:08 +01:00
Orivej Desh c3b6a63961 clisp_2_44_1, libsigsegv_25: delete 2017-11-13 18:36:25 +00:00
Renaud b3bacc34b0
Merge pull request #31559 from Mankarse/glog-v0.3.5 
glog: 0.3.4 -> 0.3.5
 2017-11-13 18:57:00 +01:00
Orivej Desh 1f78f9fb7a mesa: replace dead https link 2017-11-13 17:50:34 +00:00
taku0 b5f2a090de nss: 3.32.1 -> 3.33 2017-11-13 23:01:02 +09:00
taku0 c91d4d519f nspr: 4.16 -> 4.17 2017-11-13 23:01:02 +09:00
aszlig 4cf16937ce
opencascade: Fix build against glibc 2.26 
The header file xlocale.h has been removed in glibc 2.26.

Quoting the release notes[1]:

  * The nonstandard header <xlocale.h> has been removed. Most programs
    should use <locale.h> instead. If you have a specific need for the
    definition of locale_t with no other declarations, please contact
    libc-alpha@sourceware.org and explain.

Tested by building on x86_64-linux and it now succeeds.

[1]: https://sourceware.org/ml/libc-alpha/2017-08/msg00010.html

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @viric
 2017-11-13 10:14:05 +01:00
Samuel Leathers 6e686ff36d webkitgtk: 2.18.2 -> 2.18.3 (fixes multiple CVE's) 2017-11-13 10:02:40 +01:00
Matthew Bauer 6b0e1910af libbsd: add myself as maintainer 2017-11-13 00:43:27 -06:00
Matthew Bauer ff0ac72719 libbsd: update darwin patch for 0.8.6 
This resolves the patch issues. If someone has time, they should try to get the
patched merged upstream.
 2017-11-13 00:43:27 -06:00
Matthew Bauer d19494cb53 libtiger: add myself as maintainer 2017-11-13 00:36:22 -06:00
Matthew Bauer 5882cc203c libtiger: fix on darwin 2017-11-13 00:35:56 -06:00
John Ericson d7bddc27b2 treewide: Try to avoid depending on binutils directly 
One should depend on

 - `stdenv.cc.bintools`: for executables at build time
 - `libbfd` or `libiberty`: for those libraries
 - `targetPackages.cc.bintools`: for exectuables at *run* time
 - `binutils`: only for specifically GNU Binutils's executables, regardless of
   the host platform, at run time.
 2017-11-13 00:47:48 -05:00
John Ericson de28bd4832 bfd, opcodes: Init separate derivations for binutils libraries 
On most distros, these are just built and distributed as part of
binutils. We don't use binutils across the board, however, but rather
switch between binutils and a cctools-binutils mashup, and change the
outputs on binutils too. This creates a combinatorial conditional soup
which is hard to maintain.

My hope is to lower the the state space. While my patch isn't the most
maintainable, they make downstream packages become more maintainable to
compensate. The additional derivations themselves are completely
platform-agnostic, always they always supports all possible target
platforms, and always yield "out" and "dev" outputs. That, in turn,
allows downstream packages to not worry about a dependency
shape-shifting under them.

In fact, the actual binutils package can avoid needing multiple outputs
now that these serve the requisite libraries, so that also can become
simpler on all platforms, too, removing the original wart this PR
circumnavigates for now. Actually changing the binutils package to
leverage is a mass rebuild, however, so I'll leave that for a separate
PR.

I do hope to upstream something like my patch too, but until then I'll
make myself maintainer of these derivations
 2017-11-13 00:47:37 -05:00
John Ericson c0a04ec2f5 libiberty: Add dev output 2017-11-13 00:30:53 -05:00
John Ericson 7db0b80c61 Merge remote-tracking branch 'channels/nixos-unstable' into staging 2017-11-13 00:18:03 -05:00
Matthew Justin Bauer c6aba1dba1 SDL_mixer: disable smpegtest 
Again to fix timeouts:

https://hydra.nixos.org/build/64061277/nixlog/3
 2017-11-12 22:26:41 -06:00