Commit Graph

788 Commits

Author SHA1 Message Date
Tuomas Tynkkynen
d92f73e8db rocket: Init at 2018-06-09 2018-06-25 19:22:25 +03:00
R. RyanTM
d316ca55a8 vips: 8.6.3 -> 8.6.4
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/vips/versions.

These checks were done:

- built on NixOS
- /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vips passed the binary check.
- /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsedit passed the binary check.
- /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsthumbnail passed the binary check.
- /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsheader passed the binary check.
- Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/light_correct had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/shrink_width had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/batch_image_convert had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/batch_rubber_sheet had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/batch_crop had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsprofile had a zero exit code or showed the expected version
- /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vips-8.6 passed the binary check.
- 5 of 11 passed binary check by having a zero exit code.
- 0 of 11 passed binary check by having the new version present in output.
- found 8.6.4 with grep in /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4
- directory tree listing: https://gist.github.com/3d47ce9f75e2a1d701b3089ffa679618
- du listing: https://gist.github.com/b6aa67c89ec9bb55f45e21ae98e82fdc
2018-06-18 21:08:50 -07:00
Jörg Thalheim
df9f2c7812
Merge pull request #42143 from Ma27/bump-nifskope
nifskope: 1.1.3 -> 2.0.dev7
2018-06-18 11:30:47 +01:00
Maximilian Bosch
d60127fd8c
nifskope: 1.1.3 -> 2.0.dev7
`nifskope` v2 contains a lot of new features and a new, QT5-based UI
(see https://github.com/niftools/nifskope/releases). Additionally the
2.0 sourcetree exists for quite a while and after some short user tests
it seems fairly stable.

The following aspects have been changed:

* Use QT 5.9 rather than QT4 (see #33248).

* GCC7 support from upstream (gcc6 patch not needed anymore, build on
  GCC7 works fine), disabled `-Werror=format-security` can be used again
  as compiler flag.

* Patched broken paths in `NifSkope_targets.pri` to point to the proper
  dependencies (otherwise `<gli.hpp>` and `qhull` couldn't be found).

* Patched paths in `NifSkope.pro` to `lupdate` and `lrelease` (default
  `QT_*` paths point to `libsForQt5x.qtbase` which doesn't contain the
  needed binaries, instead they need to point to `libsForQt5x.qttools`).

* Added myself as maintainer.
2018-06-18 00:52:16 +02:00
Pascal Wittmann
4e52780f9d
logstalgia: 1.1.1 -> 1.1.2 2018-06-16 17:19:49 +02:00
Michael Weiss
d2c0168779 maim: 5.5.1 -> 5.5.2 2018-06-14 14:01:03 +02:00
R. RyanTM
753ac6174d qrencode: 4.0.1 -> 4.0.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/qrencode/versions.

These checks were done:

- built on NixOS
- /nix/store/cywxaw8h01kh5rvkhx7bh2738icds31s-qrencode-4.0.2/bin/qrencode passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 4.0.2 with grep in /nix/store/cywxaw8h01kh5rvkhx7bh2738icds31s-qrencode-4.0.2
- directory tree listing: https://gist.github.com/93c7bac0fe3aae76a9ef5ebbd9fba7de
- du listing: https://gist.github.com/2b0d6fa748528181bfed9cbb453ed75a
2018-06-13 22:53:35 -07:00
R. RyanTM
b22c1b7994 pstoedit: 3.71 -> 3.73 (#41528)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pstoedit/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/m0nhahi727p7jwnxysk68svbyxv17k8m-pstoedit-3.73/bin/pstoedit had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.73 with grep in /nix/store/m0nhahi727p7jwnxysk68svbyxv17k8m-pstoedit-3.73
- directory tree listing: https://gist.github.com/4da3ca3d5e74c32b039a23ccafc88d68
- du listing: https://gist.github.com/66649e7e80a80f79059715f8158aff56
2018-06-09 00:45:22 +02:00
R. RyanTM
276bf53ae9 dcraw: 9.27.0 -> 9.28.0 (#41716)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/dcraw/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/i7qixx7ll7p7hamiq04sjn73v2f58fjj-dcraw-9.28.0/bin/dcraw had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 9.28.0 with grep in /nix/store/i7qixx7ll7p7hamiq04sjn73v2f58fjj-dcraw-9.28.0
- directory tree listing: https://gist.github.com/6f620f3965b3cc4522f8f02eaf1115da
- du listing: https://gist.github.com/835f683cdb46fe5ac50f063aeb7d0226
2018-06-08 19:22:23 +02:00
Michael Raskin
a1e32fba96
Merge pull request #41527 from r-ryantm/auto-update/qrencode
qrencode: 4.0.0 -> 4.0.1
2018-06-06 06:36:47 +00:00
Will Dietz
e32cdcb7e6 gnuplot: 5.2.3 -> 5.2.4 (#41505)
http://www.gnuplot.info/ReleaseNotes_5_2_4.html
2018-06-06 05:20:15 +00:00
R. RyanTM
a1df64bab5 qrencode: 4.0.0 -> 4.0.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/qrencode/versions.

These checks were done:

- built on NixOS
- /nix/store/b6r4hmimplv6bb9c6hifz12fviffv7sy-qrencode-4.0.1/bin/qrencode passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 4.0.1 with grep in /nix/store/b6r4hmimplv6bb9c6hifz12fviffv7sy-qrencode-4.0.1
- directory tree listing: https://gist.github.com/baadc6a6ea64d66edc20bd100d9f2c44
- du listing: https://gist.github.com/c734323c8b2a2924e59912df5f75be0d
2018-06-05 21:43:54 -07:00
leenaars
186675b06f pdf-redact-tools: init -> 0.1.2 (#41451) 2018-06-05 22:31:08 +02:00
Orivej Desh
07e1ae54a6 plotutils: fix parallel building
E.g. https://hydra.nixos.org/build/75429322:

     b_closepl.c:21:10: fatal error: xmi.h: No such file or directory
     make[2]: *** [Makefile:958: b_closepl.lo] Error 1
     make[2]: Leaving directory '/build/plotutils-2.6/libplot'
2018-06-04 06:49:02 +00:00
R. RyanTM
ea3769ec81 povray: 3.7.0.7 -> 3.7.0.8 (#41269)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/povray/versions.

These checks were done:

- built on NixOS
- /nix/store/hl6rn2fjd9h2g4vks7hrm3yv2f1zh3yc-povray-3.7.0.8/bin/povray passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.7.0.8 with grep in /nix/store/hl6rn2fjd9h2g4vks7hrm3yv2f1zh3yc-povray-3.7.0.8
- directory tree listing: https://gist.github.com/d35bed4b147aefbe2b8c6e42bdf56ccb
- du listing: https://gist.github.com/75bee836a81741aa901a3677fb40aa16
2018-05-31 00:14:46 +02:00
John Ericson
18742471af Merge remote-tracking branch 'upstream/master' into staging
Use newer vagrant from master
2018-05-23 09:40:37 -04:00
Pascal Wittmann
eadb87d36d
Merge pull request #40726 from dbohdan/s2png
s2png: init at 0.7.2
2018-05-22 18:06:59 +02:00
Vladimír Čunát
392e6de7d0
Merge branch 'master' into staging 2018-05-20 13:20:53 +02:00
Silvan Mosberger
c8a8ecb5b3 blockhash: init at 0.3 (#40737) 2018-05-19 23:33:09 +02:00
dbohdan
1d2eeec16c s2png: init at 0.7.2 2018-05-18 17:19:31 +03:00
Tuomas Tynkkynen
6b6a575748 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/tools/networking/telnet/default.nix
	pkgs/top-level/aliases.nix
2018-05-16 03:09:33 +03:00
Michael Weiss
30a788b71e maim: 5.5 -> 5.5.1 2018-05-15 20:38:43 +02:00
Matthew Bauer
6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
R. RyanTM
941b2a17cb gnuplot: 5.2.2 -> 5.2.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/gnuplot/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/gnuplot -h’ got 0 exit code
- ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/gnuplot --help’ got 0 exit code
- ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/.gnuplot-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/.gnuplot-wrapped --help’ got 0 exit code
- found 5.2.3 with grep in /nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3
- directory tree listing: https://gist.github.com/c09c0907f914e36a3f7c086d4b978dbf
2018-05-07 03:41:32 -07:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Will Dietz
855e0463ab tree-wide: platforms = platforms.gnu; -> platforms = gnu ++ linux
"platforms.gnu" has been linux-only since at least 17.03:

$ nix eval -f channel:nixos-17.03 lib.platforms.gnu
[ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ]

Unlike platforms.linux, platforms.gnu indicates "must use glibc"
which for the most part is not intended.

Replacing platforms.gnu with platforms.linux would be the same "today"
but let's err on preserving existing behavior and be optimistic
about platforms these packages work on.
2018-04-30 18:08:48 -05:00
Yury G. Kudryashov
d207e043d3 asymptote: move Emacs Lisp files to $out/share/emacs/site-lisp/asymptote/
This way, emacs can find the 'asymptote' mode.
2018-04-29 23:36:43 -04:00
Jan Tojnar
0e1147d137
Merge pull request #37915 from jtojnar/gimp-2.10
GIMP 2.10
2018-04-29 15:12:27 +02:00
Jan Tojnar
4f420c6802
gmic: 2.2.1 → 2.2.2 + build gimpPlugin 2018-04-29 09:14:19 +02:00
xeji
61b96ab9a2
Merge pull request #39168 from vodkabot/master
twilight: init at 2018-04-19
2018-04-27 23:36:03 +02:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Michael Weiss
cd1eefcd29 maim: 5.4.68 -> 5.5 2018-04-23 10:32:11 +02:00
Peter Simons
955a615fc1
Merge pull request #39280 from r-ryantm/auto-update/asymptote
asymptote: 2.42 -> 2.44
2018-04-20 22:01:43 +02:00
R. RyanTM
475e2dd2c4 asymptote: 2.42 -> 2.44
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/asymptote/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/cxi50l6jrwac932swm8pfd2zb1pm9g4b-asymptote-2.44/bin/asy -h’ got 0 exit code
- ran ‘/nix/store/cxi50l6jrwac932swm8pfd2zb1pm9g4b-asymptote-2.44/bin/asy --help’ got 0 exit code
- found 2.44 with grep in /nix/store/cxi50l6jrwac932swm8pfd2zb1pm9g4b-asymptote-2.44
- directory tree listing: https://gist.github.com/f39c5dba52ed8849c1eb79ba04db4f1d
2018-04-20 12:43:47 -07:00
vodkabot
e8c936556d twilight: init at 2018-04-19 2018-04-19 21:54:09 +03:00
R. RyanTM
fe5dbba0b3 pstoedit: 3.70 -> 3.71
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pstoedit/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.71 with grep in /nix/store/3lll9l623hg5na4xvb9vbhksq1jp04ax-pstoedit-3.71
- directory tree listing: https://gist.github.com/33d6a65ee820b486f0aaff223832a0d0
2018-04-16 21:33:47 -07:00
Frederik Rietdijk
0aa59a08d6 Merge master into staging 2018-04-09 15:12:32 +02:00
Matthew Justin Bauer
e349272b4b
Merge pull request #38234 from r-ryantm/auto-update/icoutils
icoutils: 0.32.2 -> 0.32.3
2018-04-08 21:32:24 -05:00
Jörg Thalheim
9165371a8f
Merge pull request #38579 from r-ryantm/auto-update/dcraw
dcraw: 9.26.0 -> 9.27.0
2018-04-08 11:55:34 +01:00
Frederik Rietdijk
595a72589f Merge master into staging 2018-04-08 10:54:17 +02:00
Peter Simons
d1d52adb5b
Merge pull request #38601 from r-ryantm/auto-update/asymptote
asymptote: 2.41 -> 2.42
2018-04-08 08:41:43 +02:00
R. RyanTM
dbffe147ea asymptote: 2.41 -> 2.42
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/asymptote/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/2qw7zf6brwdbj56dbrn9342s3l51j2d1-asymptote-2.42/bin/asy -h’ got 0 exit code
- ran ‘/nix/store/2qw7zf6brwdbj56dbrn9342s3l51j2d1-asymptote-2.42/bin/asy --help’ got 0 exit code
- found 2.42 with grep in /nix/store/2qw7zf6brwdbj56dbrn9342s3l51j2d1-asymptote-2.42
- directory tree listing: https://gist.github.com/ea517431d1ae476366452121c7871132
2018-04-07 22:18:27 -07:00
R. RyanTM
bdb945ce35 dcraw: 9.26.0 -> 9.27.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/dcraw/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 9.27.0 with grep in /nix/store/l6b0pk32npx23k5qpdi5n8zcfq9sahx4-dcraw-9.27.0
- directory tree listing: https://gist.github.com/4c120255f84b102eb8cf19d2ee4bd491
2018-04-07 14:06:39 -07:00
Isaac Shapira
ff5baea979 pywal: init at 2.0.5 (#38443) 2018-04-06 09:57:20 +02:00
Frederik Rietdijk
a9f37d1c25 Merge master into staging 2018-04-05 19:25:05 +02:00
Peter Hoeg
63d269d430
Merge pull request #38241 from r-ryantm/auto-update/gmic
gmic: 2.2.0 -> 2.2.1
2018-04-05 16:01:08 +08:00
Tuomas Tynkkynen
747ebe3f66 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/top-level/all-packages.nix
2018-04-03 02:22:54 +03:00
Michael Raskin
ed6bbb4f4d swfdec: init at 0.8.4 2018-04-01 22:34:26 +02:00
R. RyanTM
f1aa64fa8a gmic: 2.2.0 -> 2.2.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gmic/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/7d5z4y0x7ky7j3pk5pfswlbalv3wfg62-gmic-2.2.1/bin/gmic --version` and found version 2.2.1
- ran `/nix/store/7d5z4y0x7ky7j3pk5pfswlbalv3wfg62-gmic-2.2.1/bin/gmic version` and found version 2.2.1
- found 2.2.1 with grep in /nix/store/7d5z4y0x7ky7j3pk5pfswlbalv3wfg62-gmic-2.2.1
- directory tree listing: https://gist.github.com/1ee00489ce101a45c1c33912ab4c43c0
2018-03-31 10:09:29 -07:00
R. RyanTM
dc27c397e0 icoutils: 0.32.2 -> 0.32.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/icoutils/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/extresso -h` got 0 exit code
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/extresso --help` got 0 exit code
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/extresso --version` and found version 0.32.3
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/genresscript -h` got 0 exit code
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/genresscript --help` got 0 exit code
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/genresscript help` got 0 exit code
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/genresscript -V` and found version 0.32.3
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/genresscript -v` and found version 0.32.3
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/genresscript --version` and found version 0.32.3
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/genresscript version` and found version 0.32.3
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/genresscript help` and found version 0.32.3
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/icotool --help` got 0 exit code
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/icotool --version` and found version 0.32.3
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/icotool --help` and found version 0.32.3
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/wrestool --help` got 0 exit code
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/wrestool --version` and found version 0.32.3
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/wrestool --help` and found version 0.32.3
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/.genresscript-wrapped -h` got 0 exit code
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/.genresscript-wrapped --help` got 0 exit code
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/.genresscript-wrapped help` got 0 exit code
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/.genresscript-wrapped -V` and found version 0.32.3
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/.genresscript-wrapped -v` and found version 0.32.3
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/.genresscript-wrapped --version` and found version 0.32.3
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/.genresscript-wrapped version` and found version 0.32.3
- ran `/nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3/bin/.genresscript-wrapped help` and found version 0.32.3
- found 0.32.3 with grep in /nix/store/9h7cpd3qsaklbxsqvw7s4r9vl07f6pj3-icoutils-0.32.3
- directory tree listing: https://gist.github.com/b0d187c96c8551d0d9c33805a2e38645
2018-03-31 08:02:44 -07:00