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

244 Commits

Author SHA1 Message Date
Benjamin Hipple
a709184ba3 polkadot: upgrade cargoSha256 and add maintainer note 
While the package is broken and does not build, we can still recompute the
cargoSha256. I attempted to upgrade to the latest release, but that doesn't
build either.
 2020-03-09 00:02:24 -04:00
Benjamin Hipple
bd1b24b5b1 zcash: 2.1.0-1 -> 2.1.1-1 
Also enabled parallel building, because otherwise this takes 45+ minutes to
compile! With it enabled, it can build in a couple minutes.
 2020-03-07 12:24:19 -05:00
Benjamin Hipple
176d90e0c8 librustzcash: 2018-10-27 -> 0.1.0 
Also includes updates for:

- https://github.com/NixOS/nixpkgs/issues/79975
- https://github.com/NixOS/rfcs/pull/45
 2020-03-07 12:21:22 -05:00
R. RyanTM
3aa3291b20 bitcoin-abc: 0.20.12 -> 0.21.1 2020-03-05 15:42:22 -08:00
Mario Rodas
7b56996d61
Merge pull request #80160 from bhipple/u/parity 
parity: 2.5.11 -> 2.7.2
 2020-02-27 07:33:39 -05:00
Benjamin Hipple
991276361b parity: 2.5.11 -> 2.7.2 
Per comment in the upstream release notes, the `beta` track is no longer
maintained, and parity only has `stable` releases, so this deletes the beta
expression entirely.
https://github.com/paritytech/parity-ethereum/releases

This also updates to the new fetchCargoTarball implementation as part of #79975
 2020-02-19 18:28:05 -05:00
R. RyanTM
3f3ead76fd clightning: 0.8.0 -> 0.8.1 2020-02-19 03:34:52 +00:00
Jonas Nick
1a492b64cf
lnd 0.8.1 -> lnd 0.9.0 2020-02-16 18:09:33 +00:00
Jonathan Ringer
0fb2de1a8f ethabi: 7.0.0 -> 11.0.0 2020-02-15 13:13:48 -08:00
Benjamin Hipple
eb11feaa0b treewide: change fetchCargoTarball default to opt-out 
Changes the default fetcher in the Rust Platform to be the newer
`fetchCargoTarball`, and changes every application using the current default to
instead opt out.

This commit does not change any hashes or cause any rebuilds. Once integrated,
we will start deleting the opt-outs and recomputing hashes.

See #79975 for details.
 2020-02-13 22:41:37 -08:00
Marek Mahut
38d84665d8 exodus: 19.5.24 -> 20.1.30 2020-02-10 16:27:20 +01:00
Marek Mahut
0dfcfe13d4 exodus: adding at-spi2-core dependency 2020-02-10 16:26:02 +01:00
Marek Mahut
ff06678927 exodus: adding exodus alias 2020-02-10 16:25:30 +01:00
Marek Mahut
d6474081d0 exodus: reformating 2020-02-10 16:24:59 +01:00
Ryan Mulligan
833438c0d4
Merge pull request #79341 from r-ryantm/auto-update/pivx 
pivx: 4.0.0 -> 4.0.2
 2020-02-07 06:33:21 -08:00
R. RyanTM
781ba5f339 bitcoin-abc: 0.20.9 -> 0.20.12 2020-02-07 12:23:33 +01:00
R. RyanTM
475c652f7a pivx: 4.0.0 -> 4.0.2 2020-02-06 13:00:56 +00:00
xrelkd
540818a692 go-ethereum: 1.9.9 -> 1.9.10 2020-01-30 17:49:04 +08:00
Marek Mahut
8d4dba08a2
Merge pull request #78282 from mmahut/btg 
bitcoin-gold: init at 0.15.2
 2020-01-28 11:15:13 +01:00
Marek Mahut
3acc5b4189
Merge pull request #78595 from mmahut/litecoin 
litecoin: move to qt5 and add zeromq supoort
 2020-01-28 11:14:49 +01:00
Silvan Mosberger
80a2740991
Merge pull request #78265 from Synthetica9/https-homepages 
treewide: fix redirected urls
 2020-01-27 15:00:53 +01:00
Franz Pletz
ec1c46e2e5
Merge pull request #78499 from r-ryantm/auto-update/dero 
dero: 0.11.6 -> 0.11.7
 2020-01-27 10:44:49 +00:00
Marek Mahut
910c73e062 litecoin: add zmq support 2020-01-27 10:22:31 +01:00
Marek Mahut
3baa12f286 litecoin: support qt5 2020-01-27 10:20:28 +01:00
Jaka Hudoklin
73a59af35b
Merge pull request #78513 from r-ryantm/auto-update/litecoind 
litecoind: 0.16.3 -> 0.17.1
 2020-01-26 11:14:28 +03:00
R. RyanTM
26183d0833 litecoind: 0.16.3 -> 0.17.1 2020-01-26 07:34:20 +00:00
R. RyanTM
a927ceff4c dero: 0.11.6 -> 0.11.7 2020-01-26 03:51:22 +00:00
Mario Rodas
d47671b9f6
bitcoin: fix build on darwin 2020-01-25 00:00:00 -05:00
Marek Mahut
85dc47b441
Merge pull request #78156 from mmahut/vertcoin 
vertcoin: init at 0.14.0
 2020-01-24 23:36:02 +01:00
Marek Mahut
bce6129a71 bitcoin-gold: init at 0.15.2 2020-01-22 14:36:21 +01:00
Patrick Hilhorst
593e11fd94
treewide: fix redirected urls 
According to https://repology.org/repository/nix_unstable/problems, we have a
lot of packages that have http links that redirect to https as their homepage.
This commit updates all these packages to use the https links as their
homepage.

The following script was used to make these updates:

```

curl https://repology.org/api/v1/repository/nix_unstable/problems \
    | jq '.[] | .problem' -r \
    | rg 'Homepage link "(.+)" is a permanent redirect to "(.+)" and should be updated' --replace 's@$1@$2@' \
    | sort | uniq > script.sed

find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```
 2020-01-22 11:26:22 +01:00
Marek Mahut
d43fb5a39d digibyte: init at 7.17.2 2020-01-21 13:36:31 +01:00
Marek Mahut
099a5aecd3 vertcoin: init at 0.14.0 2020-01-21 13:36:07 +01:00
nyanloutre
61fd512651 wasabiwallet: use dotnet runtime instead of sdk 2020-01-19 14:30:39 -08:00
Marek Mahut
dcd6e6c94a ledger-live-desktop: 1.19.2 -> 1.20.0 2020-01-08 18:10:26 +01:00
R. RyanTM
e3f9951ac1 bitcoin-abc: 0.20.8 -> 0.20.9 2020-01-06 20:14:53 +01:00
wucke13
4be14c94b2 pivx: 3.4.0 -> 4.0.0 2020-01-04 11:49:32 +00:00
Franz Pletz
77b6c3cd06
Merge remote-tracking branch 'origin/master' into gcc-9 2019-12-26 14:17:36 +01:00
nyanloutre
c953481ea7
ledger-live-desktop: 1.18.2 -> 1.19.2 2019-12-22 12:22:27 +01:00
Mario Rodas
bf3c173595
Merge pull request #76067 from jonasnick/lightning-0.8.0 
clightning: 0.7.3 -> 0.8.0
 2019-12-20 22:57:48 -05:00
Alyssa Ross
7887a81193
treewide: fix cargoSha256 (again) 
cargo-vendor output was changed in a4fc84de44.
 2019-12-20 20:08:53 +00:00
lassulus
cdcb4ba4b0 bitcoin-abc: 0.20.7 -> 0.20.8 2019-12-20 08:06:42 +01:00
Jonas Nick
b03ab5054a
clightning: 0.7.3 -> 0.8.0 2019-12-19 20:31:51 +00:00
Jaka Hudoklin
ad9b68ca04
bitcoin: install desktop file and pixmaps 2019-12-13 09:35:36 +00:00
Jaakko Luttinen
5f07c64bc3 monero: 0.15.0.0 -> 0.15.0.1 2019-12-09 18:56:27 +01:00
R. RyanTM
939d1c3a43 bitcoin-unlimited: 1.6.0.1 -> 1.7.0.0 2019-12-08 23:35:13 +01:00
Jaakko Luttinen
ef4ce9ec9a
nano-wallet: 19.0 -> 20.0 2019-12-08 15:41:20 +02:00
Mario Rodas
5ab4e70ad0
Merge pull request #75098 from xrelkd/update/parity 
parity: 2.5.10 -> 2.5.11, parity-beta: 2.6.5 -> 2.6.6
 2019-12-07 02:48:37 -05:00
xrelkd
0feb96c5c2 parity-beta: 2.6.5 -> 2.6.6 2019-12-06 20:54:08 +08:00
xrelkd
54a5c37f24 parity: 2.5.10 -> 2.5.11 2019-12-06 20:53:51 +08:00
xrelkd
1b16f902e2 go-ethereum: 1.9.8 -> 1.9.9 2019-12-06 20:45:00 +08:00
Russell O'Connor
e503d20e19 bitcoin: 0.18.1 -> 0.19.0.1 
protobuf is not longer a dependency of bitcoin.
 2019-12-04 00:38:34 +01:00
lassulus
d3f928282c bitcoin-abc: 0.20.6 -> 0.20.7 2019-12-03 20:59:28 +01:00
Ryan Mulligan
f68abbb1c9
Merge pull request #74491 from r-ryantm/auto-update/monero-gui 
monero-gui: 0.15.0.0 -> 0.15.0.1
 2019-11-28 09:51:53 -08:00
R. RyanTM
7c0fcf837a monero-gui: 0.15.0.0 -> 0.15.0.1 2019-11-28 05:37:24 -08:00
Robin Gloster
63688d9ce3
Merge pull request #74095 from r-ryantm/auto-update/bitcoin-abc 
bitcoin-abc: 0.20.5 -> 0.20.6
 2019-11-27 18:27:06 +01:00
xrelkd
1e042e9338 go-ethereum: 1.9.7 -> 1.9.8 2019-11-27 08:52:01 +08:00
Alexey Shmalko
3921287742
Merge pull request #74201 from r-ryantm/auto-update/dogecoind 
dogecoind: 1.14.1 -> 1.14.2
 2019-11-26 23:16:54 +02:00
Thomas Kerber
4f3e74a7a2 zcash: 1.0.13 -> 2.1.0-1 2019-11-26 00:01:37 +01:00
R. RyanTM
d83c53e2b1 dogecoind: 1.14.1 -> 1.14.2 2019-11-25 13:00:47 -08:00
R. RyanTM
2e708a948b bitcoin-abc: 0.20.5 -> 0.20.6 2019-11-24 22:17:33 -08:00
xrelkd
e492d0e9c6 parity-beta: 2.6.4 -> 2.6.5 2019-11-22 23:57:49 +08:00
xrelkd
52399e43b2 parity: 2.5.9 -> 2.5.10 2019-11-22 23:57:48 +08:00
Jonas Nick
c4090b6edf
lnd: 0.7.1 -> 0.8.1 2019-11-17 15:35:51 +00:00
Henrik Jonsson
ce987860f6
wasabiwallet: 1.1.9 -> 1.1.9.2 2019-11-16 17:48:34 -08:00
nyanloutre
25dbbd2f81 ledger-live-desktop: 1.15.0 -> 1.18.2 2019-11-16 10:54:07 +01:00
fuwa
2bb10a525d wownero: 0.6.1.2 -> 0.7.0 2019-11-13 00:26:34 -08:00
rnhmjoj
c2402b1d13
monero-gui: 0.14.1.2 -> 0.15.0.0 2019-11-10 15:46:49 +01:00
rnhmjoj
039d299810
monero: add missing deps 2019-11-10 15:45:01 +01:00
Pavol Rusnak
6cc03f3418
monero: 0.14.1.0 -> 0.15.0.0 2019-11-10 14:49:51 +01:00
xrelkd
3ab5272eb1 go-ethereum: 1.9.6 -> 1.9.7 2019-11-08 09:39:53 +08:00
Eelco Dolstra
aa98348f88
jormungandr: Remove 
This is a good example of a package/module that should be distributed
externally (e.g. as a flake [1]): it's not stable yet so anybody who
seriously wants to use it will want to use the upstream repo. Also,
it's highly specialized so NixOS is not really the right place at the
moment (every NixOS module slows down NixOS evaluation for everybody).

[1] https://github.com/edolstra/jormungandr/tree/flake
 2019-11-05 15:00:58 +01:00
Franz Pletz
e1d4b37f49
monero-gui: fix build with gcc9 2019-11-03 14:43:36 +01:00
Franz Pletz
938d0a0d6c
aeon: 0.12.9.0 -> 0.13.0.0 2019-11-03 14:26:32 +01:00
Marek Mahut
7273a1614f jormungandr: 0.7.0-rc3 -> 0.7.0-rc4 2019-11-01 23:42:02 +01:00
R. RyanTM
5a4021bece bitcoin-abc: 0.20.3 -> 0.20.5 2019-11-01 06:49:10 -07:00
Marek Mahut
07a8c77142 jormungandr: 0.7.0-rc2 -> 0.7.0-rc3 2019-10-31 13:07:17 +01:00
Marek Mahut
e32c67a23f jormungandr: 0.7.0-rc1 -> 0.7.0-rc2 2019-10-29 22:23:46 +01:00
Jonas Nick
9aea511afe clightning: 0.7.2.1 -> 0.7.3 2019-10-29 13:50:48 -07:00
Pavol Rusnak
afd38ea1ee
stop using hardeningDisable = [ "fortify" ]; for Go packages 
it seems that the issue #25959 is not present anymore
 2019-10-27 14:44:26 +01:00
Marek Mahut
8d8ea13a20 jormungandr: 0.7.0-alpha.dev.1 -> 0.7.0-rc1 2019-10-24 15:15:41 +02:00
Marek Mahut
d8c6588581 jormungandr: 0.6.5 -> 0.7.0-alpha.dev.1 2019-10-23 21:42:15 +02:00
Marek Mahut
b7594c2a86
Merge pull request #71440 from r-ryantm/auto-update/bitcoin-abc 
bitcoin-abc: 0.20.2 -> 0.20.3
 2019-10-20 17:41:35 +02:00
R. RyanTM
add1b8c863 bitcoin-abc: 0.20.2 -> 0.20.3 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bitcoin-abc/versions
 2019-10-20 06:54:32 -07:00
Marek Mahut
f2b29c1b54 jormungandr: 0.6.1 -> 0.6.5 2019-10-19 15:02:55 +02:00
Marek Mahut
75cbbea4b9 jormungandr: 0.6.0 -> 0.6.1 2019-10-15 16:52:07 +02:00
Marek Mahut
39fe98ed0a jormungandr: 0.6.0-rc1+1 -> 0.6.0 2019-10-15 08:56:25 +02:00
Marek Mahut
b7b7ed9d59
Merge pull request #71121 from mmahut/jormungandr 
jormungandr: 0.5.6 -> 0.6.0-rc1+1
 2019-10-14 15:19:22 +02:00
Marek Mahut
da4a06499d jormungandr: 0.5.6 -> 0.6.0-rc1+1 2019-10-14 14:29:03 +02:00
adisbladis
e9aa14c025
Merge pull request #70908 from xrelkd/update/go-ethereum 
go-ethereum: 1.9.5 -> 1.9.6
 2019-10-12 17:46:48 +01:00
wucke13
e9cd8a2d60 pivx: 3.2.0 -> 3.4.0 
* pivx: 3.2.0 -> 3.2.2

* altcoins.pivx: 3.2.2 -> 3.3.0

Furthermore, this fixes 2542928

* pivx: 3.3.0 -> 3.4.0

Added `test_pivx` as test ran by nixpkgs

* Update pkgs/applications/blockchains/pivx.nix

Thanks to @lassulus for fixing this typo!

Co-Authored-By: Lassulus <github@lassul.us>
 2019-10-12 11:13:35 +02:00
xrelkd
a2c9fc430c go-ethereum: 1.9.5 -> 1.9.6 2019-10-10 19:54:46 +08:00
Marek Mahut
bfa72ae587 jormungandr: 0.5.5 -> 0.5.6 2019-10-09 11:25:30 +02:00
Linus Heckemann
5aa4b19946 treewide: mark some broken packages as broken 
Refs:
e6754980264fe927320d5ff2dbd24ca4fac9a160
1e9cc5b9844ef603fe160e9f671178f96200774f
793a2fe1e8bb886ca2096c5904e1193dc3268b6d
c19cf65261639f749012454932a532aa7c681e4b
f6544d618f30fae0bc4798c4387a8c7c9c047a7c
 2019-10-08 17:14:26 +02:00
Matthew Bauer
47f384e238
Merge pull request #70265 from nyanloutre/ledger_live_icon_fix 
ledger-live-desktop: add smaller desktop icon
 2019-10-02 15:45:10 -04:00
nyanloutre
902de7a412
ledger-live-desktop: add smaller desktop icon 
Original 1024x1024 icon doesn't show properly in KDE
 2019-10-02 21:19:52 +02:00
Marek Mahut
f5ab71b864 jormungandr: 0.5.4 -> 0.5.5 2019-10-02 13:13:44 +02:00
Marek Mahut
a5bd569344
Merge pull request #70141 from mmahut/jormungandr 
jormungandr: 0.5.2 -> 0.5.4
 2019-10-01 10:15:18 +02:00
Jon
2be1eac7fc
Merge pull request #69724 from xrelkd/update/go-ethereum 
go-ethereum: 1.9.3 -> 1.9.5
 2019-09-30 17:44:21 -07:00
Marek Mahut
7adddf7c3e jormungandr: 0.5.2 -> 0.5.4 2019-09-30 23:59:56 +02:00
Matthew Bauer
040f103720
Merge pull request #69867 from nyanloutre/ledger_live_desktop_1_15 
ledger-live-desktop: 1.12.0 -> 1.15.0
 2019-09-28 16:08:40 -04:00
nyanloutre
3ceb8d5990
ledger-live-desktop: 1.12.0 -> 1.15.0 
built with appimageTools.wrapType2 instead of wrapping appimage-run
 2019-09-28 18:07:53 +02:00
xrelkd
eae30c7929 parity-beta: 2.6.2 -> 2.6.4 2019-09-28 16:13:33 +08:00
xrelkd
61801968aa parity: 2.5.7 -> 2.5.9 2019-09-28 16:12:59 +08:00
xrelkd
042597a5a4 go-ethereum: 1.9.3 -> 1.9.5 2019-09-28 07:48:53 +08:00
R. RyanTM
0d80f97069 bitcoin-abc: 0.19.4 -> 0.20.2 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bitcoin-abc/versions
 2019-09-27 00:04:04 +02:00
Marek Mahut
e669aa4b85 jormungandr: 0.5.1 -> 0.5.2 2019-09-26 19:14:44 +02:00
Marek Mahut
8da4f1ac88 jormungandr: 0.5.0 -> 0.5.1 2019-09-26 18:49:10 +02:00
Marek Mahut
9b775dfad9 jormungandr: 0.3.9999 -> 0.5.0 2019-09-23 18:54:59 +02:00
Marek Mahut
477776c521 jormungandr: adding jormungandr-scenario-tests 2019-09-20 22:44:57 +02:00
Marek Mahut
c48083f0aa jormungandr: 0.3.1415 -> 0.3.9999 2019-09-20 17:13:24 +02:00
Marek Mahut
283cf08576 jormungandr: 0.3.3 -> 0.3.1415 2019-09-19 10:51:35 +02:00
worldofpeace
7bbce4af57
Merge pull request #68535 from craigem/add_libsnark_builddep_to_zcash 
zcash: Add libsnark to stop build failures
 2019-09-16 18:39:17 -04:00
Juanjo Presa
4f7a56fa1a
dcrd/dcrwallet: 1.1.2 -> 1.5.1 
dcrwallet: 1.1.2 -> 1.4.1

Update modSha256 sums

Downgrade drcd to Go 1.12

update to 1.5.0
 2019-09-14 15:14:46 +01:00
Marek Mahut
1ed94fec3c
Merge pull request #91429 from nyanloutre/ledger_live_2_6_0 
ledger-live-desktop: 2.3.2 -> 2.6.0
 2020-06-26 13:21:59 +02:00
nyanloutre
33abace40c
ledger-live-desktop: 2.3.2 -> 2.6.0 2020-06-24 20:02:26 +02:00
Henrik Jonsson
bc42ab425b
wasabiwallet: 1.1.8 -> 1.1.9 2019-09-14 13:40:32 +02:00
Henrik Jonsson
19250f288e
wasabiwallet: 1.1.6 -> 1.1.8 2019-09-13 11:43:31 +02:00
Craige McWhirter
2c9bab7ec2
zcash: Add libsnark to stop build failures 
Wanted for #68361

zcash build fails due to missing `profiling.hpp` which is provided by
`libsnark`.
 2019-09-12 16:03:48 +10:00
worldofpeace
137a90c691
Merge pull request #68336 from xrelkd/update/parity 
parity, parity-beta: update cargoSha256 hashes
 2019-09-09 07:08:46 -04:00
Frederik Rietdijk
e3f25191c4 Merge staging-next into staging 2019-09-09 08:11:34 +02:00
xrelkd
5a1df82bc5 parity-beta: update cargoSha256 hash 2019-09-09 11:39:14 +08:00
xrelkd
f688c79474 parity: update cargoSha256 hash 2019-09-09 11:38:55 +08:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Marek Mahut
df3b84ac04
Merge pull request #68315 from jluttine/nano-wallet-19.0 
nano-wallet: 18.0 -> 19.0
 2019-09-08 22:35:08 +02:00
Jaakko Luttinen
fa0b1870d1
nano-wallet: fix Qt wrapping 2019-09-08 19:41:05 +03:00
Pavol Rusnak
2a44aebb9f wasabiwallet: 1.1.5 -> 1.1.6 2019-09-08 17:47:41 +02:00
Jaakko Luttinen
e38a36094b
nano-wallet: 18.0 -> 19.0 2019-09-08 17:17:44 +03:00
Frederik Rietdijk
66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00
adisbladis
7814d35bff
go-ethereum-classic: Drop package 
It's unmaintained for years and doesn't build with Go 1.12
 2019-09-05 22:33:39 +01:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
xrelkd
d4d6c6b4d9 go-ethereum: 1.9.2 -> 1.9.3 2019-09-03 20:51:18 +08:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
Jonas Nick
f74070baf5 clightning: 0.7.1 -> 0.7.2.1 2019-09-01 09:41:05 -07:00
worldofpeace
5d10eab943
Merge pull request #67755 from xrelkd/update/parity 
parity: 2.5.6 -> 2.5.7, parity-beta: 2.6.1 -> 2.6.2
 2019-09-01 04:29:48 -04:00
volth
7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
rnhmjoj
bd1e4424e5 monero-gui: cleanup for qt wrappers 2019-08-30 23:27:18 -04:00
xrelkd
bfe498f81b parity-beta: 2.6.1 -> 2.6.2 2019-08-31 01:45:23 +08:00
xrelkd
6eee9a44b5 parity: 2.5.6 -> 2.5.7 2019-08-31 01:44:59 +08:00
xrelkd
b2cc915003 parity: Update buildInputs and nativeBuildInputs 
Move cmake and pkgconfig from buildInputs to nativeBuildInputs
Remove unneeded perl from buildInputs
 2019-08-31 01:41:43 +08:00
William Casarin
04ef817479 blockchains: remove default.nix 
This is no longer needed

Signed-off-by: William Casarin <jb55@jb55.com>
 2019-08-29 05:06:06 -07:00
William Casarin
72682e4654 tree: rename altcoins to blockchains 
Signed-off-by: William Casarin <jb55@jb55.com>
 2019-08-29 05:01:42 -07:00