Commit Graph

83324 Commits

Author SHA1 Message Date
Frederik Rietdijk
2a3d552c55 pythonPackages.ipykernel: 4.5.0 -> 4.5.1 2016-11-16 16:16:54 +01:00
Domen Kožar
45f579b9e7 allowUnfree: mention the solution that works for nix-shell as well 2016-11-16 15:14:19 +01:00
Lancelot SIX
f7558d07df
poezio: 0.9 -> 0.10 2016-11-16 15:01:43 +01:00
Lancelot SIX
a45315500e
pythonPackages.slixmpp: 1.1 -> 1.2.1 2016-11-16 15:01:30 +01:00
Thomas Tuegel
ecbb4db055 Merge pull request #20430 from ttuegel/multiple-outputs-ldns
ldns: multiple outputs
2016-11-16 07:29:11 -06:00
Thomas Tuegel
137075ea3a Merge pull request #20432 from ttuegel/kde-applications-16.08.3
kde5.applications: 16.08.2 -> 16.08.3
2016-11-16 07:27:48 -06:00
Frederik Rietdijk
77cdbb9e3a pythonPackages.cryptography: 1.5.1 -> 1.5.3 2016-11-16 14:19:54 +01:00
Domen Kožar
d35c15217c Merge pull request #20443 from NeQuissimus/kotlin_1_0_5_2
kotlin: 1.0.5 -> 1.0.5-2
2016-11-16 14:14:19 +01:00
Tobias Geerinckx-Rice
e3a7fc3905
eid-mw: 4.1.18 -> 4.1.19 2016-11-16 13:32:25 +01:00
Tobias Geerinckx-Rice
2034ffdc07
dpkg: 1.18.14 -> 1.18.15 2016-11-16 13:20:32 +01:00
Tadas Barzdzius
87e07a3098 tokei: mark as broken 2016-11-16 13:27:24 +02:00
Tadas Barzdzius
e2eec8f436 exa: mark as broken 2016-11-16 13:27:12 +02:00
Tadas Barzdzius
535f26a9e9 rustfmt: 0.6.0 -> 0.6.2 2016-11-16 13:26:59 +02:00
Tadas Barzdzius
24065c91c0 rustRegistry: 2016-10-29 -> 2016-11-15 2016-11-16 13:26:36 +02:00
Tadas Barzdzius
0f51eb58ee rustc, cargo: 1.12.1 -> 1.13.0, 0.13.0 -> 0.14.0 2016-11-16 13:25:19 +02:00
Peter Simons
fcb6a18f37 haskell-http-api-data: fix reference in configuration-common.nix 2016-11-16 11:16:10 +01:00
Peter Simons
1e43c159e2 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision
4196e3bc37.
2016-11-16 11:16:02 +01:00
Peter Simons
734bd22f1b LTS Haskell 7.9 2016-11-16 11:15:13 +01:00
Frederik Rietdijk
fb62bc90a1 pythonPackages.numexpr: 2.5.2 -> 2.6.1 2016-11-16 10:48:28 +01:00
Tim Digel
2bcaa93aa7 erlang: 19.1 -> 19.1.6 2016-11-16 09:25:04 +01:00
Matthew Bauer
fc1f6f55ea
xcbuild: Get rid of developer.nix, move to wrapper
also:

- add custom outputs "specs" for xcbuild
- get rid of unneeded tools
- update xcbuild
- add more comments
- fixup xcbuild derivations

Affected xcbuild derivations include:

- adv_cmds
- network_cmds
- basic_cmds
2016-11-15 19:13:23 -06:00
Matthew Bauer
4685bd7853
xcbuild: update meta and comments 2016-11-15 19:13:22 -06:00
Matthew Bauer
437bdc5e4b
xcbuild: fix toolchain on Linux 2016-11-15 19:13:22 -06:00
Matthew Bauer
0b6bfa49d5
xcbuild: Move extra specs to platform 2016-11-15 19:13:05 -06:00
Matthew Bauer
25485ece2a
xcbuild: add name to platform.nix 2016-11-15 18:58:13 -06:00
Matthew Bauer
9f46587841
network_cmds: init at 481.20.1
Fixes #16764
2016-11-15 18:58:13 -06:00
Matthew Bauer
3b17d9e35e
developer_cmds: init at 62 2016-11-15 18:58:13 -06:00
Matthew Bauer
823772b056
Librpcsvc: init at 26 2016-11-15 18:58:12 -06:00
Matthew Bauer
4a01a37051
basic_cmds: init at 55 2016-11-15 18:58:12 -06:00
Matthew Bauer
ec409c8e96
contacts: use xcbuild instead of xcodebuild 2016-11-15 18:58:11 -06:00
Matthew Bauer
a35b330f30
adv_cmds: move from all-packages
Use the old way with pkgs/os-specific/darwin/apple-source-releases/defuault.nix.
2016-11-15 18:58:11 -06:00
Matthew Bauer
1ee8685ee7
adv_cmds: add custom install phase 2016-11-15 18:58:10 -06:00
Matthew Bauer
78c3acc2ee
xcbuild: Add install phase
This phase is disabled for now but we can use it later.
2016-11-15 18:58:10 -06:00
Matthew Bauer
f1897116d0
xcbuild: temporarily fix cflags/ldflags
This gets everything to build.

adv_cmds: remove NIX_LDFLAGS

- unneeded
2016-11-15 18:58:09 -06:00
Matthew Bauer
6c1858a93d
adv_cmds: Disable pkill.
pkill isn't building because of some missing headers:

- xpc/xpc.h
- os/base_private.h
- _simple.h

They are all available somewhere but not set up correctly in the Darwin
stdenv.

TODO: add pkill back in!
2016-11-15 18:58:09 -06:00
Matthew Bauer
ebf963ac6c
xcbuild: Update toolchain
- Rework spec files.
- Add more tool specs.
- Add ctags.
2016-11-15 18:58:09 -06:00
Matthew Bauer
44ad052c43
xcbuild: Make "xcbuild.raw" for original unwrapped 2016-11-15 18:58:08 -06:00
Matthew Bauer
8e301fab50
adv_cmds: add xcode derivation 2016-11-15 18:58:08 -06:00
Matthew Bauer
de87138b9a
xcbuild: add wrapper
Also updates xcbuild version.

This changes the raw string expressions into nix expressions that are
then converted into json by builtins.toJSON. Then, converted to Plist
XML by Apple's plutil. Sadly, xcbuild does not support using raw JSON
but Apple's plutil does so we just convert the file from JSON to XML
using Apple's plutil. The result is not ideal but it looks like all OS X
systems have working plutil's.

- set mac version to 10.10
- add setup hook.
2016-11-15 18:57:20 -06:00
Shea Levy
d9e63424b7 ghc-HEAD: Run boot after patches.
This allows for patches affecting configure.ac to take effect
2016-11-15 19:44:21 -05:00
Tim Steinbach
4f820d44d0 Merge pull request #20331 from NeQuissimus/libLAS_1_8_1
libLAS: 1.8.0 -> 1.8.1
2016-11-15 19:09:22 -05:00
Tim Steinbach
224331adc7
liquibase: 3.4.2 -> 3.5.3 2016-11-15 19:03:40 -05:00
Tim Steinbach
2896042738
gradle: Add variable nativeVersion 2016-11-15 18:38:48 -05:00
Shea Levy
6f7593fddc ghc-head: fix hash.
Apparently fetchgit lies...
2016-11-15 18:30:32 -05:00
Tim Steinbach
ef4a335be4
git: 2.10.1 -> 2.10.2 2016-11-15 18:05:02 -05:00
Tim Steinbach
a4cd6f1378 Merge pull request #20441 from NeQuissimus/linux_4_4_32
linux: 4.4.31 -> 4.4.32
2016-11-15 17:49:00 -05:00
Tim Steinbach
819884119c Merge pull request #20439 from NeQuissimus/linux_4_8_8
linux: 4.8.7 -> 4.8.8
2016-11-15 17:48:07 -05:00
Shea Levy
845b56d25a Initial support for cross-compiling ghc 2016-11-15 16:59:09 -05:00
Joachim Fasting
f477bc98be
torbrowser: 6.0.5 -> 6.0.6 2016-11-15 22:57:35 +01:00
Joachim Fasting
0d4e1b5edd
grsecurity: 4.8.7-201611142350 -> 4.8.8-201611150756 2016-11-15 22:57:25 +01:00
Shea Levy
459ab0e0fd Whoops, actually add patch for llvm 2016-11-15 16:41:24 -05:00
Shea Levy
f615df9599 llvm-3.8: Fix segfault in llc 2016-11-15 16:39:08 -05:00
Joachim F
a105b3aff9 Merge pull request #20392 from jerith666/cp-48
crashplan: 4.7.0r2 -> 4.8.0r1
2016-11-15 22:34:38 +01:00
Shea Levy
7df3d7446f Add initial basic support for cross-compiling to iOS 2016-11-15 16:31:55 -05:00
Tim Steinbach
f11b7cf579
gradle: 3.1 -> 3.2 2016-11-15 16:11:29 -05:00
Stefan Goetz
2ca507a2b8 youtube-dl: 2016-11-08.1 -> 2016-11-14.1 (#20440) 2016-11-15 22:01:29 +01:00
Tobias Geerinckx-Rice
3c3dfbc402
aha: 0.4.10.1 -> 0.4.10.2 2016-11-15 21:44:04 +01:00
Vladimír Čunát
207b8d1c46 firefox-esr: security-only update 45.4.0 -> 45.5.0 2016-11-15 19:22:39 +01:00
Tim Steinbach
703b404c62
kotlin: 1.0.5 -> 1.0.5-2 2016-11-15 13:15:10 -05:00
Tim Steinbach
24c342fde7
linux: 4.4.31 -> 4.4.32 2016-11-15 12:31:27 -05:00
Tim Steinbach
9e851d3b11
linux: 4.8.7 -> 4.8.8 2016-11-15 12:30:55 -05:00
Josef Kemetmueller
80eafb39e1
mapnik: Make dependencies explicit for SCons
This is necessary to fix the build for (at least) darwin. If the
arguments are not specified explicitly then homebrew-install locations
are assumed for at least "icu".

Closes #20395.
2016-11-15 17:33:59 +01:00
Josef Kemetmueller
334a1a6f8a Revert "Fix icu4c expression for latest gcc (fixes #2341)"
This reverts commit d393c6c538.
The commit removed C++11 compatibility on darwin by overriding the
--std=c++0x flag in CXXFLAGS. Which lead to a failing build of mapnik,
which depends on the move constructors being available in the icu-lib.
Since it builds fine without the headerpad_max_install_names flag, we
simply undo the change that introduced this flag.
2016-11-15 17:33:31 +01:00
Eelco Dolstra
c2b9404c02
firefox: 49.0.2 -> 50.0 2016-11-15 16:58:45 +01:00
Eelco Dolstra
1624f7f174
nss: 3.26 -> 3.27.1 2016-11-15 16:58:45 +01:00
taku0
76b1413a87 firefox-bin: 49.0.2 -> 50.0 (#20434) 2016-11-15 15:45:57 +01:00
Tim Digel
4c70064cc5 erlang: 18.3.4 -> 18.3.4.4 2016-11-15 15:13:22 +01:00
Lancelot SIX
39297fa36b rush: 1.7 -> 1.8 (#20424) 2016-11-15 13:33:56 +00:00
Thomas Tuegel
ec63ae31eb
kde5.applications: 16.08.2 -> 16.08.3 2016-11-15 07:22:51 -06:00
Thomas Tuegel
12951219c6
ldns: multiple outputs 2016-11-15 07:20:11 -06:00
Thomas Tuegel
520064e4b5
networkmanager: multiple outputs 2016-11-15 07:15:04 -06:00
Alexey Shmalko
1958f07c63 Merge pull request #20291 from nlewo/master
Add protobuf 3.1.0
2016-11-15 14:14:18 +02:00
Joachim Fasting
afab1a948e
grsecurity: 4.8.7-201611102210 -> 201611142350 2016-11-15 13:11:47 +01:00
Moritz Ulrich
bf570a494a
digikam5: 5.1.0 -> 5.3.0 2016-11-15 11:12:45 +01:00
Lancelot SIX
2e63cbfb1f Merge pull request #20396 from non-Jedi/pythonPackages.pint
Python: pint: init at 0.7.2
2016-11-15 08:44:55 +01:00
Justin Wood
520db3b907 beamPackages.hex: 0.11.3 -> 0.14.0 (#19994) 2016-11-15 06:54:52 +01:00
Franz Pletz
8bed505d7e Merge pull request #20311 from mguentner/subsurface
subsurface init at 4.5.6 and dependencies (libdivecomputer, libmarble-ssrf, libgit2 @ 0.23.2)
2016-11-15 04:56:35 +01:00
Maximilian Güntner
90377526eb subsurface: init at 4.5.6
Signed-off-by: Maximilian Güntner <code@klandest.in>
2016-11-15 04:54:52 +01:00
Maximilian Güntner
2e15a8f2dd libgit2: reinit at 0.23.2
Signed-off-by: Maximilian Güntner <code@klandest.in>
2016-11-15 04:54:52 +01:00
Maximilian Güntner
12f7968273 libmarble-ssrf: init at 2016-11-09
Signed-off-by: Maximilian Güntner <code@klandest.in>
2016-11-15 04:54:51 +01:00
Franz Pletz
9e1e3b2880
clamav service: refactor
* Sync systemd units with upstream. Upstream uses SIGUSR2 instead of SIGHUP
  to reload the clamd service.

* Convert freshclam service to a oneshot service activated by a systemd timer.
  This way we can make clamd wait for freshclam to finish fetching the virus
  database before failing to start if the database doesn't exist yet.

* Fixes console tools to work as expected as they require hardcoded config
  file locations.
2016-11-15 04:47:14 +01:00
Maximilian Güntner
72b1ea861c libdivecomputer: init at 0.5.0
Signed-off-by: Maximilian Güntner <code@klandest.in>
2016-11-15 04:14:15 +01:00
Franz Pletz
02e9c88d77
clamav: don't bundle freshclam config with package
Building clamav is expensive due to the bundled llvm.

Closes #20304.
2016-11-15 02:06:02 +01:00
Franz Pletz
c9bd751a16 Merge pull request #20405 from Mic92/wireguard
wireguard: 2016-10-25 -> 0.0.20161110
2016-11-15 01:54:17 +01:00
Alexey Shmalko
7f51891baa Merge pull request #20408 from jbedo/singularity
singularity: init 2.2
2016-11-15 00:14:24 +02:00
Alexey Shmalko
bcd37fdef3 Merge pull request #20403 from vbgl/ocaml-batteries-253
ocamlPackages.batteries: 2.5.2 -> 2.5.3
2016-11-15 00:13:24 +02:00
Justin Bedo
04121437be
singularity: init 2.2 2016-11-15 09:11:53 +11:00
John Wiegley
aa23309a39
Add a patch for cctools to work with Xcode 8 2016-11-14 13:30:28 -08:00
Adam Beckmeyer
e2c4c64668 Python: pint: init at 0.7.2 2016-11-14 16:28:09 -05:00
Thomas Tuegel
ad7d59c59f Merge pull request #20369 from asymmetric/bluez
bluez: 5.40 -> 5.43
2016-11-14 15:27:41 -06:00
Vladimír Čunát
4c19651108
Merge #20264: root: fix environment setup 2016-11-14 22:27:09 +01:00
Kovacsics Robert (NixOS)
5a0665846e plover: move out of python-packages.nix 2016-11-14 20:36:59 +00:00
Frederik Rietdijk
245adb4052 Merge pull request #20337 from KoviRobi/python-plover-update
python-plover: 3.0.0 -> 3.1.0
2016-11-14 21:29:25 +01:00
Rok Garbas
870fc84412 python: adding (python*Full) aliases for all versions of cpython 2016-11-14 21:11:03 +01:00
Christine Koppelt
eb5831a28e nodejs-7_x: 7.0.0 -> 7.1.0 2016-11-14 20:25:28 +01:00
Eelco Dolstra
2c2b6ae455 google-fonts: Add a check to ensure that there are no duplicate font names
Issue #20282.
2016-11-14 17:35:35 +01:00
Daiderd Jordan
52d4599b52
Revert "Update hash for xnu 3248.60.10, the tarball changed upstream, it seems."
This reverts commit 328ad17858.
2016-11-14 16:21:59 +01:00
Tim Steinbach
0c410a6bed Merge pull request #20401 from mikefaille/vagrant-up
vagrant: 1.8.6 -> 1.8.7
2016-11-14 10:06:03 -05:00
Tim Steinbach
f7fd568678 Merge pull request #20413 from NeQuissimus/linux_4_9_rc5
linux: 4.9-rc4 -> 4.9-rc5
2016-11-14 10:05:20 -05:00
Tim Steinbach
265257d72a Merge pull request #20398 from cko/node_update
nodejs: 4.6.0 -> 4.6.2; 6.8.0 -> 6.9.1
2016-11-14 09:48:16 -05:00
Tim Steinbach
a87c8ad05f
linux: 4.9-rc4 -> 4.9-rc5 2016-11-14 09:40:27 -05:00
Tim Steinbach
91ae568ec7
broadcom_sta: Fix hash 2016-11-14 09:36:06 -05:00
Tobias Geerinckx-Rice
7981d3437d
aha: 0.4.9 -> 0.4.10.1 2016-11-14 14:14:52 +01:00
Tobias Geerinckx-Rice
f82b7768cd
libpsl: 0.14.0 -> 0.15.0 2016-11-14 13:54:56 +01:00
Frederik Rietdijk
ce7a438156 Merge pull request #20399 from jbedo/plink-ng
plink-ng: init at 1.90b3
2016-11-14 13:32:54 +01:00
zimbatm
215a41355b terraform: 0.7.9 -> 0.7.10 2016-11-14 12:21:10 +00:00
Frederik Rietdijk
328bafd482 Merge pull request #20255 from FRidh/xapian
xapianBindings: remove
2016-11-14 13:12:47 +01:00
Frederik Rietdijk
b85632407a Merge pull request #20130 from FRidh/ssr
SoundScape Renderer and ecasound
2016-11-14 13:07:41 +01:00
Frederik Rietdijk
811e59f099 ssr: init at 2016-11-03 2016-11-14 13:07:05 +01:00
Frederik Rietdijk
26abed2222 ecasound: init at 2.9.1 2016-11-14 12:56:55 +01:00
Frederik Rietdijk
e23724dc96 pythonPackages.reikna: init at 0.6.7 2016-11-14 12:31:05 +01:00
Frederik Rietdijk
05ca19c679 pythonPackages.pycuda: 2016.1 -> 2016.1.2
and disable tests because they require an available cuda device.
2016-11-14 12:31:05 +01:00
Frederik Rietdijk
5cfcbd89e9 pythonPackages.pytools: fix tests 2016-11-14 12:31:05 +01:00
Frederik Rietdijk
6435a85c3f pythonPackages.numba: 0.27.0 -> 0.29.0
and move expression in a separate file.
2016-11-14 12:31:05 +01:00
Frederik Rietdijk
dc1b2ed11f pythonPackages.llvmlite: 0.13.0 -> 0.14.0
and move expression in separate file.
2016-11-14 12:31:05 +01:00
Frederik Rietdijk
450edd4b72 python-packages.nix: make pythonAtLeast and pythonOlder available 2016-11-14 12:31:05 +01:00
Frederik Rietdijk
6c7d501a7b pythonPackages.pyopencl: init at 2016.2 2016-11-14 12:31:05 +01:00
Frederik Rietdijk
dbee363591 pythonPackages.boost: version of boost for specific interpreter
Several Python packages require boost. pkgs.boost is built with Python
2.7 and therefore libboost_python.so was compatible only with 2.7.
2016-11-14 12:31:05 +01:00
Frederik Rietdijk
901e79aac2 Merge pull request #20407 from lsix/update_asgiref
Update pythonPackages.asgi*
2016-11-14 12:07:59 +01:00
Eelco Dolstra
ce4cf12a3b Merge pull request #20397 from obadz/e2fsprogs
e2fsprogs: 1.42.13 -> 1.43.3
2016-11-14 11:01:32 +01:00
Justin Bedo
a6d6a3972f
plink-ng: init at 1.90b3 2016-11-14 20:28:39 +11:00
Jörg Thalheim
8d5ddd2563
telegraf: 1.0.1 -> 1.1.1 2016-11-14 10:25:34 +01:00
Michael Alan Dorman
7daf0b8b6e git-annex: update sha256 for new version 2016-11-14 10:04:15 +01:00
Peter Simons
92df69fb22 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision
5e084e904a.
2016-11-14 10:04:05 +01:00
Lancelot SIX
2f48d75b8d
pythonPackages.asgi_redis: 0.14.1 -> 1.0.0 2016-11-14 09:48:23 +01:00
Lancelot SIX
710ae1b5b3
pythonPackages.asgi_ipc: 1.1.0 -> 1.2.0 2016-11-14 09:48:01 +01:00
Lancelot SIX
2ef41c34f8
pythonPackages.asgiref: 0.14.0 -> 1.0.0 2016-11-14 09:47:31 +01:00
Jörg Thalheim
c0f9bc9b4e
wireguard: 2016-10-25 -> 0.0.20161110 2016-11-14 09:29:58 +01:00
Rob Vermaas
328ad17858 Update hash for xnu 3248.60.10, the tarball changed upstream, it seems.
(cherry picked from commit 5ddaca179c15154efae4e5b7efea843d2c67cff8)
2016-11-14 08:16:00 +00:00
Vincent Laporte
86f63755f5 ocamlPackages.batteries: 2.5.2 -> 2.5.3 2016-11-14 09:00:18 +01:00
Michaël Faille
3a3706c07f vagrant: 1.8.6 -> 1.8.7
I upgrade vagrant mainly for this bug :
https://github.com/mitchellh/vagrant/issues/7844
2016-11-14 00:15:57 -05:00
Tobias Geerinckx-Rice
8ef3eaeb4e
dpkg: remove commented old postPatch
This was supposed to be removed in 7f71b89454
since it doesn't appear to be needed any longer.
2016-11-14 05:32:22 +01:00
Tobias Geerinckx-Rice
e82c325bff
btrfs-progs: 4.8.2 -> 4.8.3 2016-11-14 05:28:22 +01:00
Tobias Geerinckx-Rice
7f71b89454
dpkg: 1.18.10 -> 1.18.14 2016-11-14 01:45:49 +01:00
Tobias Geerinckx-Rice
4fd9a60874
pythonPackages.prompt_toolkit: 1.0.3 -> 1.0.9 2016-11-14 01:45:48 +01:00
Christine Koppelt
f7e1da5fd1 nodejs: 4.6.0 -> 4.6.2; 6.8.0 -> 6.9.1 2016-11-14 00:27:40 +01:00
Joachim Fasting
cad9212813
grsecurity: 4.7.10-201611011946 -> 4.8.7-201611102210 2016-11-14 00:16:19 +01:00
Pascal Wittmann
cbe8c3f62f zile: 2.4.11 -> 2.4.13 2016-11-13 22:15:44 +01:00
obadz
83fe4fa0bf e2fsprogs: 1.42.13 -> 1.43.3 2016-11-13 21:03:32 +00:00
Pascal Wittmann
181ed4c82b bmon: 3.8 -> 3.9 2016-11-13 21:50:11 +01:00
Alexey Shmalko
8e6f0f0673 Merge pull request #20389 from frlan/Update/Geany/1.29
Geany: 1.28 -> 1.29
2016-11-13 21:56:27 +02:00
Frederik Rietdijk
682d142c7d Merge pull request #20371 from MostAwesomeDude/stripe
pythonPackages.stripe: init at 1.41.1
2016-11-13 20:51:46 +01:00
Matt McHenry
008399e9de add self to crashplan maintainers 2016-11-13 14:41:57 -05:00
Matt McHenry
ee6dfa1e9e crashplan: 4.7.0r2 -> 4.8.0r1 2016-11-13 14:38:14 -05:00
Vladimír Čunát
1ac5869907
Merge #19936: vulkan / amdgpu-pro update 2016-11-13 20:06:40 +01:00
Shea Levy
2ded9f3f7b coq: Improve emacs buffer handling 2016-11-13 14:01:01 -05:00
obadz
feb8a692a1 getxbook: init at 1.2 2016-11-13 17:36:05 +00:00
Frank Lanitz
d4da4fa5f9 Geany: 1.28 -> 1.29 2016-11-13 17:51:11 +01:00
David McFarland
3d4a280c35 amdgpu-pro: 16.30.3-315407 -> 16.40-348864 2016-11-13 12:44:28 -04:00
David McFarland
e1a25aeb65 amdgpu-pro: fix kernel module for linux-4.8 2016-11-13 12:44:28 -04:00