JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
274,323 Commits 2 Branches 0 Tags 13 GiB
11d964f666
Commit Graph

1785 Commits

Author SHA1 Message Date
sternenseemann
b3aed95a6e chroma: 0.8.1 -> 0.8.2 
Populate version information manually to avoid having to integrate
goreleaser into the build process.
 2020-12-22 16:20:53 +01:00
Mario Rodas
68dfd5df47 languagetool: add platforms 2020-12-20 04:20:00 +00:00
Matthias Beyer
dc8f4337d2 ugrep: 3.0.6 -> 3.1.0 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
 2020-12-19 21:02:00 +01:00
Mario Rodas
a1e783c666
Merge pull request #106331 from r-ryantm/auto-update/vale 
vale: 2.6.4 -> 2.6.5
 2020-12-08 04:01:10 -05:00
R. RyanTM
9659da62f6 vale: 2.6.4 -> 2.6.5 2020-12-08 08:38:18 +00:00
R. RyanTM
ccca330f61 ugrep: 3.0.5 -> 3.0.6 2020-12-08 08:27:12 +00:00
R. RyanTM
c18ffac4c7 pbgopy: 0.1.1 -> 0.2.0 2020-12-08 02:39:00 +00:00
Maximilian Bosch
5f8809b4ea
Merge pull request #105727 from zowoq/shfmt 
shfmt: 3.2.0 -> 3.2.1
 2020-12-02 21:42:18 +01:00
zowoq
adc4367197 shfmt: 3.2.0 -> 3.2.1 
https://github.com/mvdan/sh/releases/tag/v3.2.1
 2020-12-03 05:49:57 +10:00
IvarWithoutBones
b8ad3d4e9e pbgopy: init at 0.1.1 2020-12-02 03:47:10 +01:00
Sandro
63cf5d0c68
Merge pull request #105578 from r-ryantm/auto-update/vale 
vale: 2.6.3 -> 2.6.4
 2020-12-01 14:06:47 +01:00
Sandro
43acf1bc95
Merge pull request #105527 from r-ryantm/auto-update/miller 
miller: 5.9.1 -> 5.10.0
 2020-12-01 13:54:52 +01:00
R. RyanTM
4aa370b6b3 vale: 2.6.3 -> 2.6.4 2020-12-01 12:06:37 +00:00
R. RyanTM
93d86b89e0 miller: 5.9.1 -> 5.10.0 2020-12-01 01:48:03 +00:00
Anderson Torres
7714edc2e5
Merge pull request #105489 from AndersonTorres/update-rst2html5 
rst2html5: 1.9.4 -> 1.10.6
 2020-11-30 18:42:08 -03:00
AndersonTorres
90aacae8a5 rst2html5: 1.9.4 -> 1.10.6 2020-11-30 17:58:53 -03:00
Anderson Torres
881dee5284
Merge pull request #105411 from AndersonTorres/wip-ucg 
ucg: init at 20190225
 2020-11-30 16:55:03 -03:00
AndersonTorres
4bcdf302e1 ucg: init at 20190225 2020-11-30 16:21:41 -03:00
Frederik Rietdijk
0d8491cb2b Merge master into staging-next 2020-11-29 13:51:10 +01:00
WilliButz
037d1121a4
Merge pull request #104153 from r-ryantm/auto-update/highlight 
highlight: 3.57 -> 3.59
 2020-11-28 15:05:49 +01:00
Frederik Rietdijk
9e062723b2 Merge master into staging-next 2020-11-28 08:53:47 +01:00
Sandro
54dd8fb5bd
Merge pull request #105144 from ShamrockLee/uwc 
uwc: Init at 1.0.4
 2020-11-27 22:58:54 +01:00
Frederik Rietdijk
b2a3891e12 Merge master into staging-next 2020-11-27 15:09:19 +01:00
Shamrock Lee
58fd07cc7b uwc: Init at 1.0.4 
uwc is a Unicode-aware word counter with per-line mode written in Rust
If applied, users will be able to count the
number of unicode characters and words
(e.g. Chinese characters) from files or through the pipe.
 2020-11-27 14:07:25 +00:00
Sandro
2738d27b79
Merge pull request #105105 from r-ryantm/auto-update/vale 
vale: 2.6.2 -> 2.6.3
 2020-11-27 02:27:24 +01:00
R. RyanTM
e4591eb1a2 vale: 2.6.2 -> 2.6.3 2020-11-27 01:00:59 +00:00
R. RyanTM
a540fcdc2c amber: 0.5.5 -> 0.5.8 2020-11-25 21:37:04 +00:00
R. RyanTM
42050cff6f gnugrep: 3.5 -> 3.6 2020-11-23 22:22:31 -08:00
Sandro
9792e460ac
Merge pull request #104044 from beardhatcode/master 
languagetool: 5.0 -> 5.1
 2020-11-23 21:37:28 +01:00
Sandro
8c24e6eb99
Merge pull request #103363 from bbigras/chars 
chars: init at 0.5.0
 2020-11-23 19:18:30 +01:00
Sandro
bb2839f5fc
Merge pull request #104282 from r-ryantm/auto-update/poedit 
poedit: 2.4.1 -> 2.4.2
 2020-11-23 13:20:47 +01:00
StigP
cfb4638c8e
Merge pull request #104611 from r-ryantm/auto-update/ugrep 
ugrep: 3.0.4 -> 3.0.5
 2020-11-23 11:11:14 +01:00
Bruno Bigras
b2acf96e80 chars: init at 0.5.0 
Co-authored-by: Ivar <41924494+IvarWithoutBones@users.noreply.github.com>
Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
 2020-11-22 23:41:37 -05:00
Mario Rodas
f3bbd12c1b
Merge pull request #104612 from r-ryantm/auto-update/vale 
vale: 2.6.1 -> 2.6.2
 2020-11-22 17:05:00 -05:00
Michael Raskin
5c4a2158cb
Merge pull request #101866 from catern/groff 
groff: fix PDF manpage building with -Tpdf/gropdf
 2020-11-22 16:35:58 +00:00
R. RyanTM
ddbd25e593 vale: 2.6.1 -> 2.6.2 2020-11-22 15:12:39 +00:00
R. RyanTM
84b4bd65d7 ugrep: 3.0.4 -> 3.0.5 2020-11-22 14:57:37 +00:00
Frederik Rietdijk
1ffd7cf0d6 Merge master into staging-next 2020-11-21 08:43:10 +01:00
freezeboy
d1259ed363 kdiff3: migrate to Qt5.15 
fix homepage
 2020-11-20 22:24:22 +01:00
Frederik Rietdijk
ea7b8978ef Merge master into staging-next 2020-11-19 20:08:15 +01:00
R. RyanTM
3340d4f057 poedit: 2.4.1 -> 2.4.2 2020-11-19 14:22:47 +00:00
Jörg Thalheim
8313dacb11 treewide: remove trailing whitespace 2020-11-18 22:37:56 -08:00
Jörg Thalheim
72f6df338d remove genesis maintainer 
genesis has no longer access to github
 2020-11-18 22:37:56 -08:00
R. RyanTM
62f4f22998 recode: 3.7.7 -> 3.7.8 2020-11-18 15:43:08 +01:00
R. RyanTM
c132add6ce highlight: 3.57 -> 3.59 2020-11-18 09:57:19 +00:00
Ryan Mulligan
3f46f9c011
Merge pull request #103550 from r-ryantm/auto-update/snippetpixie 
snippetpixie: 1.4.1 -> 1.5.0
 2020-11-17 13:34:42 -08:00
Robbert Gurdeep Singh
b4b17543c3 languagetool: 5.0 -> 5.1 2020-11-17 12:38:59 +01:00
Oleksii Filonenko
512c3c0a05 maintainers: rename filalex77 -> Br1ght0ne 2020-11-17 13:09:31 +02:00
zowoq
cf30b008c9 vgrep: 2.5.0 -> 2.5.1 
https://github.com/vrothberg/vgrep/releases/tag/v2.5.1
 2020-11-13 20:37:06 +10:00
Ryan Mulligan
25f45a5226
Merge pull request #103578 from r-ryantm/auto-update/ugrep 
ugrep: 2.5.5 -> 3.0.4
 2020-11-12 06:42:46 -08:00
Mario Rodas
db11a42e7b
Merge pull request #103580 from r-ryantm/auto-update/vale 
vale: 2.5.0 -> 2.6.1
 2020-11-12 08:10:10 -05:00
R. RyanTM
bea630e606 vale: 2.5.0 -> 2.6.1 2020-11-12 09:57:10 +00:00
R. RyanTM
0d4ac47717 ugrep: 2.5.5 -> 3.0.4 2020-11-12 09:41:50 +00:00
Jonathan Ringer
28bc8eadd1 ocrmypdf: 11.0.1 -> 11.3.3, fix build 2020-11-11 23:11:41 -08:00
R. RyanTM
15e82d1957 snippetpixie: 1.4.1 -> 1.5.0 2020-11-12 04:06:10 +00:00
Marek Mahut
e39bc29e1e
asciigraph: init at 0.5.1 (#103184) 2020-11-11 23:48:05 +10:00
R. RyanTM
84874697af amber: 0.5.4 -> 0.5.5 2020-11-10 21:11:39 +00:00
Frederik Rietdijk
470f05cb5d Merge staging-next into staging 2020-11-03 12:06:41 +01:00
Kevin Cox
ba84f8b1ba
Merge pull request #101503 from bbigras/angle-grinder 
angle-grinder: init at 0.15.0
 2020-11-02 08:12:04 -05:00
Pavol Rusnak
2c931312ce treewide: simplify rev/repo arguments in src 
+ use fetchFromGithub where possible
 2020-11-01 23:02:24 -08:00
Alyssa Ross
7bf3d77ed6 groff: set "operating system" for mdoc pages 
Prior to this change, man pages from Nixpkgs written using the mdoc(7)
macros would start like this:

    NC(1)                   BSD General Commands Manual                   NC(1)

and end like this:

    BSD                          December 27, 2018                          BSD

No matter what operating system they were run on.

It's far more accurate to say "Nixpkgs General Commands Manual", so
with this patch we configure groff to do just that.  The variable is
called "operating-system", but I think it makes more sense to say
"Nixpkgs" than "NixOS" or something, because packages from Nixpkgs can
run on lots of operating systems, and the important thing is that the
package is from Nixpkgs.
 2020-11-01 10:58:48 +01:00
Frederik Rietdijk
83dde6c52c Merge staging-next into staging 2020-11-01 10:11:12 +01:00
zowoq
f28c4a120f vgrep: 2.4.0 -> 2.5.0 
https://github.com/vrothberg/vgrep/releases/tag/v2.5.0
 2020-10-31 22:00:22 +10:00
zowoq
1e20b2dce4 shfmt: install man page 2020-10-31 09:59:37 +10:00
Sandro Jäckel
703010347f shfmt: 3.1.2 -> 3.2.0 2020-10-31 09:59:37 +10:00
pablo1107
c268484e05 ledger2beancount: init at 2.1 2020-10-30 14:58:29 -03:00
Andreas Rammhold
db0fe5c3eb
Merge branch master into staging to fix eval error 
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
 2020-10-28 03:03:27 +01:00
Vladyslav M
2fdf0313dd
Merge pull request #101686 from r-ryantm/auto-update/mdbook 
mdbook: 0.4.3 -> 0.4.4
 2020-10-27 22:18:51 +02:00
Spencer Baugh
3f92a7e123 groff: fix PDF manpage building with -Tpdf/gropdf 
These files are pure data, just fonts; they shouldn't have been moved
to the "perl" output, because the Perl programs (namely, gropdf) use
them from the main "out" output.

These files don't contain any references to more dependencies (Perl or
otherwise), so they don't bloat the closure. And the files themselves
are small; 276K total as of this commit.
 2020-10-27 14:59:28 -04:00
Ben Siraphob
db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
R. RyanTM
eace2d6848 mdbook: 0.4.3 -> 0.4.4 2020-10-25 20:44:45 +00:00
Vladimír Čunát
2f6b00b15e
Merge branch 'staging-next' into staging 2020-10-25 09:47:04 +01:00
Bjørn Forsman
7ad5e816fa basex: fix build 
An unmatched double quote in installPhase broke the build in the last update.
Fix it.

Reported by @solson (thanks!).

Fixes: 21b9c04a2c ("basex: 8.6.6 -> 9.4.3")
 2020-10-25 08:12:25 +01:00
Mario Rodas
75b702555c vale: 2.4.3 -> 2.5.0 2020-10-25 04:20:00 +00:00
R. RyanTM
6d3efc39fa dos2unix: 7.4.1 -> 7.4.2 2020-10-24 14:27:14 +00:00
WORLDofPEACE
cb2786380a
gtranslator: 3.36.0 -> 3.38.0 2020-10-24 01:16:59 +02:00
Bruno Bigras
b622f7fe80 angle-grinder: init at 0.15.0 2020-10-23 18:03:40 -04:00
David Wood
68f49681b6
mdcat: 0.21.1 -> 0.22.1 2020-10-19 13:51:55 +01:00
Mario Rodas
7b2040b163
Merge pull request #100925 from r-ryantm/auto-update/fastmod 
fastmod: 0.4.0 -> 0.4.1
 2020-10-18 08:51:20 -05:00
R. RyanTM
bc0934be31 fastmod: 0.4.0 -> 0.4.1 2020-10-18 04:40:20 +00:00
Mario Rodas
74bdceca07 vale: 2.3.4 -> 2.4.3 2020-10-17 04:20:00 +00:00
Ben Siraphob
683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
Frederik Rietdijk
b981eca057 Merge master into staging-next 2020-10-14 11:32:49 +02:00
Frederik Rietdijk
9e1943edc0 Merge master into staging-next 2020-10-13 19:34:34 +02:00
Masanori Ogino
5a18f69bf6 ansifilter: 2.16 -> 2.17 
`nix-shell -p nixpkgs-review --run "nixpkgs-review wip"` succeeded on
non-NixOS x86_64-linux.

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
 2020-10-14 01:34:16 +09:00
Mario Rodas
610a11f361 csvkit: add setuptools to runtime dependencies 
fixes https://github.com/NixOS/nixpkgs/issues/93594
 2020-10-10 04:20:00 +00:00
Frederik Rietdijk
ec28e32c9e Merge master into staging-next 2020-10-08 21:47:26 +02:00
Michiel Leenaars
21b9c04a2c basex: 8.6.6 -> 9.4.3 2020-10-08 19:56:19 +02:00
hloeffler
90e603fcec rgxg: init at 0.1.2 
Co-authored-by: Doron Behar <doron.behar@gmail.com>
Co-authored-by: Anderson Torres <torres.anderson.85@protonmail.com>
 2020-10-07 18:44:13 +02:00
Frederik Rietdijk
692d219a93 Merge staging-next into staging 2020-10-06 10:25:58 +02:00
Lancelot SIX
c604bac07d gnugrep: 3.4 -> 3.5 
See https://lists.gnu.org/archive/html/info-gnu/2020-09/msg00009.html
for release announcement
 2020-10-06 09:56:25 +02:00
Doron Behar
c4bc8f2cc4
Merge pull request #98744 from sternenseemann/chroma-0.8.1 
chroma: 0.8.0 → 0.8.1
 2020-09-26 18:45:29 +03:00
sternenseemann
e9f6ff878a chroma: 0.8.0 → 0.8.1 2020-09-25 14:14:56 +02:00
R. RyanTM
11f5d344b9 discount: 2.2.6 -> 2.2.7 2020-09-23 20:36:59 -07:00
R. RyanTM
f6be4babd7 kdiff3: 1.8.3 -> 1.8.4 2020-09-23 20:16:16 -07:00
zowoq
1399f780bb ripgrep: remove unnecessary reference to $src 2020-09-22 12:33:35 +10:00
Doron Behar
8bf99f6787 csvkit: fix tests 
Remove unneeded glibcLocales. Remove overrided agate-sql and agate-dbf,
as these overrides are not needed. Use pytestCheckHook instead of
overriding checkPhase. Add an upstream patch that fixes tests.
 2020-09-20 08:29:18 -07:00
Doron Behar
eb9393a4db csvkit: 1.0.4 -> 1.0.5 2020-09-20 08:29:18 -07:00
Wael Nasreddine
c80258af16
gist: 5.1.0 -> 6.0.0 (#98053) 2020-09-15 22:41:47 +00:00
Stig P
a7e314487e
Merge pull request #95361 from sternenseemann/chroma-0.8.0 
chroma: init at 0.8.0
 2020-09-12 13:13:09 +00:00
sohalt
8382b690af choose: init at 1.3.1 2020-09-12 00:36:16 +02:00
Christian Kampka
cbfc33a9ce
source-highlight: Skip building docs when cross-compiling 
source-highlight uses it's own binary to generate documentation.
During cross-compilation, that binary was built for the target
platform architecture, so it can't run on the build host.
 2020-09-06 16:24:08 +02:00
R. RyanTM
79628a88b8 podiff: 1.1 -> 1.2 2020-08-27 07:28:12 +00:00
R. RyanTM
46184ba62f poedit: 2.3.1 -> 2.4.1 2020-08-26 08:51:01 +02:00
Mario Rodas
7118d7773a
Merge pull request #96200 from r-ryantm/auto-update/ugrep 
ugrep: 2.5.1 -> 2.5.3
 2020-08-24 18:30:28 -05:00
R. RyanTM
7c5ecbcde9 vale: 2.3.2 -> 2.3.3 2020-08-24 19:00:32 +00:00
R. RyanTM
a22da2e043 ugrep: 2.5.1 -> 2.5.3 2020-08-24 18:53:30 +00:00
R. RyanTM
9a7318af21 miller: 5.8.0 -> 5.9.0 2020-08-23 06:47:12 +00:00
zowoq
d559c776a1 shfmt: fix failing test on go 1.15 2020-08-21 16:40:30 +10:00
zowoq
473536e3b5 buildRustPackage: remove platform.all from packages 2020-08-16 12:48:18 +10:00
zowoq
a83a88db05 buildGoPackage: remove platform.all from packages 2020-08-15 19:34:47 -07:00
Alvar Penning
0a53c6b565 maintainers: rename geistesk to oxzi 
For reasons I have renamed my GitHub account and would like to include
this name change here.
 2020-08-15 16:03:46 +02:00
sternenseemann
1f6d8426fd chroma: init at 0.8.0 2020-08-15 00:56:12 +02:00
Daniël de Kok
b7295bdf40
Merge pull request #95397 from r-ryantm/auto-update/html-xml-utils 
html-xml-utils: 7.8 -> 7.9
 2020-08-14 08:25:29 +02:00
R. RyanTM
551147ab22 html-xml-utils: 7.8 -> 7.9 2020-08-14 03:47:36 +00:00
Mario Rodas
3a96f14ee7
Merge pull request #95328 from marsam/update-vale 
vale: 2.3.0 -> 2.3.2
 2020-08-13 18:15:20 -05:00
Mario Rodas
0424be4d5e
Merge pull request #95292 from r-ryantm/auto-update/aha 
aha: 0.5 -> 0.5.1
 2020-08-13 08:52:01 -05:00
Mario Rodas
82f62b2247
vale: 2.3.0 -> 2.3.2 2020-08-13 04:20:00 +00:00
Mario Rodas
79ae3e24df
aha: enable on darwin 2020-08-13 04:20:00 +00:00
R. RyanTM
843dd42b9e aha: 0.5 -> 0.5.1 2020-08-13 00:17:27 +00:00
Mario Rodas
82a6c9c4c3
Merge pull request #95285 from r-ryantm/auto-update/ugrep 
ugrep: 2.5.0 -> 2.5.1
 2020-08-12 18:32:46 -05:00
R. RyanTM
d89dc0ac2c ugrep: 2.5.0 -> 2.5.1 2020-08-12 22:13:07 +00:00
Daniël de Kok
edd758839c
Merge pull request #95257 from r-ryantm/auto-update/mdbook 
mdbook: 0.4.1 -> 0.4.2
 2020-08-12 19:58:13 +02:00
R. RyanTM
a7e63f2eee mdbook: 0.4.1 -> 0.4.2 2020-08-12 14:06:51 +00:00
Daniël de Kok
f956bde431
Merge pull request #95147 from r-ryantm/auto-update/miller 
miller: 5.7.0 -> 5.8.0
 2020-08-11 17:11:34 +02:00
Frederik Rietdijk
f707715136 Merge master into staging-next 2020-08-11 10:26:35 +02:00
R. RyanTM
1126ae66eb miller: 5.7.0 -> 5.8.0 2020-08-11 07:27:59 +00:00
zowoq
264475ce5b buildGoModule packages: remove doCheck = true 2020-08-10 16:02:36 +10:00
zowoq
cea7cd902e buildGoModule packages: set doCheck = false 2020-08-10 16:02:30 +10:00
Mario Rodas
8659095cad
vale: 2.2.2 -> 2.3.0 
https://github.com/errata-ai/vale/releases/tag/v2.3.0
 2020-08-07 20:35:33 -05:00
Frederik Rietdijk
834e04c474 Merge master into staging-next 2020-08-05 12:06:07 +02:00
Jörg Thalheim
8e2b14aceb
Merge pull request #93634 from sikmir/hyx 2020-08-05 09:17:35 +01:00
R. RyanTM
1d1539135a recode: 3.7.6 -> 3.7.7 2020-08-04 21:59:25 +02:00
Frederik Rietdijk
26c481b435 Merge master into staging-next 2020-08-04 12:48:50 +02:00
Frederik Rietdijk
50c060d13d Merge master into staging-next 2020-08-01 19:37:20 +02:00
Maximilian Bosch
73ce9c2709
Merge pull request #94335 from r-ryantm/auto-update/ugrep 
ugrep: 2.4.1 -> 2.5.0
 2020-07-31 20:19:17 +02:00
R. RyanTM
897efe18e9 ugrep: 2.4.1 -> 2.5.0 2020-07-31 12:46:30 +00:00
Matthew Bauer
d0677e6d45 treewide: add warning comment to “boot” packages 
This adds a warning to the top of each “boot” package that reads:

  Note: this package is used for bootstrapping fetchurl, and thus cannot
  use fetchpatch! All mutable patches (generated by GitHub or cgit) that
  are needed here should be included directly in Nixpkgs as files.

This makes it clear to maintainer that they may need to treat this
package a little differently than others. Importantly, we can’t use
fetchpatch here due to using <nix/fetchurl.nix>. To avoid having stale
hashes, we need to include patches that are subject to changing
overtime (for instance, gitweb’s patches contain a version number at
the bottom).
 2020-07-31 08:56:53 +02:00
zowoq
3c5750d1cd buildGoModule packages: editorconfig fixes 2020-07-31 13:58:04 +10:00
Daniël de Kok
a624ce3e32
Merge pull request #93649 from sikmir/glogg 
glogg: enable on darwin
 2020-07-30 09:33:06 +02:00
worldofpeace
d12c11e30c treewide: use nix-update updateScript for packages I maintain 2020-07-29 12:33:39 -04:00
Sebastien Bariteau
9ab83c6eed
ugrep: init at 2.4.1 (#93296) 2020-07-25 11:16:21 +10:00
zowoq
87e5155596 shfmt: run checks 2020-07-24 22:12:37 +10:00
Pascal Bach
29c1e061be ocrmypdf: 10.2.0 -> 10.3.0 
Add patch to make it compatible with pdfminer 20200720
Submitted upstream as https://github.com/jbarlow83/OCRmyPDF/pull/596
 2020-07-23 21:49:22 +02:00
Nikolay Korotkiy
6da3a7a658
glogg: enable on darwin 2020-07-23 01:52:37 +03:00
Nikolay Korotkiy
f585a26878
hyx: enable on darwin 2020-07-22 13:10:08 +03:00
Nikolay Korotkiy
fe6c0ff6b2
hyx: 0.1.5 -> 2020-06-09 2020-07-22 13:09:03 +03:00
R. RyanTM
9b4ab6696e fanficfare: 3.19.0 -> 3.21.0 2020-07-17 02:37:06 +00:00
Pascal Bach
8076db33e9 ocrmypdf: 9.8.2 -> 10.2.0 2020-07-11 21:09:57 +02:00
Peter Hoeg
3d1b7c9dca
Merge pull request #92224 from r-ryantm/auto-update/kdiff3 
kdiff3: 1.8.2 -> 1.8.3
 2020-07-06 19:19:30 +08:00