mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 05:31:22 +00:00
Code Issues Wiki Activity
108199 commits 319 branches 124 tags 6.6 GiB
Commit graph

12136 commits

Author SHA1 Message Date
Franz Pletz 0b89f71a07
unbound: 1.6.1 -> 1.6.2 2017-05-14 22:46:57 +02:00
Tuomas Tynkkynen 640d434ddb sshfs-fuse: 2.7 -> 2.9 2017-05-14 15:22:09 +03:00
Tuomas Tynkkynen f2eb770e33 ethtool: 4.6 -> 4.10 2017-05-14 15:18:41 +03:00
Tuomas Tynkkynen beb43a651c Merge remote-tracking branch 'upstream/master' into staging 2017-05-14 14:24:20 +03:00
Tuomas Tynkkynen e1805301af afl: 2.35b -> 2.41b 2017-05-14 04:15:24 +03:00
georgewhewell a06781877f fwup: init at 0.14.2 2017-05-13 18:22:10 +01:00
George Whewell 867e7f4dcf fix dosfstools build on darwin 2017-05-13 11:27:19 +01:00
Peter Simons ae6f9324cd openvpn: update to version 2.4.2 to fix CVE-2017-7478 and CVE-2017-7479 2017-05-12 13:35:37 +02:00
Vladimír Čunát 51e0f8f759
Merge branch 'master' into staging 
Some more larger rebuilds from master.
 2017-05-12 12:03:37 +02:00
Utku Demir aa858b9f2e Set clac.meta.platforms to "unix" instead of "linux" 2017-05-12 09:31:49 +12:00
Jörg Thalheim 3dc109cbc2
blueman: use wrapGAppsHook 2017-05-11 20:34:51 +01:00
Jörg Thalheim 4f676a0825
megatools: use wrapGAppsHook 2017-05-11 20:34:32 +01:00
Peter Hoeg 641c4116a9 kdiff3: 2016-04-20 -> 2017-02-19 2017-05-11 21:10:00 +08:00
Jörg Thalheim b77a3466f8 Merge pull request #25679 from orivej/zstd 
zstd: 1.1.3 -> 1.2.0
 2017-05-11 13:53:12 +01:00
Peter Hoeg 48192c65c3 partition-manager: init at 3.0.1 
Includes kpmcore 3.0.3
 2017-05-11 19:07:44 +08:00
Peter Hoeg d5861fa537 wkhtmltopdf: 0.12.3.2 -> 0.12.4 2017-05-11 13:16:06 +08:00
Peter Hoeg c684c0e82d mu: add checkInputs 2017-05-11 12:53:12 +08:00
Robert Helgesson dd70ff228f
svtplay-dl: 1.9.3 -> 1.9.4 2017-05-10 22:50:58 +02:00
Orivej Desh cb1af17f53 zstd: 1.1.3 -> 1.2.0 2017-05-10 17:52:34 +00:00
Armijn Hemel d80d08de50 lzip: 1.18 -> 1.19 2017-05-10 18:29:07 +02:00
Patrick Callahan 3d37af3e8b
fzf: add fish hook for NixOS 2017-05-10 10:16:04 +01:00
Patrick Callahan 855ae68648
direnv: add fish shell hook for NixOS 2017-05-10 10:15:58 +01:00
Desmond O. Chang c6c7197c7d lnav: 0.8.1 -> 0.8.2 2017-05-10 04:10:58 +02:00
Franz Pletz d43a2ef80a Merge pull request #25593 from mimadrid/update/languagetool-3.7 
languagetool: 3.5 -> 3.7
 2017-05-10 03:45:38 +02:00
Desmond O. Chang ee30a67a86 yank: 0.8.0 -> 0.8.2 2017-05-10 09:36:50 +08:00
Vladimír Čunát 8b01ec9a9e
Merge branch 'master' into staging 2017-05-10 00:54:53 +02:00
davidak 26294f40c3 bcachefs-tools: init at a588eb0 2017-05-10 00:22:33 +02:00
Aneesh Agrawal 779ae06467 Add salt master module (#25632) 
* salt: 2016.11.2 -> 2016.11.4

* salt: Add master NixOS module
 2017-05-09 18:20:35 +01:00
Tristan Helmich 1d0627bccc graylogPlugins: Add and update plugins 2017-05-09 17:44:23 +02:00
Jörg Thalheim e060a5ee15
cron: remove sbin from PATH 
follow up of https://github.com/NixOS/nixpkgs/pull/25550
 2017-05-09 08:50:58 +01:00
Jörg Thalheim 0e6950ded6 Merge pull request #25608 from 8573/8573/pkg/add/rust/staccato/1 
staccato: init at 0.1.6
 2017-05-09 08:42:27 +01:00
Ronny Pfannschmidt 9587d3591e remove myself from maintainers/enpass (#25625) 
as i am no longer using nixos
 2017-05-08 22:03:23 +01:00
Eelco Dolstra 234cdc02eb
nixUnstable: 1.12pre5344_eba840c8 -> 1.12pre5350_7689181e 2017-05-08 16:50:58 +02:00
Volth a51663f9da pngquant: restored 'patchShebangs' because build failed on Hydra 2017-05-08 16:08:37 +03:00
Franz Pletz 547c51a2a2 Merge pull request #25592 from mimadrid/update/whois-5.2.15 
whois: 5.2.14 -> 5.2.15
 2017-05-08 09:13:56 +02:00
c74d 7cf29e1305 staccato: init at 0.1.6 
Add the package `staccato`, "a command line program that lets you
compute statistics from values from a file or standard input".

I have tested this change per nixpkgs manual section 13.1 ("Making
patches").
 2017-05-08 07:03:10 +00:00
Pascal Wittmann e7322f1fdf Merge pull request #25587 from mimadrid/update/parallel-20170422 
parallel: 20170122 -> 20170422
 2017-05-07 23:45:06 +02:00
mimadrid 7fb709a5ab
languagetool: 3.5 -> 3.7 2017-05-07 23:18:49 +02:00
mimadrid 3f7665b5a0
whois: 5.2.14 -> 5.2.15 2017-05-07 23:11:56 +02:00
mimadrid fa33bbc01b
parallel: 20170122 -> 20170422 2017-05-07 22:45:42 +02:00
Frederik Rietdijk 7a61788bc1 Merge remote-tracking branch 'upstream/master' into HEAD 2017-05-07 21:36:49 +02:00
Joachim F 2b922a8d0d Merge pull request #25532 from volth/pngquant-2.9.1 
pngquant: 2.6.0 -> 2.9.1
 2017-05-07 19:02:15 +01:00
volth 27e8a7945b reaver: database on readwrite medium (#25321) 2017-05-07 19:01:36 +01:00
Frederik Rietdijk ef4442e827 Python: replace requests2 with requests tree-wide 
See f63eb58573

The `requests2` attribute now throws an error informing that `requests`
should be used instead.
 2017-05-07 12:56:09 +02:00
Jörg Thalheim 63b294eb0c
tigervnc: 1.8.0pre20170211 -> 1.8.0pre20170419 2017-05-07 09:38:42 +01:00
gnidorah 42cad8b6b0
winusb: init at 2017-01-30 
fixes #25536
 2017-05-07 08:26:22 +01:00
Frederik Rietdijk e75096142c pythonPackages.llfuse-0-41: move into attic 
because that's the only expression using this older version.
 2017-05-07 08:50:14 +02:00
Joachim Fasting 22cffa0716
socklog: init at 2.1.0 2017-05-06 19:41:49 +02:00
Joachim F 3c320fe7b1 Merge pull request #19898 from bzizou/irods4.2 
irods: init at 4.2.0
 2017-05-06 18:19:04 +01:00
Joachim F 1035af4789 Merge pull request #25545 from calvertvl/update-pass-1.7.1 
pass: 1.7 -> 1.7.1
 2017-05-06 17:36:18 +01:00
Tristan Helmich 450a0571cd graylog: 2.2.2 -> 2.2.3 2017-05-06 16:10:04 +02:00
Vladimír Čunát fa5d543770
Merge branch 'master' into staging 2017-05-06 13:24:28 +02:00
Pascal Wittmann c15a17eb84 Merge pull request #25457 from jb55/mb2md 
mb2md: init at 3.20
 2017-05-05 22:16:16 +02:00
Victor Calvert 9bc0b12c68 pass: 1.7 -> 1.7.1 2017-05-05 16:09:03 -04:00
Frederik Rietdijk f6dd52cd69 pythonPackage.Pyro: use upstream name 2017-05-05 21:13:26 +02:00
William Casarin 8d03054f77 mb2md: init at 3.20 2017-05-05 08:52:06 -07:00
Volth 76b5d53067 pngquant: 2.6.0 -> 2.9.1 2017-05-05 10:54:21 +00:00
Joachim F 7c283b44c9 Merge pull request #25446 from romildo/new.connman-gtk 
connman-gtk: init at 1.1.1
 2017-05-05 00:21:37 +01:00
Eelco Dolstra d53540dd32
nixUnstable: 1.12pre5308_2f21d522 -> 1.12pre5344_eba840c8 2017-05-04 20:45:20 +02:00
Eelco Dolstra 3b8f8951db
Merge remote-tracking branch 'origin/master' into staging 2017-05-04 20:23:38 +02:00
Rob Vermaas a9f054c834
dd-agent: Add default config files of dd-agent and auto_conf dir 
to /etc/dd-agent/conf.d by default, and make sure
/etc/dd-agent/conf.d is used.

Before NixOS 17.03, we were using dd-agent 5.5.X which
used configuration from /etc/dd-agent/conf.d

In NixOS 17.03 the default conf.d location is first used relative,
meaning that $out/agent/conf.d was used without NixOS overrides.

This change implements similar functionality as PR #25288, without
breaking backwards compatibility.

(cherry picked from commit 77c85b0ecb)
 2017-05-04 09:47:21 +00:00
Jörg Thalheim f556d94527 Merge pull request #25484 from l2dy/nix-confdir 
nix: add confDir argument
 2017-05-03 21:52:01 +01:00
Eelco Dolstra 20d846bcdd
nixUnstable.perlBindings: Fix Nix::Config generation 
The configure script calls nix-instantiate, which fails if /nix/var
doesn't exist (e.g. in a sandbox). This caused a bogus Nix::Config
module to be generated, causing issues in Hydra.
 2017-05-03 17:39:43 +02:00
Zero King 8bb7328300 nix: add confDir argument 2017-05-03 13:04:52 +00:00
Frederik Rietdijk c520e79842 Merge remote-tracking branch 'upstream/master' into HEAD 2017-05-03 09:59:49 +02:00
Pascal Wittmann c5a5ac1ef7 Merge pull request #25471 from aneeshusa/update-mosh-to-1.3.0 
mosh: 1.2.6 -> 1.3.0
 2017-05-03 07:33:44 +02:00
Aneesh Agrawal bc4e30a12b mosh: 1.2.6 -> 1.3.0 
Release announcement is available at
http://mailman.mit.edu/pipermail/mosh-users/2017-March/000341.html.
 2017-05-02 19:39:25 -04:00
Aneesh Agrawal ded7953478 treewide: meta.platform -> meta.platforms 2017-05-02 19:32:02 -04:00
Michael Raskin 7527355840 Merge pull request #25218 from expipiplus1/cross-llvm 
Fix cross compilation of LLVM-3.9
 2017-05-02 22:24:41 +02:00
Matthew Bauer 1234825656 xsv: fix "has invalid meta attribute" 
Without this there's an eval error, when running nix-env -f '<nixpkgs>'
--query --available --json.

  derivation ‘xsv-0.11.0’ has invalid meta attribute ‘override’
  derivation ‘xsv-0.11.0’ has invalid meta attribute ‘overrideDerivation’

[Bjørn: extend commit message.]
 2017-05-02 21:04:34 +02:00
Ioannis Koutras cc4e2505e4 efivar: 31 -> 30 
According to the release page, version 31 of efivar is still considered
as a pre-release and the sha256sum has changed at least once. This commit
switches to the last, stable release.
 2017-05-02 20:56:36 +02:00
Matthew Bauer aac48708c1 jing-trang: supports all unix 
This is needed to build the manual on macOS.
 2017-05-02 20:52:19 +02:00
romildo 0de51ef70e connman-gtk: init at 1.1.1 2017-05-02 14:13:31 -03:00
Pascal Wittmann cac205c252 Merge pull request #25436 from romildo/upd.cmst 
cmst: 2016.10.03 -> 2017.03.18
 2017-05-02 15:00:04 +02:00
Vladimír Čunát d7501b986a
luajit: 2.1.0-beta2 -> 2.1.0-beta3 
The removal of `luaL_reg` alias caused lots of breakage.
Only sysdig and knot-resolver needed (also) other changes.
 2017-05-02 14:00:45 +02:00
romildo ed76d724d3 cmst: 2016.10.03 -> 2017.03.18 2017-05-02 08:50:55 -03:00
Pascal Wittmann de48ca0466 Merge pull request #25425 from romildo/upd.connman 
connman: 1.33 -> 1.34
 2017-05-02 12:21:22 +02:00
Peter Hoeg d4dbef90f3 rockboxutility: do not pull in espeak by default 2017-05-02 15:52:10 +08:00
Peter Hoeg 13bca4ba2d rockboxutility: fix linking to Qt libs 2017-05-02 14:34:52 +08:00
romildo ac8698b7d1 connman: 1.33 -> 1.34 2017-05-01 23:35:18 -03:00
Michael Raskin a5f436814a Merge pull request #21017 from AndersonTorres/rst2html5 
rst2html5: init at 1.9.3
 2017-05-01 23:58:28 +02:00
AndersonTorres 4a87eae13c rst2html5: put its expression in a separate file 
As recommended by @7c6f434c and @FRidh, rst2html5 now resides
in its proper file.
 2017-05-01 18:12:36 -03:00
Michael Raskin 208fa65256 Merge pull request #23080 from nixy/init/linode-cli 
linode-cli: init at 1.4.7
 2017-05-01 19:27:30 +02:00
Michael Raskin ee790bf944 Merge pull request #23321 from jensbin/networkmanager_dmenu 
networkmanager_dmenu: init at unstable-2017-04-13
 2017-05-01 19:25:44 +02:00
Jens Binkert 4c6d267ae8 networkmanager_dmenu: init at unstable-2017-04-13 2017-05-01 19:06:23 +02:00
Jens Grunert 87a450e466 Adding networkmanager_dmenu 2017-05-01 19:00:33 +02:00
Andrew R. M 61668b036a linode-cli: init at 1.4.7 2017-05-01 12:58:54 -04:00
Michael Raskin 008bd11363 Merge pull request #25237 from ericsagnes/pkg-update/fcitx-related 
fcitx-engines.mozc: 2.17.2313.102.1 -> 2.18.2612.102.1 and other minor fcitx packages updates
 2017-05-01 18:58:53 +02:00
Vladimír Čunát 92ee3b02e8
Merge branch 'staging' 
Master is seeing a very large rebuild now, and this version of staging
seemed rather fine already (only a few thousand builds remaining now).
I really didn't want to wait a few more days because of this.
 2017-05-01 18:00:21 +02:00
Michael Raskin 8a4bb1beb6 Merge pull request #25130 from jeaye/simp_le-0.2.0 
simp_le: 0.1.1 -> 0.2.0
 2017-05-01 14:40:08 +02:00
Michael Raskin 5ef193446e Merge pull request #24997 from romildo/upd.efibootmgr 
efibootmgr: 13 -> 15
 2017-05-01 13:22:28 +02:00
Pascal Wittmann c133bf6a79
nzbget: 18.0 -> 18.1 2017-05-01 12:03:41 +02:00
Michael Raskin 4d2f7b63e0 Merge pull request #24803 from pajowu/master 
browserpass: init at 1.0.2
 2017-05-01 11:27:17 +02:00
Michael Raskin 1a380c094f Remove empty longDescription 2017-05-01 11:27:03 +02:00
Cray Elliott c5fbf35be0 xpra: fix missed ffmpeg_3_2 reference 2017-04-30 16:58:33 -07:00
Cray Elliott c49a454210 mpv, xpra: depend on ffmpeg instead of ffmpeg_3_2 
effectively updates them to depend on ffmpeg_3_3
 2017-04-30 16:52:49 -07:00
José Romildo Malaquias 2b140a795c offlineimap: 7.0.13 -> 7.1.0 (#25342) 2017-05-01 00:06:48 +02:00
Daiderd Jordan ed8fbe3dae Merge pull request #25358 from sigma/pr/fzf-0.16.7 
fzf: 0.16.6 -> 0.16.7
 2017-04-30 23:21:54 +02:00
Benno Fünfstück 17a8227c3c Merge pull request #25360 from sigma/pr/pt-2.1.5 
the_platinum_searcher: 2.1.3 -> 2.1.5
 2017-04-30 23:04:11 +02:00
Yann Hodique 5c9986e406 the_platinum_searcher: 2.1.3 -> 2.1.5 2017-04-30 12:51:58 -07:00
Michael Raskin d5ec7bc748 Merge pull request #23697 from sargon/master 
sshguard + service: init at 2.0.0
 2017-04-30 21:43:12 +02:00
Yann Hodique 078b7c9f16 fzf: 0.16.6 -> 0.16.7 2017-04-30 11:38:58 -07:00
Michael Raskin eedc0f0a78 Merge pull request #23333 from romildo/upd.qt5ct 
qt5ct: 0.24 -> 0.30
 2017-04-30 19:42:31 +02:00
Michael Raskin ebc9e7a201 Merge pull request #22660 from timbertson/nix-update-source 
nix-update-source: init at 0.3.0
 2017-04-30 18:49:07 +02:00
Michael Raskin b3d1050cf2 Merge pull request #22438 from rnhmjoj/masscan 
masscan: init at 2016-11-03
 2017-04-30 18:40:58 +02:00
Vladimír Čunát 9860e77f79
Merge branch 'master' into staging 2017-04-30 14:40:39 +02:00
obadz f5939cde52 Merge pull request #25341 from womfoo/bump/facter-3.6.4 
facter: 3.6.0 -> 3.6.4 and related deps
 2017-04-30 12:47:20 +01:00
Kranium Gikos Mendoza 673ac9506b facter: 3.6.0 -> 3.6.4 2017-04-30 21:13:26 +10:00
Frederik Rietdijk 3425c37ac6 Merge pull request #25336 from matthewbauer/nix-bundle 
nix-bundle: v0.1.1 -> v0.1.3
 2017-04-30 09:58:18 +02:00
Matthew Bauer 8b5854e260 nix-bundle: 0.1.2 -> 0.1.3 2017-04-30 02:23:31 -05:00
Joachim F f15dae36fe Merge pull request #25295 from mguentner/youtubedl_170428 
youtube-dl: 2017.04.17 -> 2017.04.28
 2017-04-29 22:06:50 +01:00
Jörg Thalheim fddeacfe4c Merge pull request #25316 from ericsagnes/pkg-update/ibus-mozc 
ibus-engines.mozc:  2.17.2313.102 -> 2.20.2673.102
 2017-04-29 11:14:00 +02:00
Jaka Hudoklin 85d16bd7af Merge pull request #25312 from calvertvl/update-xpra-2_0_2 
xpra: 2.0.1 -> 2.0.2
 2017-04-29 10:33:32 +02:00
Eric Sagnes 54d05a5700 fcitx-engines.mozc: 2.17.2313.102.1 -> 2.18.2612.102.1 2017-04-29 15:34:48 +09:00
Eric Sagnes 424f175546 ibus-engines.mozc: 2.17.2313.102 -> 2.20.2673.102 2017-04-29 15:26:22 +09:00
Dan Peebles 90b9719f4f treewide: fix the remaining issues with meta attributes 2017-04-29 04:24:34 +00:00
Victor Calvert 5539f8acfa xpra: 2.0.1 -> 2.0.2 2017-04-28 23:39:19 -04:00
Maximilian Güntner 76d8811d8a
youtube-dl: 2017.04.17 -> 2017.04.28 2017-04-28 20:06:40 +02:00
Eelco Dolstra e042db5e41
nixUnstable: 1.12pre5152_915f62fa -> 1.12pre5308_2f21d522 2017-04-28 17:55:53 +02:00
Joachim Fasting 7301bf8581
tor: 0.2.9.10 -> 0.3.0.6 
First stable release in the 0.3 series.

https://blog.torproject.org/blog/tor-0306-released-new-series-stable
 2017-04-27 19:26:59 +02:00
Armijn Hemel b85893cb9c acct: 6.6.2 -> 6.6.3 2017-04-27 19:25:49 +02:00
Franz Pletz 286ab2a5ec Merge pull request #24490 from takikawa/add-nfdump 
nfdump: init at 1.6.15
 2017-04-27 17:13:41 +02:00
Tim Steinbach 68d7c42247 Merge pull request #25024 from NeQuissimus/staging_curl_7_54_0 
curl: 7.53.1 -> 7.54.0 (staging)
 2017-04-27 08:27:02 -04:00
Peter Hoeg 4639e68fd1 grc: 1.10.1 -> 1.11 2017-04-26 22:45:03 +08:00
Michael Raskin aea9257581 Merge pull request #25206 from matthiasbeyer/update-my-pkgs 
Update my pkgs
 2017-04-26 11:50:11 +02:00
Matthias Beyer cca20a7114 vdirsyncer: 0.14.1 -> 0.15.0 2017-04-26 09:53:54 +02:00
Domen Kožar 6108ee50b9 Merge pull request #25236 from matthewbauer/nix-bundle 
nix-bundle: init at 0.1.1
 2017-04-26 09:38:07 +02:00
Matthew Bauer 30ea4f0807 nix-bundle: init at 0.1.1 
Adds the nix-bundle derivation from https://github.com/matthewbauer/nix-bundle
 2017-04-26 01:53:40 -05:00
Eric Sagnes a08f5c7705 fcitx-qt5: 1.0.5 -> 1.1.0 2017-04-26 15:47:58 +09:00
Eric Sagnes 698d1bdd10 fcitx-configtool: 0.4.8 -> 0.4.9 2017-04-26 15:47:14 +09:00
Shea Levy 5aa936d0ee nix perl-bindings: Fix Config.pm 2017-04-25 20:36:04 -04:00
Asumu Takikawa 6b0736b01d nfdump: init at 1.6.15 2017-04-25 15:00:59 -07:00
Michael Raskin ba974d4b74 Merge pull request #24214 from NickHu/proselint 
proselint: disable tests and put in correct scope
 2017-04-25 23:18:34 +02:00
Joe Hermaszewski 3eee6ea7c1 groff: use buildPackages to fix cross compile 2017-04-25 19:59:35 +00:00
Eelco Dolstra e4190943c8
nix: 1.11.8 -> 1.11.9 2017-04-25 17:19:10 +02:00
Armijn Hemel b5530755a5 bc: 1.06 -> 1.07.1 2017-04-25 15:08:36 +03:00
Tuomas Tynkkynen 0537320062 networkmanager: Temporarily disable -Wformat-security until next release 
Reportedly this is due to GLib 2.52 which added a G_GNUC_PRINTF attribute to
g_dbus_message_new_method_error().
 2017-04-24 20:01:22 +03:00
Tuomas Tynkkynen cf3800b38c Merge remote-tracking branch 'upstream/staging' into master 2017-04-24 19:25:38 +03:00
Domen Kožar 9f11d17ed2
add papertrail at 0.10.1 
Thank you @grahamc <3
 2017-04-24 17:05:03 +02:00
Tuomas Tynkkynen 84982c28de Merge remote-tracking branch 'upstream/master' into staging 2017-04-24 15:04:43 +03:00
Benno Fünfstück 30a9923f4c Merge pull request #24359 from rnhmjoj/radeon-profile 
radeon-profile: init at 20161221
 2017-04-24 11:28:34 +02:00
rnhmjoj 9b1b22fcb6
radeon-profile: init at 20161221 2017-04-24 10:52:14 +02:00
Daiderd Jordan 80828429d7 Merge pull request #25066 from matthewbauer/less-darwin-eval-errors 
Add Darwin as platform to various "broken" packages that actually build
 2017-04-24 08:14:21 +02:00
Matthew Bauer 02285dcd10
cron: supports darwin 2017-04-23 18:08:42 -05:00
Matthew Bauer 9e92c53b53
flvstreamer: supports darwin 2017-04-23 18:08:41 -05:00
Matthew Bauer fe9b9e7f38
icoutils: already supports darwin 2017-04-23 18:08:38 -05:00
Matthew Bauer bd07af92ec
desktop-file-utils: support darwin 2017-04-23 18:08:37 -05:00
Matthew Bauer 0293d0dbec
lhasa: supports darwin 2017-04-23 18:08:36 -05:00
Matthew Bauer d3084b2798
sourceHighlight: supports darwin 2017-04-23 18:08:35 -05:00
Matthew Bauer 5312c48399
miniupnpc: supports darwin 2017-04-23 18:08:35 -05:00