JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
149,067 Commits 2 Branches 0 Tags 13 GiB
7749445337
Commit Graph

2009 Commits

Author SHA1 Message Date
Will Dietz
4136cb5ba9 git: disable "editor with a space" tests due to fails 
Need to investigate.
 2018-06-22 10:00:42 -05:00
Will Dietz
e65e6cad23 git: disable working-tree-encoding tests on musl 
Makes assumptions about BOM.
 2018-06-22 09:56:20 -05:00
Will Dietz
5f27396e8f git: remove symlinks-in-bin patch 2018-06-22 09:15:54 -05:00
Will Dietz
18231121f4 git: 2.17.1 -> 2.18.0 2018-06-22 09:12:06 -05:00
Matthew Bauer
fc048073e6 git: remove object file from closure 
This file pulls in some big dependencies that are unneeded (like
clang).
 2018-06-21 19:47:10 -04:00
Jörg Thalheim
6906e5c149 gitAndTools.hub: remove go compiler from runtime closure 2018-06-21 23:34:44 +01:00
R. RyanTM
802ea37863 git-secret: 0.2.3 -> 0.2.4 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/git-secret/versions.

These checks were done:

- built on NixOS
- /nix/store/rhxzf1mc0jz2m3rp0rg5wqn81ykfshay-git-secret-0.2.4/bin/git-secret passed the binary check.
- /nix/store/rhxzf1mc0jz2m3rp0rg5wqn81ykfshay-git-secret-0.2.4/bin/.git-secret-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 0.2.4 with grep in /nix/store/rhxzf1mc0jz2m3rp0rg5wqn81ykfshay-git-secret-0.2.4
- directory tree listing: https://gist.github.com/d460daac78bbcef226d1fff7918d150d
- du listing: https://gist.github.com/ea683543c922a9c179a97faf441a1797
 2018-06-19 11:59:41 -07:00
Elis Hirwing
106bde413e
gitea: 1.4.1 -> 1.4.2 
Not much of a changelog: https://github.com/go-gitea/gitea/releases/tag/v1.4.2
 2018-06-18 18:26:14 +02:00
Pascal Wittmann
7a3c052e97
gource: 0.48 -> 0.49 2018-06-16 17:16:16 +02:00
Yurii Rashkovskii
f45fd23bd1 sit: 0.3.2 -> 0.4.0 (#41863) 2018-06-12 19:55:33 +02:00
Ivan Malison
53138130f8
git-sync: init at 20151024 2018-06-12 10:33:25 -07:00
Jörg Thalheim
8ba3df7687
Merge pull request #41566 from krav/fix-gitaly 
gitaly: Cause ruby-cd to be wrapped so bundler will work
 2018-06-11 11:58:27 +01:00
Andrey Pavlov
77c2ca6be2 hub: 2.3.0 -> 2.4.0 2018-06-08 13:26:43 +03:00
Kristoffer Thømt Ravneberg
786449aa77 gitaly: Cause ruby-cd to be wrapped so bundler will work 2018-06-06 13:29:01 +02:00
Meghea Iulian
5a4d428d7c gitkraken: 3.6.1 -> 3.6.3 2018-06-02 13:35:29 +03:00
Orivej Desh
97f6be5c90
subversion_1_10: init at 1.10.0 (#41383) 2018-06-02 02:50:38 +00:00
Meghea Iulian
e4ba5dc3d6 gitkraken: 3.6.0 -> 3.6.1 (#41130) 2018-05-31 23:04:50 +02:00
Jörg Thalheim
d5f3f14a45
Merge pull request #41297 from r-ryantm/auto-update/git-hub 
git-hub: 1.0.0 -> 1.0.1
 2018-05-31 07:44:14 +01:00
R. RyanTM
b8110dbee6 git-hub: 1.0.0 -> 1.0.1 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/git-hub/versions.

These checks were done:

- built on NixOS
- /nix/store/alnsn3bczp0j8x9d8f390q67aql5y7cc-git-hub-1.0.1/bin/git-hub passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.0.1 with grep in /nix/store/alnsn3bczp0j8x9d8f390q67aql5y7cc-git-hub-1.0.1
- directory tree listing: https://gist.github.com/fc09f98152d4008f23cb52855621b6bb
- du listing: https://gist.github.com/29489408ac7b6cb1137948d9edd0fef6
 2018-05-30 20:11:53 -07:00
Will Dietz
98981ec9c0
Merge pull request #41255 from dtzWill/update/hub-2.3.0 
hub: 2.2.9 -> 2.3.0
 2018-05-30 21:17:16 -05:00
Jörg Thalheim
4fc23d2de0 hubUnstable: remove in favor of hub 2018-05-31 00:37:46 +01:00
Vladyslav M
5c16e62d4b git-lfs: 2.3.4 -> 2.4.2 (#41249) 2018-05-30 23:39:12 +02:00
R. RyanTM
a4e732482c gitAndTools.transcrypt: 1.0.3 -> 1.1.0 (#41231) 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/transcrypt/versions.

These checks were done:

- built on NixOS
- /nix/store/rnqjmp32pr8zq5y7bn9n0qcrnwg5qi82-transcrypt-1.1.0/bin/transcrypt passed the binary check.
- /nix/store/rnqjmp32pr8zq5y7bn9n0qcrnwg5qi82-transcrypt-1.1.0/bin/.transcrypt-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 1.1.0 with grep in /nix/store/rnqjmp32pr8zq5y7bn9n0qcrnwg5qi82-transcrypt-1.1.0
- directory tree listing: https://gist.github.com/74399ed2dc0f5e79c6face443cf11691
- du listing: https://gist.github.com/6c7f5baa546117396d7b51993bf84dba
 2018-05-30 23:11:42 +02:00
Will Dietz
b4b65b2e67 hub: 2.2.9 -> 2.3.0 
Hooray!
 2018-05-30 07:54:21 -05:00
Tim Steinbach
9db1f486e1
git: 2.17.0 -> 2.17.1 2018-05-29 21:33:43 -04:00
Jörg Thalheim
173cefd4e3
Merge pull request #41213 from flokli/svn-all-fast-export-1.0.12 
gitAndTools.svn-all-fast-export: 1.0.11 -> 1.0.12
 2018-05-29 22:15:44 +01:00
Florian Klink
01f91267e2 gitAndTools.svn-all-fast-export: 1.0.11 -> 1.0.12 
patch for https://github.com/svn-all-fast-export/svn2git/pull/40 is
contained in this release, so we can drop it here.
 2018-05-29 18:42:45 +02:00
Markus Kowalewski
f5ef39039c
qgit: 2.7 -> 2.8 2018-05-29 13:54:28 +02:00
Jan Malakhovski
ad35019501 Merge branch 'master' into staging 
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
 2018-05-26 00:20:17 +00:00
Matthew Justin Bauer
98f2f08b4b
Merge pull request #41009 from matthewbauer/normalize-names 
Add versions to packages missing it
 2018-05-25 16:32:48 -05:00
Matthew Bauer
02297beade treewide: add version to packages 
Lots of packages are missing versions in their name. This adds them
where appropriate. These were found with this command:

 $ nix-env -qa -f. | grep -v '\-[0-9A-Za-z.-_+]*$' | grep -v '^hook$'

See issue #41007.
 2018-05-25 15:48:05 -05:00
Robin Gloster
f21ac1bf69
gitlab: 10.7.0 -> 10.8.0 2018-05-24 04:40:46 +02:00
Robin Gloster
9a54f2a9b3
gitlab-workhorse: 4.1.0 -> 4.2.0 2018-05-24 04:40:46 +02:00
Robin Gloster
6d941dfd85
gitaly: 0.95.0 -> 0.100.0 2018-05-24 04:40:46 +02:00
Vladimír Čunát
392e6de7d0
Merge branch 'master' into staging 2018-05-20 13:20:53 +02:00
Josef Kemetmüller
3575b82e67 gitAndTools.git-dit: Fix darwin build 2018-05-20 04:09:04 +02:00
John Ericson
ee4b56edd3 Merge remote-tracking branch 'upstream/master' into staging 2018-05-11 14:36:08 -04:00
Robert Schütz
45ce588000
Merge pull request #40371 from Ma27/git-cola/qt5-port 
git-cola: port to qt5
 2018-05-11 20:08:24 +02:00
Maximilian Bosch
1a69587040
git-cola: port to qt5 
`git-cola` is a simple GUI `git` wrapper based on QT. Since 2.7
(namely 293364b45c)
it supports QT5 which provides a nicer inteface.

See #33248
 2018-05-11 18:31:49 +02:00
John Ericson
ad838f6f91 Merge branch 'fewer-crossAttrs' into staging 2018-05-10 12:03:24 -04:00
John Ericson
a1f4d033dd fossil: Remove crossAttrs 
TCC= (and BCC=) no longer needed as new Makefile defines with CC (and
CC_FOR_BUILD).
 2018-05-10 11:42:13 -04:00
Frederik Rietdijk
a18b493e02 Merge master into staging 2018-05-09 10:48:01 +02:00
Matthew Justin Bauer
92af917827
git-secrets: fix homepage url 2018-05-08 18:17:44 -05:00
xeji
ab4a04c38b
Merge pull request #40151 from yrashk/sit-aarch64-isel 
sit: better fix for aarch64 bug
 2018-05-08 22:09:25 +02:00
Matthew Bauer
6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
Jan Tojnar
85a0cd915b
Merge pull request #40155 from jtojnar/gnome-3.28.2 
GNOME Updates
 2018-05-08 04:42:29 +02:00
Jan Tojnar
3e7bcb6937
meld: 3.18.0 → 3.18.1 2018-05-08 02:34:14 +02:00
Yurii Rashkovskii
480d52ebed
sit: better fix for aarch64 bug 2018-05-07 16:18:22 -07:00
Yurii Rashkovskii
783d547bdd
sit: fix tests on aarch64 
As we found out in #40032, sit tests won't pass on
aarch64. The problem seems to be related to
`create_dir` not returning an error if the directory
already exists, happening specifically on aarch64+debug
(not aarch64+release)

This update injects a patch for tests that will also
be included in subsequent versions of SIT.
 2018-05-07 13:33:51 -07:00
xeji
ce9c8beeca
Merge pull request #40032 from yrashk/sit-0.3.2 
sit: 0.3.0 -> 0.3.2
 2018-05-07 18:06:08 +02:00
Yurii Rashkovskii
9f1017c679
sit: 0.3.0 -> 0.3.2 2018-05-07 08:46:15 -07:00
Michael Raskin
2f2d67320b
Merge pull request #40109 from r-ryantm/auto-update/fossil 
fossil: 2.5 -> 2.6
 2018-05-07 11:49:59 +00:00
R. RyanTM
5ec51c5d7c fossil: 2.5 -> 2.6 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/fossil/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/by0my4ix1gpichp15gf3i8w3fgfxmsrc-fossil-2.6/bin/fossil --help’ got 0 exit code
- ran ‘/nix/store/by0my4ix1gpichp15gf3i8w3fgfxmsrc-fossil-2.6/bin/fossil help’ got 0 exit code
- found 2.6 with grep in /nix/store/by0my4ix1gpichp15gf3i8w3fgfxmsrc-fossil-2.6
- directory tree listing: https://gist.github.com/673b50672a3bb2c22d7e37175d1f37d4
 2018-05-07 04:20:37 -07:00
zimbatm
716d877d0f gitea: 1.4.0 -> 1.4.1 2018-05-06 17:11:41 +01:00
xeji
dc4aa99080
Merge pull request #39770 from r-ryantm/auto-update/git-remote-gcrypt 
gitAndTools.gitRemoteGcrypt: 1.0.3 -> 1.1
 2018-05-05 21:24:42 +02:00
Matthew Justin Bauer
78a71c8d3e
Merge pull request #39990 from bbarker/git-secrets 
Add package: git-secrets
 2018-05-05 00:28:02 -05:00
Brandon Elam Barker
ee270fe647 confirmed git-secrets is now working 2018-05-04 22:02:55 +00:00
Unknown
401fa33429 Upgrade gitkraken to 3.6.0 2018-05-05 00:07:37 +03:00
Brandon Elam Barker
77a54ea59f adding untested git-secrets 2018-05-04 18:05:08 +00:00
Will Dietz
1abe8fa47a
Merge pull request #39945 from dtzWill/fix/temp-workaround-git-test-musl 
git: disable failing test w/musl for now
 2018-05-03 15:48:15 -05:00
John Ericson
cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Will Dietz
481ca44771 git: disable failing test w/musl for now 
I'm working to resolve this but it will take some time
(patches sent to upstream musl, maybe to git afterwards)
and for now this blocks quite a lot.

If that doesn't work out we can explore options such as
always using GNU libiconv with musl.
 2018-05-03 15:20:38 -05:00
Matthew Bauer
143978a477 treewide: remove platform assertions 
linux: readd assertion
 2018-05-03 13:09:20 -05:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
R. RyanTM
0d2397380f git-cola: 3.0 -> 3.1 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/git-cola/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped --help’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped --version’ and found version 3.1
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped version’ and found version 3.1
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola -h’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola --help’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola --version’ and found version 3.1
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola version’ and found version 3.1
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-dag-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-dag-wrapped --help’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-dag-wrapped --version’ and found version 3.1
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-dag -h’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-dag --help’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-dag --version’ and found version 3.1
- found 3.1 with grep in /nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1
- directory tree listing: https://gist.github.com/af016e8541c2ac80ef4e4e16a00bc0de
 2018-05-01 15:42:37 +02:00
R. RyanTM
d86866cd67 gitAndTools.gitRemoteGcrypt: 1.0.3 -> 1.1 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/git-remote-gcrypt/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt -h’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt --help’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt help’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped -h’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped --help’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped help’ got 0 exit code
- found 1.1 with grep in /nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1
- directory tree listing: https://gist.github.com/f375e7b41aa0075f2c539d2c32748c12
 2018-04-30 16:09:11 -07:00
Will Dietz
6e623fb07b
Merge pull request #39461 from dtzWill/update/git-2.17.0-again 
git: 2.16.3 -> 2.17.0, again, installCheck
 2018-04-26 08:49:04 -05:00
Robin Gloster
04ab1ed623
gitlab: 10.5.6 -> 10.7.0 2018-04-26 00:15:24 +02:00
Robin Gloster
775bbc2d57
gitlab-workhorse: 3.6.0 -> 4.1.0 2018-04-26 00:15:24 +02:00
Robin Gloster
ddec4ae7a0
gitlab-shell: 6.0.3 -> 7.1.2 2018-04-26 00:15:24 +02:00
Robin Gloster
59ad9933ff
gitaly: 0.81.0 -> 0.95.0 2018-04-26 00:15:23 +02:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Guillaume Maudoux
6dda53ad22 git: add install checks 
(cherry picked from commit f57873f674ebc2f6ae874407aafb98a1350ab525)
 2018-04-24 20:26:54 -05:00
Will Dietz
97372a1104 git: 2.16.3 -> 2.17.0... again! 2018-04-24 20:19:22 -05:00
Will Dietz
f07f0c6009 Merge remote-tracking branch 'origin/master' into staging 2018-04-24 19:58:44 -05:00
Ben Gamari
b26ae506a9 git: Set PERL_PATH when building manual 
Otherwise the build fails with the perplexing error

    make: *** No rule to make target 'cmd-list.made', needed by 'doc.dep'.  Stop.
    make: Leaving directory '/tmp/nix-build-git-2.16.3.drv-0/git-2.16.3/Documentation'

on NixOS (but not on Debian, where it succeeds, presumably since it picks up the
system perl).
 2018-04-24 19:00:34 -04:00
Ben Gamari
d111a42772 git: Enable cross-compilation 2018-04-24 14:58:58 -04:00
Ben Gamari
2d397f1b76 git: Allow perl support to be disabled 2018-04-24 14:58:58 -04:00
Ben Gamari
432df5b1cf git: Fix USE_LIBPCRE2 configuration 
Previously this was injected during install, causing the build system to rebuild
the entire package.
 2018-04-24 14:58:58 -04:00
Ben Gamari
ae0a14d25d git: Refactor makeFlags using lib.optionals 2018-04-24 14:58:58 -04:00
Tuomas Tynkkynen
3c6e077301 Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	pkgs/development/tools/misc/binutils/default.nix
 2018-04-22 22:31:30 +03:00
Wout Mertens
77a1993b46
Merge pull request #38918 from gnidorah/gitweb 
nixos/gitweb: add gitwebTheme option
 2018-04-20 21:32:34 +02:00
adisbladis
19bc90f911
bazaar: Fix CVE-2017-14176 2018-04-20 02:07:37 +08:00
gnidorah
9029ed933c nixos/gitweb: add gitwebTheme option 2018-04-17 20:07:01 +03:00
Matthew Justin Bauer
186ec06af9
Merge pull request #38650 from sondr3/gitea-1.4.0 
gitea: 1.3.3 -> 1.4.0
 2018-04-17 10:04:52 -05:00
Tuomas Tynkkynen
16b45ec3da Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/unix-tools.nix
 2018-04-16 21:13:30 +03:00
Yurii Rashkovskii
1fa183defe
sit: 0.2.1 -> 0.3.0 2018-04-13 07:57:21 -07:00
Peter Simons
d503d493ab vcsh: update to latest version and add missing Perl test suite dependencies to fix the build 2018-04-13 09:59:17 +02:00
Matthew Bauer
e49f601b7f cvs: apply darwin patch 
Fixes #36532
 2018-04-12 18:17:23 -05:00
Will Dietz
281775bb1a git: 2.16.2 -> 2.16.3 
Cherry picked from 260194193c in staging as suggested by
https://github.com/NixOS/nixpkgs/pull/38763#issuecomment-380504142.
 2018-04-12 08:55:31 +02:00
Guillaume Maudoux
2ddba49f59 git: fix perl libs path 2018-04-11 17:54:08 +02:00
Guillaume Maudoux
ad076ff7ce git: 2.16.3 -> 2.17.0 2018-04-11 17:54:08 +02:00
Will Dietz
260194193c git: 2.16.2 -> 2.16.3 2018-04-11 17:54:08 +02:00
Frederik Rietdijk
ee6894ca12 Merge staging into master 2018-04-11 14:55:52 +02:00
Peter Simons
e4fd05449e git: revert "2.16.2 -> 2.17.0" 
This reverts commit 5d65b4ebeb, because it broke
git-add. See https://github.com/NixOS/nixpkgs/pull/38636#issuecomment-380182555
for details.
 2018-04-11 09:51:06 +02:00
Frederik Rietdijk
6023849ba1 Merge master into staging 2018-04-10 19:23:42 +02:00
Jörg Thalheim
be81bed434
Merge pull request #35044 from layus/update-hub 
gitAndTools.hubUnstable: init at 2.3.0-pre10
 2018-04-10 17:36:33 +01:00
Guillaume Maudoux
d92d1db717 gitAndTools.hubUnstable: init at 2.3.0-pre10 2018-04-10 17:11:26 +02:00
Robert Schütz
80fc5f2a24 Merge branch 'master' into staging 2018-04-10 09:13:36 +02:00
Matthew Justin Bauer
a7341d70ef
Merge pull request #36884 from nioncode/p4v 
p4v: init at 2017.3.1601999
 2018-04-09 14:07:03 -05:00