mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 02:24:27 +00:00
Code Issues Wiki Activity
64450 commits 198 branches 125 tags 5.5 GiB
Commit graph

16859 commits

Author SHA1 Message Date
Pascal Wittmann 1d30557516 Fixed meta.license: s/licence/license 2015-05-30 15:19:05 +02:00
Pascal Wittmann dbfaf1c27c Merge pull request #8064 from ftrvxmtrx/utf8proc-1.2 
utf8proc: 1.1.6 -> 1.2
 2015-05-30 13:49:55 +02:00
Siarhei Zirukin 2ee1ab955a utf8proc: 1.1.6 -> 1.2 2015-05-30 13:15:45 +02:00
William A. Kennington III 5483697ab1 nss: 3.19 -> 3.19.1 2015-05-29 15:29:53 -07:00
William A. Kennington III b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
William A. Kennington III cd52c04456 Fix more ca-bundle paths 2015-05-29 14:26:32 -07:00
Arseniy Seroka 02fd0c8771 Merge pull request #7742 from magnetophon/guitarix-syslibs-master 
guitarix: use system zita libs
 2015-05-29 23:37:43 +03:00
William A. Kennington III ac2f05a50a krb5: Make lib build parallel 2015-05-29 10:12:29 -07:00
William A. Kennington III a74e4863f3 krb5: Fixes 2015-05-29 10:12:00 -07:00
Bart Brouns 859ec9719b guitarix: use system zita libs 2015-05-29 14:05:46 +02:00
William A. Kennington III 035273f813 Merge pull request #8022 from devhell/mediainfo 
Update mediainfo{-gui} and dependencies
 2015-05-29 00:57:13 -07:00
William A. Kennington III de6f236bbb Merge pull request #8038 from codyopel/ffmpeg-networking 
ffmpeg: include networking support
 2015-05-29 00:54:15 -07:00
Peter Simons d9cc38757a openssl: add version 1.0.2a as attribute 'openssl_1_0_2' 
We'll try switching our default version after the 15.06 release has been
branched off. Resolves https://github.com/NixOS/nixpkgs/issues/7970.
 2015-05-29 09:52:29 +02:00
Allen Nelson e001340cf6 returned to two-file structure for liblapack 2015-05-28 21:49:06 -05:00
Peter Simons 99273a6716 Merge pull request #8047 from nckx/master 
Don't use "with licenses;" for single licences
 2015-05-28 22:14:53 +02:00
Peter Simons bcd5dc6bac Merge pull request #8023 from thinkpad20/pure_liblapack 
added cmake flag to prevent autodetection of SDK directory
 2015-05-28 21:44:07 +02:00
Allen Nelson 2c125cf37a removed default dependency of liblapack on ATLAS. was causing an unnecessary double-build of atlas 2015-05-28 12:39:49 -05:00
Tobias Geerinckx-Rice 158e1cfdd0 Don't use "with licenses;" for single licences 
And don't use square brackets on such lines.
 2015-05-28 19:20:29 +02:00
Rok Garbas 8bebcd5d40 cygwin: patch boehm-gc on cygwin 2015-05-28 14:15:47 +02:00
codyopel ec8babb4fd ffmpeg: include networking support 
add networking support to the default build, required by mpv
 2015-05-28 07:39:10 -04:00
Vladimír Čunát 6cc8869f38 fltk13: fix a bug preventing use in octave 
Fixes #8007 (together with the parent commit).
 2015-05-28 13:16:02 +02:00
Vladimír Čunát adea54614d fltk13, octave: expose fltk13 config and override in octave 
Octave needs fltk with libxft, see #8007.

I'm not much familiar with composableDerivation,
so perhaps this change could be done in a better way...
 2015-05-28 13:16:02 +02:00
Vladimír Čunát 026aa123a4 speexdsp: fix integer types not being included 
Description in comments of https://aur.archlinux.org/packages/retroshare/
I'm not sure why their conditionals don't work, but this fix should be safe.

/cc maintainer @wkennington.
 2015-05-28 11:55:06 +02:00
William A. Kennington III 85932bc5a9 krb5: 1.13.1 -> 1.13.2 2015-05-28 02:20:08 -07:00
William A. Kennington III 4389ae5208 libverto: Add derivation 2015-05-28 02:20:08 -07:00
William A. Kennington III afea09936e rocksdb: 3.10 -> 3.11 2015-05-28 02:20:08 -07:00
Marko Durkovic a02799cd78 cygwin: fix ncurses 
1. Fix linking against ncurses.dll
2. Fix segfaults with threaded code
 2015-05-28 10:53:36 +02:00
Florian Friesdorf d6c4963bcb cygwin libarchive 2015-05-28 10:53:36 +02:00
U-user-PC\\user 6c7899b1f6 cygwin: popt patches 2015-05-28 10:53:36 +02:00
Florian Friesdorf d2da94cc0b cygwin: zlib - we do not --disable-shared 2015-05-28 10:53:36 +02:00
Marko Durkovic 2904aa33bb cygwin: libffi 2015-05-28 10:53:36 +02:00
Marko Durkovic e45745f1f4 cygwin: libatomic_ops: add missing interlibrary dep 2015-05-28 10:53:35 +02:00
Florian Friesdorf feef088b39 cygwin: readline bash_cv_func_sigsetjmp=missing 2015-05-28 10:53:35 +02:00
Marko Durkovic 3f6949c3ef cygwin: openssl for x86_64 2015-05-28 10:53:35 +02:00
Marko Durkovic b658196c6c cygwin: libiconv and gettext for x86_64 2015-05-28 10:53:34 +02:00
William A. Kennington III 21b2858eed Merge pull request #8019 from codyopel/openjpeg 
openjpeg: refactor, fixes #8017
 2015-05-27 23:34:21 -07:00
William A. Kennington III cf932c9b4c Merge pull request #8031 from codyopel/libclxclient 
libclxclient: reacfor & fix include directory
 2015-05-27 23:33:06 -07:00
codyopel 83fa9994e5 libclthreads: refactor 
fix include directories
fix symlink to library
 2015-05-28 01:53:23 -04:00
codyopel 2906376ddc libclxclient: reacfor & fix include directory 2015-05-28 00:26:17 -04:00
Tobias Geerinckx-Rice b2d7f4b1ba Use common licence attributes from lib/licenses.nix 
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
 2015-05-27 22:00:06 +02:00
Allen Nelson 6eb8ff878d added cmake flag to prevent autodetection of SDK directory 2015-05-27 12:42:40 -07:00
devhell 4de17c7837 Update mediainfo{-gui} and dependencies 
* mediainfo{-gui} 0.7.73 -> 0.7.74
* libmediainfo    0.7.73 -> 0.7.74

From the mediainfo ChangeLog:
```
Version 0.7.74, 2015-05-25

+ FIMS: Preliminary version (not for production)
+ D-10 audio: display of real bitrate beside the encoded bitrate
+ VC-3: detection of CDP packets (608/708 captions), created by Nexio, inside the VC-3 private data
+ AES3: generic term AES3 replaced by more precise SMPTE ST numbers (302, 331, 337)
+ NUT: basic detection
+ FFV1: more parsing of the bitstream, support of any version of FFV1 in MOV and Matroska
+ DPX: color space and frame rate
x #B906, Matroska: duration was missing if Info block is at the end of the file
x #B908, AC-3: bit depth removed
x #P86, MPEG-4: moov_trak_edts_elst Atom was ignoring version of the atom
x Dolby E: the MXF channel count value was sometimes reported instead of the real channel count
x VorbisComment: WAVEFORMATEXTENSIBLE_CHANNEL_MASK "0X" ("x" in uppercase) is accepted now
x EBUCore: TotalProgrammeDuration was wrongly filled with IdentClockStart value
x EBUCore: Source/Material moved from timecodeStart to timecodeTrack
x MPEG-4: info is missing for some streams in some specific cases
```
 2015-05-27 19:57:57 +01:00
codyopel 4587819638 openjpeg: refactor, fixes #8017 
+ Disable JPIP which requires Java
+ fix typo in nativeBuildInputs, which fixes pkgconfig
 2015-05-27 11:48:03 -04:00
Eelco Dolstra faff3a44a7 Add libpqxx 2015-05-27 13:21:50 +02:00
Tobias Geerinckx-Rice df7ccbab5d libssh: temporarily patch to fix x2goclient 
See <https://red.libssh.org/issues/194>:

  "In libssh 0.7.0, ssh_forward_listen() is present in the headers as
  a deprecated function, but it is not actually present in the code.
  This appears to have been introduced in commit 5229253f."
 2015-05-26 23:57:45 +02:00
Pascal Wittmann a6724ddd56 ccrtp: mark version 1.8 as broken (not compatible with libgcrypt >= 1.6) 
closes #7855
 2015-05-26 14:40:01 +02:00
Mateusz Kowalczyk cdb14ddafe Merge pull request #7246 from spwhitt/iniparser 
iniparser: fix Darwin by building static lib
 2015-05-26 11:08:47 +01:00
Tobias Geerinckx-Rice 7b6d9d4cff Remove arb and then-orphaned lesstif93 
Arb has been broken (and marked as such) since the removal of
GCC 4.2 in July 2014. Nothing and no-one uses it. Time to go.
 2015-05-26 11:46:41 +02:00
William A. Kennington III 308cdd483d mesa: 10.5.4 -> 10.5.6 2015-05-26 01:36:35 -07:00
Peter Simons 38bf7f94d0 webkitgtk-2.4: disable parallel building to fix race conditions 
http://hydra.cryp.to/build/888422/nixlog/9/raw
 2015-05-25 20:43:39 +02:00
Bob van der Linden 2f4dc083d5 added hwinfo 2015-05-25 14:17:46 +02:00
Domen Kožar bbc1df3092 Merge branch 'staging' 2015-05-25 11:33:05 +02:00
Edward Tjörnhammar 0e9464478d catch: add version 1.1-3 2015-05-25 10:39:13 +02:00
William A. Kennington III e7694865ca Merge pull request #7982 from iyzsong/glfw 
glfw: Update to 3.1.1 and build shared library.
 2015-05-25 00:23:19 -07:00
Sou Bunnbu 6a96c2873f Merge pull request #7968 from ts468/vaapi 
Add gstreamer-vaapi for gstreamer-1.0.
 2015-05-25 13:10:58 +08:00
宋文武 da2d1c17dc glfw: Update to 3.1.1 and build shared library. 2015-05-25 10:50:28 +08:00
Thomas Tuegel d8dab38fda Merge pull request #7899 from thinkpad20/openblas_on_osx 
added flags/switches necessary to get openblas to compile on osx
 2015-05-24 19:01:50 -05:00
Aristid Breitkreuz 75ea4778f5 switch to working libssh 0.7 download 2015-05-24 20:22:18 +00:00
Vladimír Čunát f83d12a382 Merge 'master' into staging 2015-05-24 20:39:58 +02:00
Vladimír Čunát c75590fa6f libgsf: small update 
It was needed for gnumeric update.
/cc maintainer @lovek323.
 2015-05-24 19:53:34 +02:00
Domen Kožar 50be522a51 libvterm: set platforms 2015-05-24 18:55:53 +02:00
Thomas Strobel 32126ebf25 Add gstreamer-vaapi for gstreamer-1.0. 2015-05-24 12:53:14 +02:00
William A. Kennington III 3ede091d56 ossp-uuid: Meta fixup 2015-05-23 19:07:13 -07:00
William A. Kennington III d5ca9c017c idnkit: Add derivation 2015-05-23 19:07:13 -07:00
Mateusz Kowalczyk 177d40f582 Merge branch 'agda' of https://github.com/Ericson2314/nixpkgs into agda 2015-05-23 04:15:50 +01:00
Spencer Whitt ffcea6546d gtk3: fix on Darwin 2015-05-22 20:11:09 -04:00
Spencer Whitt 3d60104a74 libepoxy: enable on Darwin 2015-05-22 20:10:53 -04:00
William A. Kennington III 5a89a87cc5 ncurses: Always symlink to a real .so and add symlinks for major versions 2015-05-22 15:31:53 -07:00
William A. Kennington III 2ebe0fc88b gtk3: Mark as linux only temporarily 2015-05-22 14:20:29 -07:00
William A. Kennington III 3117e0c897 Refactor mkFlag out of old packages 2015-05-22 13:54:52 -07:00
William A. Kennington III 25a148fa19 Refactor mkFlag / shouldUsePkg into the nixpkgs libraries 2015-05-22 13:26:55 -07:00
Thomas Tuegel 4115f7794b webkitgtk24x: update to webkitgtk-2.4.9, fix build 2015-05-22 11:52:50 -05:00
Tobias Geerinckx-Rice 5d5044b2ec Use mirror:// URIs for ftp.debian.org 
Provide a more robust experience for users with horrible network
hardware (me).
 2015-05-22 10:39:27 +02:00
William A. Kennington III 904fa36ac5 Merge pull request #7917 from codyopel/x265 
x265: 1.6 -> 1.7
 2015-05-21 20:17:57 -07:00
codyopel 3e06aa3aa9 libssh: fix libsodium linking 
resolves pkg-config errors for anything linking against libssh
 2015-05-21 19:13:52 -04:00
Michael Raskin 86da6fae74 Update fltk to 1.3.3; apparently it includes most of the old patch now 2015-05-21 19:48:25 +03:00
Pascal Wittmann 623f5f78da Merge pull request #7924 from DamienCassou/update-openal-1.16.0 
openal 1.7.411 -> 1.16.0
 2015-05-21 16:06:45 +02:00
Pascal Wittmann 16a745fbb9 libs3: fix meta attributes 2015-05-21 15:41:06 +02:00
Arseniy Seroka 8d10975e4d Merge pull request #7918 from codyopel/ffmpeg 
ffmpeg(-full): 2.6.2 -> 2.6.3
 2015-05-21 15:48:23 +03:00
Damien Cassou 515f88cb54 openal 1.7.411 -> 1.16.0 2015-05-21 14:08:19 +02:00
Paulus Esterhazy c4a8acd983 Add sqlite3_analyzer 2015-05-21 13:57:53 +02:00
William A. Kennington III 19c259161b qemu: 2.2.2 -> 2.3.0 2015-05-20 18:30:22 -07:00
William A. Kennington III d6c6253be0 libseccomp: 2.2.0 -> 2.2.1 2015-05-20 18:30:22 -07:00
codyopel 61fa78293d ffmpeg(-full): 2.6.2 -> 2.6.3 2015-05-20 20:45:59 -04:00
codyopel c13b94388e x265: 1.6 -> 1.7 2015-05-20 20:07:30 -04:00
John Wiegley 98ad87fb4d t1lib: Conditionalize a recent change for Darwin 2015-05-20 15:42:13 -05:00
John Ericson 52a6589559 agda: the Iowa stdlib seems to be behind a private SVN now 2015-05-20 16:01:44 +00:00
Peter Simons cf6ab47be2 oracle-instantclient: don't strip or patchelf this library 2015-05-20 16:19:11 +02:00
Thomas Tuegel 49fa221c62 Update libbluedevil to 2.1 
The bluedevil build has been failing since it was updated to
2.1.1. Bluedevil and libbluedevil must be kept at the same major version!
 2015-05-20 07:25:13 -05:00
William A. Kennington III 3b79ea5ce4 libtheora: Refactor 2015-05-20 00:26:45 -07:00
William A. Kennington III d220ea72e5 gnu-efi: 3.0b -> 3.0.2 2015-05-20 00:26:12 -07:00
William A. Kennington III 69a990f6b3 libssh: 0.6.4 -> 0.7.0 2015-05-19 23:30:51 -07:00
William A. Kennington III 9687d304fd wiredtiger: 2.5.2 -> 2.6.0 2015-05-19 21:43:48 -07:00
William A. Kennington III b835d4bade libunwind: Fix lzma propagation 2015-05-19 21:34:51 -07:00
Pascal Wittmann 6e3f909c2d Merge pull request #7884 from ip1981/mwlib 
freetds-stable.tgz has gone
 2015-05-19 21:56:01 +02:00
Pascal Wittmann 2286e2ef8f http-parser: update from 2.3 to 2.5.0 
closes #7709
 2015-05-19 21:46:12 +02:00
Thomas Tuegel b84f3e85d9 Fix QGtkStyle for Qt 5 versions 2015-05-19 11:37:21 -05:00
Paulus Esterhazy 557c1401af Add unfree Oracle instant client and SQLPlus CLI utility. 2015-05-19 11:10:11 +02:00
Allen Nelson 2a0a5c697e added clang dependency, using unix platform 2015-05-18 17:47:03 -05:00
Allen Nelson b4b6215523 added flags/switches necessary to get openblas to compile on osx 2015-05-18 17:01:43 -05:00
Nikolay Amiantov f1b51945bc ti-rpc: update package 2015-05-18 17:21:08 +03:00
Nikolay Amiantov a5fc6f702e libbluray: update, fix building, AACS and Java 2015-05-18 17:21:08 +03:00
Nikolay Amiantov 4936324273 libbdplus: add package 2015-05-18 17:21:08 +03:00
Nikolay Amiantov 8099911528 libaacs: fix building 2015-05-18 17:21:08 +03:00
Nikolay Amiantov 9867951a50 ijs: update 2015-05-18 17:21:08 +03:00
Nikolay Amiantov 2120cdec76 folly: update 2015-05-18 17:21:08 +03:00
Nikolay Amiantov c244457121 double-conversion: update 2015-05-18 17:21:08 +03:00
Igor Pashev 27aba15007 freetds-stable.tgz has gone 2015-05-18 13:39:46 +00:00
Vladimír Čunát 5b7837c0d3 libjpeg-turbo: make Hydra only build it on Linux 
I don't know what's wrong with darwin.
Anyway, it's unused on darwin by default.
 2015-05-18 13:46:09 +02:00
Luca Bruno 25f9555599 Drop GNOME 3.12 2015-05-18 12:24:08 +02:00
Benno Fünfstück 592e411c49 Merge pull request #7863 from C0DEHERO/fix/irrlicht-update 
irrlicht: update rev 3843 (1.8) -> rev 5104 (1.8)..
 2015-05-17 20:15:10 +02:00
C0DEHERO d90dd6d17b irrlicht: update rev 3843 (1.8) -> rev 5104 (1.8); fixed awkward naming; use svn release branch 2015-05-16 22:48:43 -04:00
Arseniy Seroka a546e11e45 Merge pull request #7861 from codyopel/ffmpeg-updates 
ffmpeg: update branches
 2015-05-17 03:41:10 +03:00
codyopel a35ef4e3df ffmpeg: update branches 
ffmpeg_0_10: 0.10.15 -> 0.10.16
ffmpeg_2_2: 2.2.13 -> 2.2.15
ffmpeg_2_6: 2.6.1 -> 2.6.2
ffmpeg-full: 2.6.1 -> 2.6.2
 2015-05-16 20:23:25 -04:00
Arseniy Seroka 78b2afadff Merge pull request #7811 from pmiddend/fcppt 
Add fcppt package
 2015-05-16 22:37:14 +03:00
Vladimír Čunát bc7a4fc18b webkitgtk: minor updates (close #7828) 
Builds fine, NEWS look good.
 2015-05-15 22:36:52 +02:00
Eric Seidel f93a8ee110 Merge pull request #7845 from spwhitt/misc 
Darwin: A couple fixes
 2015-05-15 09:06:00 -07:00
Spencer Whitt 5d82c67129 libdvbpsi: enable on Darwin 2015-05-15 11:58:22 -04:00
Spencer Whitt 7145859662 botan: clang fix 2015-05-15 11:58:22 -04:00
Spencer Whitt 7745dc5dcf nghttp2: fix configure script to correctly find jemalloc 2015-05-15 11:58:20 -04:00
Spencer Whitt 94362af1e8 libev: Fix compilation with clang 2015-05-15 11:58:19 -04:00
Wout Mertens ebedf814ce Merge pull request #7847 from spwhitt/libdvdnav 
libdvdnav: 4.2.1 -> 5.0.3
 2015-05-15 13:21:35 +02:00
Thomas Tuegel 111fec1ba7 Add qca-qt5 2015-05-15 05:48:32 -05:00
Thomas Tuegel c80638905d Upgrade to kde-frameworks-5.10 2015-05-15 05:48:20 -05:00
Marco Schlumpp a88c5a8037 glibc: fixed a warning caused by nix-locale-archive.patch 
If a function shouldn't accept any parameters, use "(void)" instead of "()".
Close #7843. Vcunat purged unimportant changes from this commit.
 2015-05-15 11:14:50 +02:00
Peter Simons f66cd5dbe9 aqbanking: update to version 5.5.1 2015-05-15 11:01:42 +02:00
Peter Simons 1b8a35b7fa gwenhywfar: update to version 4.11.1 2015-05-15 11:01:21 +02:00
Henry Till 229c442e2c libpsl: add darwin to meta.platforms 2015-05-15 01:40:10 -04:00
Eric Seidel be03eefc9c gnutls: only demand trousers on linux 2015-05-14 21:53:56 -07:00
Spencer Whitt 01d7d24dbb libdvdnav: 4.2.1 -> 5.0.3 
Keeping the old version around for now in order to support mplayer.
 2015-05-14 23:26:16 -04:00
Philipp Middendorf 7f2262e9a8 fcppt: initial import into nixpkgs 2015-05-14 23:54:57 +02:00
Pascal Wittmann 21c73b63b8 Turned two more meta.maintainers into lists 2015-05-14 19:15:22 +02:00
Pascal Wittmann bb9e9cc3f8 Turned some meta.maintainers into lists 2015-05-14 19:09:43 +02:00
Eric Seidel 67fe5d46d4 Merge pull request #7817 from gridaphobe/cc-wrapper-isgnu-isclang 
Add isGNU and isClang attributes to cc-wrapper
 2015-05-14 10:09:07 -07:00
lethalman 78c6fd6e68 Merge pull request #7780 from Ralith/libuv 
libuv: version 1.5.0
 2015-05-14 17:01:12 +02:00
William A. Kennington III 48534df2a4 Merge pull request #7741 from codyopel/stxxl 
stxxl: refactor
 2015-05-13 21:56:43 -07:00
William A. Kennington III 6516cc48c7 nghttp2: 0.7.13 -> 0.7.14 2015-05-13 11:32:46 -07:00
Thomas Tuegel 7094ae27da qt53: fix qtwebkit build with new glib 2015-05-13 12:49:14 -05:00
Shea Levy 7e1286bf01 jsoncpp: don't rely on coreutils cp 2015-05-12 16:28:07 -04:00
Thomas Tuegel f853661229 Merge branch 'kde5' 2015-05-12 09:49:16 -05:00
Thomas Tuegel def321e811 add grantlee-5.0.0 2015-05-12 08:51:55 -05:00
Shea Levy 82ba13111c ncurses: Fix shouldUsePkg on darwin 2015-05-12 06:26:31 -07:00
aszlig 7d1a4f9e3f
libe-book: Add missing zlib dependency. 
Since 287ec76, zlib is no longer propagated by libxml, so we need to add
it as a direct dependency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-05-12 10:45:41 +02:00
William A. Kennington III 2c9481e0fd libssh2: Fix for darwin 2015-05-11 15:18:08 -07:00
William A. Kennington III 5eda8246a4 gss: Fix on darwin 2015-05-11 15:15:04 -07:00
William A. Kennington III 0b3af3074e libgcrypt: Fix darwin build 2015-05-11 15:14:22 -07:00
Eric Seidel 662a6b1ca6 remove all references to stdenv.cc.cc.is{GNU,Clang} 
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
 2015-05-11 14:44:50 -07:00
Eric Seidel 84e1c276e6 Merge pull request #7756 from ericbmerritt/fix-osx-crypto++ 
This resolves crypto++ build problems on OSX
 2015-05-11 14:19:15 -07:00
Domen Kožar bb4d658f64 Merge branch 'master' into staging 
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
 2015-05-11 10:05:23 +02:00
William A. Kennington III df3d2010ae libinput: 0.14.1 -> 0.15.0 2015-05-10 22:35:05 -07:00