Commit Graph

15167 Commits

Author SHA1 Message Date
R. RyanTM 30510e3dff circleci-cli: 0.1.15085 -> 0.1.15108 2021-03-10 19:03:19 +00:00
R. RyanTM 2207d86e25 cargo-make: 0.32.12 -> 0.32.14 2021-03-10 18:39:59 +00:00
Tim Steinbach 079c282386 sbt: 1.4.8 -> 1.4.9 2021-03-10 11:21:12 -05:00
Ryan Mulligan 5763979e98
Merge pull request #115535 from r-ryantm/auto-update/rust-bindgen
rust-bindgen: 0.55.1 -> 0.57.0
2021-03-09 21:21:35 -08:00
R. RyanTM 82751a8678 rshell: 0.0.28 -> 0.0.30 2021-03-09 15:50:43 +00:00
Robert Hensing fdfbd17b70 hci: init at 0.1.0 2021-03-09 16:38:20 +01:00
Robert Hensing c0a3fd18ca hercules-ci-agent: Fix and update build 2021-03-09 16:38:20 +01:00
R. RyanTM abf7ed76bc rust-bindgen: 0.55.1 -> 0.57.0 2021-03-09 13:28:21 +00:00
R. RyanTM 10a3daee9e qbs: 1.17.0 -> 1.18.0 2021-03-09 09:39:36 +00:00
Mario Rodas 8ba5d0e18c nix-linter: fix build 2021-03-09 04:20:00 +00:00
Mario Rodas d165a4629b go-tools: 2020.2.2 -> 2020.2.3 2021-03-09 04:20:00 +00:00
Mario Rodas 98319fd3a9
Merge pull request #115677 from r-ryantm/auto-update/timescaledb-tune
timescaledb-tune: 0.10.0 -> 0.11.0
2021-03-09 22:30:20 -05:00
R. RyanTM e7e3c939b3 timescaledb-tune: 0.10.0 -> 0.11.0 2021-03-10 02:20:36 +00:00
Mario Rodas cc86fe9e6f
Merge pull request #115643 from r-ryantm/auto-update/tfsec
tfsec: 0.38.4 -> 0.39.5
2021-03-09 18:51:37 -05:00
R. RyanTM 2607f6bd8c tfsec: 0.38.4 -> 0.39.5 2021-03-09 23:09:20 +00:00
Sandro 0c8d736588
Merge pull request #115392 from saschagrunert/ginkgo
ginkgo: 1.15.0 -> 1.15.1
2021-03-09 22:08:56 +01:00
Sandro aa3af19774
Merge pull request #115424 from siraben/darwin-mass-fix-buildInputs=0 2021-03-09 21:14:38 +01:00
Sandro 8a500ec63c
Merge pull request #115585 from 06kellyjac/open-policy-agent
open-policy-agent: 0.26.0 -> 0.27.0
2021-03-09 21:09:06 +01:00
06kellyjac cfac8936f0 open-policy-agent: 0.26.0 -> 0.27.0
Set buildFlagsArray using bash
use -s and -w to minify the result
Add installCheckPhase
Add @06kellyjac as a maintainer
2021-03-09 17:51:14 +00:00
Ricardo M. Correia 197e736392 go-task: 2.8.1 -> 3.2.2 2021-03-09 18:17:57 +01:00
Sandro 6cc5540412
Merge pull request #115513 from dbeecham/feature/bear-3.0.9
bear: 3.0.3 -> 3.0.9
2021-03-09 16:53:18 +01:00
Pavol Rusnak 06c49712b2
Merge pull request #115510 from prusnak/openocd
openocd: 0.11.0-rc1 -> 0.11.0
2021-03-09 14:20:14 +01:00
Pavel Borzenkov 9a60ad1b4b gops: 0.3.16 -> 0.3.17 2021-03-09 14:55:59 +03:00
Mario Rodas a262124577 dune_2: 2.8.2 -> 2.8.4
https://github.com/ocaml/dune/releases/tag/2.8.3
https://github.com/ocaml/dune/releases/tag/2.8.4
2021-03-09 12:34:56 +01:00
Daniel Beecham a4f8c1dcf0 bear: 3.0.3 -> 3.0.9 2021-03-09 12:02:53 +01:00
Pavol Rusnak 71e1536f10
openocd: 0.11.0-rc1 -> 0.11.0 2021-03-09 11:55:51 +01:00
Sascha Grunert 1cab04a177
kustomize: 3.10.0 -> 4.0.5
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
2021-03-09 10:06:41 +01:00
Peter Hoeg 29b0d4d0b6
shards: 0.13 -> 0.14 (#115471)
* shards: 0.13 -> 0.14

* fix
2021-03-09 11:18:52 +08:00
Ben Siraphob 0be95fbe46 jikespg: fix darwin build 2021-03-09 09:16:10 +07:00
Ben Siraphob 9ddb9054a2 rman: fix darwin build 2021-03-09 09:16:09 +07:00
Mario Rodas 35586f1ba0
Merge pull request #115085 from r-ryantm/auto-update/dapper
dapper: 0.5.5 -> 0.5.6
2021-03-08 19:56:07 -05:00
Mario Rodas 5ff22d62eb
Merge pull request #115452 from SuperSandro2000/dive
dive: 0.9.2 -> 0.10.0
2021-03-08 19:47:08 -05:00
Mario Rodas 8c9a0d1a3f
Merge pull request #115079 from r-ryantm/auto-update/circleci-cli
circleci-cli: 0.1.12214 -> 0.1.15085
2021-03-08 19:35:27 -05:00
zowoq 4d1e4a3bf4 buildah: 1.19.6 -> 1.19.8
https://github.com/containers/buildah/releases/tag/v1.19.8
2021-03-09 07:44:11 +10:00
Sandro Jäckel 9d8ba5ecee
dive: 0.9.2 -> 0.10.0 2021-03-08 21:52:19 +01:00
Sandro 77370c3d1f
Merge pull request #115430 from NeQuissimus/sbt
sbt: 1.4.7 -> 1.4.8
2021-03-08 19:20:12 +01:00
Tim Steinbach 52b6f5f1d7
sbt-extras: 2021-03-03 → 2021-03-08 2021-03-08 16:55:34 +00:00
Tim Steinbach 955bcff28f
sbt: 1.4.7 -> 1.4.8 2021-03-08 11:54:02 -05:00
luc65r 2b9f10dbe9
Use fetchFromSourcehut 2021-03-08 15:51:27 +01:00
R. RyanTM 2b74b052c0
cvise: 2.1.0 -> 2.2.0 (#115382) 2021-03-08 09:08:52 +00:00
Sascha Grunert 0a86bfdb30
ginkgo: 1.15.0 -> 1.15.1
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
2021-03-08 09:57:05 +01:00
Daniël de Kok 891d560b21
Merge pull request #115320 from viric/sccache-dist
sccache: add dist-server build
2021-03-08 08:32:18 +01:00
Daniël de Kok a094d0e0e4 sccache: change platforms to x86_64-linux
Other platforms are not supported, see:

https://github.com/mozilla/sccache/blob/master/src/bin/sccache-dist/main.rs#L70
2021-03-08 08:00:18 +01:00
Lluís Batlle i Rossell 2a0d3cc907 sccache: add sccache-dist target in build 2021-03-07 19:15:08 +01:00
Jan Tojnar 388dfa5cbd
Merge pull request #114506 from r-ryantm/auto-update/msitools
msitools: 0.99 -> 0.100
2021-03-07 17:59:44 +01:00
Jan Tojnar 512284ed14
msitools: 0.99 -> 0.101
https://ftp.fau.de/gnome/sources/msitools/0.101/msitools-0.101.news
2021-03-07 17:30:07 +01:00
Sandro 1aae00a12f
Merge pull request #115306 from SuperSandro2000/fix-collection22 2021-03-07 15:58:56 +01:00
Jörg Thalheim 560ee846ac
Merge pull request #115099 from r-ryantm/auto-update/golangci-lint
golangci-lint: 1.37.1 -> 1.38.0
2021-03-07 12:06:46 +00:00
Vincent Laporte a104d2b18c ocamlPackages.dune_1: disable for OCaml ≥ 4.12 2021-03-07 12:07:14 +01:00
Vincent Laporte 60785fe4db ocamlPackages.dune: rename into dune_1 2021-03-07 12:07:14 +01:00
Lassulus 63798f3cf0
Merge pull request #114408 from figsoda/pactorio
pactorio: init at 0.5.1
2021-03-07 09:50:02 +01:00
Daniël de Kok 3e2943ab8e wrangler: build against system OpenSSL
Wrangler was built against a vendored, static OpenSSL. Use the system
OpenSSL instead to benefit from security updates, etc.
2021-03-07 08:08:42 +01:00
Jörg Thalheim f003d2c9ce
drone-runner-exec: init at unstable-2020-04-19 (#115003)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-03-07 04:35:30 +01:00
Sandro e61df8ad51
Merge pull request #115269 from marsam/update-rubocop
rubocop: 1.10.0 -> 1.11.0
2021-03-07 04:03:59 +01:00
Sandro Jäckel bee35c7b7c
tree-sitter: cleanup 2021-03-06 21:03:30 +01:00
Sandro 822b70e18c
Merge pull request #115051 from siraben/darwin-mass-fix-buildInputs=0 2021-03-06 20:54:39 +01:00
Ben Siraphob 48c42ec3a0 direvent: expand platforms to unix 2021-03-06 21:01:46 +07:00
Mario Rodas f46ec84524 tflint: 0.24.1 -> 0.25.0
https://github.com/terraform-linters/tflint/releases/tag/v0.25.0
2021-03-06 05:00:00 -05:00
Mario Rodas 55142f4301 rubocop: 1.10.0 -> 1.11.0
https://github.com/rubocop/rubocop/releases/tag/v1.11.0
2021-03-06 04:20:00 +00:00
Sandro 9675484462
Merge pull request #115197 from SuperSandro2000/fix-collection21 2021-03-06 04:56:45 +01:00
Sandro Jäckel 96ff414198
fmbt: fix compilation 2021-03-05 18:14:35 +01:00
Sandro Jäckel cca48ed2d0
wranger: remove darwin from inputs 2021-03-05 16:32:40 +01:00
Maximilian Bosch f7d002dd38
Merge pull request #114629 from r-ryantm/auto-update/cargo-crev
cargo-crev: 0.19.0 -> 0.19.1
2021-03-05 16:11:54 +01:00
Fabian Affolter f5f6dc053b
Merge pull request #115082 from r-ryantm/auto-update/codeql
codeql: 2.4.3 -> 2.4.4
2021-03-05 08:53:20 +01:00
Fabian Affolter 53f570a51a
Merge pull request #115078 from r-ryantm/auto-update/checkstyle
checkstyle: 8.40 -> 8.41
2021-03-05 08:50:22 +01:00
Fabian Affolter 0f89962d75
Merge pull request #115100 from r-ryantm/auto-update/gosec
gosec: 2.6.1 -> 2.7.0
2021-03-05 08:47:37 +01:00
Pavol Rusnak 96e9a7c30b
Merge pull request #115132 from TredwellGit/electron_9
electron_9: 9.4.3 -> 9.4.4
2021-03-04 22:23:44 +01:00
TredwellGit a8fde9c824 electron_12: init at 12.0.0
https://github.com/electron/electron/releases/tag/v12.0.0
2021-03-04 20:42:16 +00:00
TredwellGit 03f27fd63b electron_9: 9.4.3 -> 9.4.4
https://github.com/electron/electron/releases/tag/v9.4.4
2021-03-04 19:48:12 +00:00
Tim Steinbach 0355cd98e8 sbt-extras: 2021-03-01 → 2021-03-03 2021-03-04 12:29:00 -05:00
R. RyanTM 296e2bc1c4 gosec: 2.6.1 -> 2.7.0 2021-03-04 16:33:50 +00:00
R. RyanTM 82185d3953 golangci-lint: 1.37.1 -> 1.38.0 2021-03-04 16:24:21 +00:00
adisbladis f0f69eda7b
Merge pull request #115073 from tweag/poetry2nix-1_16_0
poetry2nix: 1.15.5 -> 1.16.0
2021-03-04 16:59:34 +02:00
Robert Hensing 89aa0173ca
Merge pull request #115075 from siraben/stdenv-cleanup
treewide: remove stdenv where not needed
2021-03-04 15:51:04 +01:00
adisbladis 5de110f8da
poetry2nix: 1.15.5 -> 1.16.0 2021-03-04 16:32:04 +02:00
R. RyanTM 136efed882 dapper: 0.5.5 -> 0.5.6 2021-03-04 14:16:49 +00:00
R. RyanTM c01376f960 codeql: 2.4.3 -> 2.4.4 2021-03-04 13:54:07 +00:00
R. RyanTM 38a63351cc circleci-cli: 0.1.12214 -> 0.1.15085 2021-03-04 13:35:16 +00:00
R. RyanTM 6806f65067 checkstyle: 8.40 -> 8.41 2021-03-04 13:30:32 +00:00
Ben Siraphob 98f26993f2 treewide: remove stdenv where not needed 2021-03-04 19:54:50 +07:00
Sandro 062601478a
Merge pull request #115040 from SuperSandro2000/hound
hound: unstable-2021-01-26 -> 0.4.0
2021-03-04 12:59:48 +01:00
Sandro Jäckel 7b893f2095
hound: unstable-2021-01-26 -> 0.4.0 2021-03-04 03:25:13 +01:00
Sandro 4a0026b930
Merge pull request #115030 from otavio/feature-cargo-cross
cargo-cross: init at 0.2.1
2021-03-04 02:28:06 +01:00
Otavio Salvador dd5d726be3 cargo-cross: init at 0.2.1
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2021-03-03 22:12:16 -03:00
Otavio Salvador d378d727e7 cargo-limit: 0.0.6 -> 0.0.7
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2021-03-03 21:39:18 -03:00
José Luis Lafuente c7cf17293b tree-sitter: 0.17.3 -> 0.18.2
Also updates the tree-sitter grammars
2021-03-03 21:07:51 +01:00
li f7752fc99c treesitter grammars: look for scanner.c 2021-03-03 21:07:51 +01:00
Bernardo Meurer 3371fe2c9b
Merge pull request #114290 from sternenseemann/missing-libs
treewide: add missing lib inputs
2021-03-03 18:51:33 +00:00
Sandro 58a5417197
Merge pull request #114989 from SuperSandro2000/fix-collection20 2021-03-03 19:21:19 +01:00
Florian Beeres b228770927 go-mockery: init at 2.5.1 2021-03-03 17:10:13 +01:00
Sandro Jäckel c1edda8342
vagrant: remove unused input 2021-03-03 16:23:54 +01:00
figsoda 18c6f9ca94 luaformatter: init at 1.3.4 2021-03-03 15:49:34 +01:00
Sandro 9c7fcca72e
Merge pull request #113682 from alesguzik/update_nxpmicro-mfgtools_plus_udev
nxpmicro-mfgtools: add udev rules
2021-03-03 14:49:49 +01:00
Maximilian Bosch 3de2618d3d
Merge pull request #114882 from r-ryantm/auto-update/cargo-expand
cargo-expand: 1.0.4 -> 1.0.5
2021-03-03 14:45:43 +01:00
Sandro e061350a36
Merge pull request #114474 from NeQuissimus/sbt_jdk11
sbt: Fix check
2021-03-03 14:12:42 +01:00
sternenseemann 6f2fbf5f0b treewide: add missing lib inputs
This fixes hopefully all remaining missing lib inputs, likely introduced
as a regression by our recent treewide switch from stdenv.lib to lib.
These instances are all I could find using nix-instantiate --parse using
the following command:

    find "$NIXPKGS" -name '*.nix' \
      -and ! -path "$NIXPKGS/pkgs/development/interpreters/python/cpython/docs/template.nix" \
      -and ! -path '$NIXPKGS/.git/**' \
      -print0 | xargs -0 nix-instantiate --parse >/dev/null
2021-03-03 13:40:45 +01:00
Sandro 49f51c686a
Merge pull request #114832 from pborzenkov/gops-0.3.16
gops: 0.3.15 -> 0.3.16
2021-03-03 13:21:03 +01:00
R. RyanTM febc74888e codeql: 2.4.2 -> 2.4.3 2021-03-03 01:10:57 -05:00
R. RyanTM 94399b30cd circleci-cli: 0.1.11924 -> 0.1.12214 2021-03-03 01:01:36 -05:00
R. RyanTM 78e35586d3 checkstyle: 8.39 -> 8.40 2021-03-03 00:59:36 -05:00
R. RyanTM e1f38da2c7 cargo-expand: 1.0.4 -> 1.0.5 2021-03-02 20:00:40 +00:00
Tim Steinbach 44164e9cd4
sbt: Remove installCheck
The check is very fragile.
We cannot replace it with different logic as that would require
network access.
`
2021-03-02 14:56:48 -05:00
Sandro e46c9c782f
Merge pull request #114861 from NeQuissimus/sbtextras
sbt-extras: 2021-02-24 → 2021-03-01
2021-03-02 17:39:40 +01:00
Sandro 8627e1949f
Merge pull request #114856 from siraben/tie-xcompile
tie: fix cross-compilation
2021-03-02 17:33:42 +01:00
Thomas Bereknyei 2b558b7f0f golint: 20181026 -> 20201208
bump and use Go modules to build
2021-03-02 11:01:00 -05:00
Ben Siraphob 722abf8337 tie: fix cross-compilation 2021-03-02 22:40:58 +07:00
Ben Siraphob d727b87f5a cwebbin: fix build on darwin and fix cross-compilation 2021-03-02 22:27:56 +07:00
Tim Steinbach 8d25cac779
sbt-extras: 2021-02-24 → 2021-03-01 2021-03-02 15:00:39 +00:00
06kellyjac 4ed02f4ae6 dockle: 0.3.10 -> 0.3.11 2021-03-02 13:13:47 +00:00
Pavel Borzenkov 81a2e8a8cc gops: 0.3.15 -> 0.3.16 2021-03-02 14:51:51 +03:00
R. RyanTM 80308388cd flyway: 7.5.3 -> 7.5.4 2021-03-02 03:42:49 -05:00
Dmitry Kalinkin 46f37ddcc3
delete unreferenced development/tools/scaff
Fixes: 0799e016 ('scaff: delete')
2021-03-01 23:06:28 -05:00
Dmitry Kalinkin 43c128776e
Merge pull request #114676 from jD91mZM2/remove-me-as-maintainer
remove me as maintainer
2021-03-01 22:19:56 -05:00
Sandro 82f8784f6a
Merge pull request #114728 from humancalico/cargo-criterion
cargo-criterion: init at 1.0.0
2021-03-01 18:33:47 +01:00
Sandro 3b23771fcd
Merge pull request #114713 from figsoda/cargo-play 2021-03-01 17:47:20 +01:00
Sandro 21afc45829
Merge pull request #114746 from jorsn/crate2nix-0.9.0
crate2nix: 0.8.0 -> 0.9.0
2021-03-01 15:43:56 +01:00
figsoda a01cffac18 cargo-play: init at 0.5.0 2021-03-01 07:30:26 -05:00
Johannes Rosenberger 220e13292a crate2nix: 0.8.0 -> 0.9.0 2021-03-01 13:02:17 +01:00
jD91mZM2 3a6ba9ea5b
remove me as maintainer
I don't use these tools anymore, so it makes sense I shouldn't have an
opinion on PRs that change/update them. I know it's always unfortunate
losing a reviewer, but I'm not very active anymore anyway,
unfortunately. Apologies.

From now on, I'm trying not to add too many packages into nixpkgs, since
flakes are available. I guess when I first started using Nix I got
overexcited by how easy it was to contribute, so I added things for the
sake of adding things (not because I necessarily used them).
2021-03-01 12:32:20 +01:00
Bastian Köcher d8ce2df744
rust-analyzer: 2021-02-22 -> 2021-03-01 2021-03-01 12:21:10 +01:00
Akshat Agarwal 1a96fcd85f
cargo-criterion: init at 1.0.0
Signed-off-by: Akshat Agarwal <humancalico@disroot.org>
2021-03-01 15:38:19 +05:30
Mario Rodas f1af38a55f
Merge pull request #114623 from r-ryantm/auto-update/azure-storage-azcopy
azure-storage-azcopy: 10.8.0 -> 10.9.0
2021-02-28 22:46:37 -05:00
Mario Rodas 73ece2ffc6
Merge pull request #114630 from r-ryantm/auto-update/cargo-deny
cargo-deny: 0.8.7 -> 0.8.8
2021-02-28 22:44:57 -05:00
Ryan Mulligan 06209b4985
Merge pull request #114663 from r-ryantm/auto-update/jbang
jbang: 0.66.0 -> 0.66.1
2021-02-28 14:16:22 -08:00
Fabian Affolter 8ad4084980
Merge pull request #114640 from r-ryantm/auto-update/doctl
doctl: 1.56.0 -> 1.57.0
2021-02-28 20:14:37 +01:00
R. RyanTM ac2854a9ba
kubectx: 0.9.2 -> 0.9.3 (#114668) 2021-02-28 10:08:22 -08:00
R. RyanTM c6898f8541
bazel-kazel: 0.2.0 -> 0.2.1 (#114624) 2021-02-28 10:01:36 -08:00
R. RyanTM 5a3063ff58 jbang: 0.66.0 -> 0.66.1 2021-02-28 14:22:03 +00:00
Sandro 8491685568
Merge pull request #114533 from marsam/fix-conan-darwin
conan: fix build on darwin
2021-02-28 13:26:19 +01:00
R. RyanTM 02284b8786 doctl: 1.56.0 -> 1.57.0 2021-02-28 11:06:11 +00:00
R. RyanTM 01e87f9e3c cargo-deny: 0.8.7 -> 0.8.8 2021-02-28 09:15:16 +00:00
R. RyanTM d02915f5f1 cargo-crev: 0.19.0 -> 0.19.1 2021-02-28 09:09:59 +00:00
R. RyanTM a1e0b87684 azure-storage-azcopy: 10.8.0 -> 10.9.0 2021-02-28 08:13:05 +00:00
Orivej Desh 33230da5da
cvise: init at 2.1.0 (#114197) 2021-02-28 04:12:14 +00:00
Jonas Chevalier 3f110f988b
mdsh: 0.5.0 -> 0.6.0 (#114513) 2021-02-27 13:47:11 +00:00
Mario Rodas a1a6da5418 conan: fix build on darwin 2021-02-27 04:20:00 +00:00
Peter Simons 8629446fc1
Merge pull request #114407 from NixOS/haskell-updates
Update Haskell package set to Stackage Nightly 2021-02-25 (plus other fixes)
2021-02-26 23:57:43 +01:00
zimbatm bdfd50116a
Revert "mdsh: 0.5.0 -> 0.6.0"
This was pushed by mistake!

This reverts commit 7ee7b5deec.
2021-02-26 22:54:37 +01:00
zimbatm 7ee7b5deec
mdsh: 0.5.0 -> 0.6.0 2021-02-26 22:52:59 +01:00
Sandro e8446a3f77
Merge pull request #114396 from NeQuissimus/sbtextras
sbt-extras: 2021-02-04 → 2021-02-24
2021-02-26 20:40:10 +01:00
Sandro a859f27d61
Merge pull request #114180 from omasanori/wasm-pack-update-deps 2021-02-26 18:49:54 +01:00
Peter Simons ecda7a86e7 Merge origin/master into haskell-updates. 2021-02-26 16:59:40 +01:00
midchildan 78e3596121
sourcetrail: fix darwin build (#112795) 2021-02-26 13:52:07 +00:00
Frederik Rietdijk c456a2512f Merge master into staging-next 2021-02-26 10:25:13 +01:00
Mario Rodas 7043f00adc ocamlPackages.ocp-index: 1.2.1 -> 1.2.2 2021-02-26 04:20:00 +00:00
R. RyanTM eddb81ccd8 ocsigen-i18n: 3.5.0 -> 3.7.0 2021-02-25 22:21:30 -05:00
Mario Rodas c3493714c7
Merge pull request #114320 from r-ryantm/auto-update/ameba
ameba: 0.13.4 -> 0.14.0
2021-02-25 20:05:13 -05:00
Mario Rodas 024080221b
Merge pull request #114323 from r-ryantm/auto-update/buildkit
buildkit: 0.8.1 -> 0.8.2
2021-02-25 20:04:35 -05:00
Mario Rodas 2e10316ffb
Merge pull request #114389 from r-ryantm/auto-update/yq-go
yq-go: 4.6.0 -> 4.6.1
2021-02-25 19:54:05 -05:00
David Asabina 34b9463d8d checkmake: init at 0.1.0-2020.11.30 2021-02-25 19:50:30 -05:00