3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

9356 commits

Author SHA1 Message Date
obadz b7731e446a network-manager/l2tp: replace patch by substitutions to simplify upgrades 2016-06-22 02:33:39 +01:00
obadz 9191f09c05 network-manager/pptp: replace patch by substitutions to simplify upgrades 2016-06-22 02:33:39 +01:00
Michiel Leenaars f125db1c60 unbound: 1.5.8 -> 1.5.9 2016-06-21 23:22:18 +02:00
Wout Mertens c26bbf0b87 coreutils: single binary build 2016-06-21 22:14:10 +02:00
Silvio Frischknecht cffec6292a ibus: fix #16292
set GDK_PIXBUF_MODULE_FILE instead of prefixing it
2016-06-21 20:57:51 +02:00
Tristan Helmich 571c134613 graylog: 2.0.2 -> 2.0.3 2016-06-21 17:32:33 +02:00
Bjørn Forsman 6536804848 autorevision: init at 1.14
A shell script for extracting revision information useful in
release/build scripting from repositories.
2016-06-21 15:23:34 +02:00
Edward Tjörnhammar f3950f712f
i2pd: 2.7.0 -> 2.8.0
Signed-off-by: Edward Tjörnhammar <ed@cflags.cc>
2016-06-21 15:03:59 +02:00
wrb 22a7f3a849 youtube-dl: 2016.05.21.2 -> 2016.06.19.1 (#16338) 2016-06-21 13:12:36 +02:00
Peter Hoeg 31a88b4664 togglesg-download: 2016-02-08 -> 2016-05-31 2016-06-21 15:33:38 +08:00
Gabriel Ebner e5740b2e8e Merge pull request #16378 from vrthra/screen
screen: 4.3.1 -> 4.4.0
2016-06-21 07:51:00 +02:00
Kranium Gikos Mendoza 28fc4871f5 aria2: 1.23.0 -> 1.24.0 2016-06-21 09:44:23 +08:00
Eric Litak 5d3ace24e9 dislocker: init at 0.6.1 2016-06-20 16:58:21 -07:00
Rahul Gopinath 64260e70f2 screen: 4.3.1 -> 4.4.0
Removed the patches which were specific to 4.3, and redundant configure flags
The darwin specific utmp patch seems to have been accepted too, with
`u->ut_time = now` the default.
2016-06-20 15:24:32 -07:00
obadz c8d3b166f5 network-manager/l2tp: add workaround for https://github.com/xelerance/xl2tpd/issues/108 2016-06-20 21:41:59 +01:00
Gabriel Ebner cbb0effa6e wget: 1.17.1 -> 1.18
Fixes #16368.
2016-06-20 22:15:46 +02:00
Arseniy Seroka f529432ca5 Merge pull request #16349 from telotortium/ssh-ident
ssh-ident: init at 2016-04-21
2016-06-20 22:04:57 +03:00
Gabriel Ebner 14c038dd03 file: 5.25 -> 5.28 2016-06-20 18:23:39 +02:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Ruben Astudillo 4f985377ac hakuneko: 1.3.12 -> 1.4.1 2016-06-19 20:09:27 -04:00
Robert Irelan 222c435996 ssh-ident: init at 2016-04-21
Add ssh-ident package from its GitHub repo. Since there are no version
tags on GitHub, I'm using the date of its most recent commit.
2016-06-19 12:44:46 -07:00
Zack Piper bd1e99a5ed lxd: 2.0.0.rc4 -> 2.0.2 2016-06-19 20:21:03 +01:00
Gabriel Ebner 4099bba676 silver-searcher: 0.31.0 -> 0.32.0 2016-06-19 19:01:03 +02:00
Gabriel Ebner 8f91feb848 vdirsyncer: 0.11.0 -> 0.11.2 2016-06-19 16:49:14 +02:00
zimbatm da253439ed gx: add missing meta 2016-06-19 13:45:16 +01:00
Vladimír Čunát e757404555 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1279790
2016-06-19 12:33:04 +02:00
Aristid Breitkreuz 6163428316 Merge pull request #16271 from zimbatm/gx
Gx
2016-06-18 20:30:03 +02:00
Bjørn Forsman b741df943f system-config-printer: unbreak dbus service (again)
The service file refers to /usr/bin/... instead of a Nix store path.
Fix it.

The original fix was wrongly removed in commit 03353ce6ff
("system-config-printer: 1.3.12 -> 1 5.7"). We can remove this fixup on
the _next_ upstream release.
2016-06-18 17:07:28 +02:00
Tobias Geerinckx-Rice c7879cbc91 Merge pull request #16304 from moretea/scanbd
scanbd: add missing jpeg dependency
2016-06-18 15:52:28 +02:00
obadz 6b02ae3893 pptpd: init at 1.4.0 2016-06-18 02:08:07 +01:00
Maarten Hoogendoorn 4601254c73 scanbd: add missing jpeg dependency 2016-06-17 23:56:47 +02:00
Benno Fünfstück 95b896228d gvolicon: c04cafb -> 31cf770 2016-06-17 11:46:19 +02:00
Sander van der Burg fcf72b82ae DisnixWebService: 0.5 -> 0.6 2016-06-17 08:15:32 +00:00
Sander van der Burg 16bbfe893b disnixos: 0.4.1 -> 0.5 2016-06-16 22:16:55 +00:00
Sander van der Burg b4315e523f disnix: 0.5 -> 0.6 2016-06-16 21:01:45 +00:00
Arseniy Seroka ee412a775b Merge pull request #16274 from kirelagin/bonniepp
bonnie++: upgrade to 1.97 and make it work on OS X
2016-06-16 22:24:41 +03:00
Tobias Geerinckx-Rice 723439564f
zstd: 0.6.1 -> 0.7.0
Changes: https://github.com/Cyan4973/zstd/releases/tag/v0.7.0
2016-06-16 21:20:00 +02:00
Kirill Elagin 17b19977cf bonnie++: upgrade to 1.97
Also a patch with some OS X specific changes (stolen from Homebrew).
2016-06-16 19:49:46 +03:00
Sander van der Burg c5faa7c83d dysnomia: 0.5.1 -> 0.6 2016-06-16 15:45:50 +00:00
Nahum Shalman 0060a0f3df shfmt: 2016-06-15 -> 2016-06-16 (#16272)
Among other improvements the author fixed mvdan/sh#13
2016-06-16 15:05:24 +01:00
Joachim Fasting c05271adf9
nix-serve: fix meta eval
Introduced in d20a8ddea8
2016-06-16 15:54:29 +02:00
Allen Nelson d20a8ddea8
nix-serve: set PATH
joachifm: also set `dontBuild = true`; `false` doesn't make any sense if
the intent is to skip the build phase.

Closes #16221
2016-06-16 15:00:04 +02:00
Vladimír Čunát 7a6ec0a0ee texlive: add xindy binary
Fixes #16207.
2016-06-16 12:53:51 +02:00
Joachim Fasting 1265acc201 Merge pull request #16248 from leenaars/eotutils
eot-utilities: init -> 1.1
2016-06-16 10:57:06 +02:00
Moritz Ulrich e72282be84 Merge pull request #16052 from dvc94ch/rust-cross
Rust and cargo improvements
2016-06-16 09:42:23 +02:00
Benjamin Staffin 52c7f863c2 Merge pull request #16247 from cerana/shfmt
Add new package "shfmt"
2016-06-16 01:41:05 -04:00
Benjamin Staffin 68689f4d8e hiera-eyaml: init at 2.1.0 2016-06-15 20:19:06 -04:00
Nahum Shalman d624b02e1e Add new package "shfmt" 2016-06-16 00:18:15 +00:00
zimbatm 996a2b54c4 gx-go: init at 20160611 2016-06-15 22:41:29 +01:00
Michiel Leenaars bfec40d416 eot-utilities: init -> 1.1 2016-06-15 22:15:32 +02:00
Michiel Leenaars d56850dd49 e2tools: init -> 0.0.16 2016-06-15 16:22:03 +02:00
David Craven 54f80775cb rust: Refactoring of rust and cargo packages 2016-06-15 12:47:13 +02:00
rushmorem c4435493aa lizardfs: init at 3.9.4
LizardFS is a highly reliable, scalable and efficient distributed file
system.
2016-06-15 04:23:44 +02:00
Joachim Fasting d27006b82b
dnscrypt-wrapper: 0.2 -> 0.2.1 2016-06-14 14:22:18 +02:00
Edward Tjörnhammar efb519d2f4
i2pd: 2.6.0 -> 2.7.0 2016-06-14 12:28:27 +02:00
Luca Bruno 63b2bf108d Merge pull request #16224 from aneeshusa/enable-multiple-outputs-for-tmux
tmux: enable multiple outputs
2016-06-14 10:57:18 +02:00
Christian Lask 4e59526bf4 rofi-pass: 1.3.1 -> 1.3.2
Note: You'll need to add the `_rofi` command to your config of rofi-pass
to make this release work. Refer to config.example for an example of
how this might look like. For more information on this change, see
75cf715158.
2016-06-14 10:07:59 +02:00
Tobias Geerinckx-Rice ff04cf2522
gparted: 0.26.0 -> 0.26.1
Key changes include:
- Ensure boot loaders work on ext4 < 16 TiB by using 32bit feature
- Fix core dump crash in OperationDelete::get_partition_new()

More: https://sourceforge.net/projects/gparted/files/gparted/gparted-0.26.1/gparted-0.26.1-README.md/view
2016-06-13 19:35:24 +02:00
Joachim Fasting 70c5ab532f Merge pull request #16110 from womfoo/augeas
augeas: 1.2.0 -> 1.5.0
2016-06-13 16:46:08 +02:00
obadz ca17bd0c8a socat: add readline support 2016-06-13 12:09:32 +01:00
Benno Fünfstück 96066935f2 fix build of pngcheck 2016-06-13 01:21:14 +02:00
zimbatm e1a487fa8f gx: init at 20160601 2016-06-12 23:14:42 +01:00
zimbatm f911b7393b Merge pull request #16191 from bendlas/update-i2p
i2p: 0.9.25 -> 0.9.26
2016-06-12 23:11:14 +01:00
zimbatm 61032ce936 Merge pull request #16154 from womfoo/oath-toolkit
oath-toolkit: 2.4.1 -> 2.6.1
2016-06-12 23:10:19 +01:00
Herwig Hochleitner 8b3278b794 i2p: 0.9.25 -> 0.9.26 2016-06-12 21:51:04 +02:00
Tal Walter eacc13a3e6 uif2iso: init at 0.1.7
a program for converting UIF files (Universal Image Format, used by MagicISO)
to uncompressed images depending on the input file type:
ISO, BIN/CUE, MDS/MDF, CCD/IMG/SUB and NRG.
2016-06-12 13:16:14 +03:00
Tobias Geerinckx-Rice 9f266996b4
btrfs-progs: 4.5.3 -> 4.6 2016-06-12 00:28:55 +02:00
Tobias Geerinckx-Rice 1212d921c1
lrzip: 0.621 -> 0.630
Changes: http://ck-hack.blogspot.com/2016/06/lrzip-0630.html
2016-06-12 00:28:55 +02:00
Kranium Gikos Mendoza 1105674352 oath-toolkit: 2.4.1 -> 2.6.1 2016-06-12 04:27:56 +08:00
Aneesh Agrawal 94627e658b tmux: enable multiple outputs 2016-06-11 04:19:32 -04:00
Nikolay Amiantov 4a0ca7d92e grub4dos: enable only on Linux 2016-06-11 03:39:44 +03:00
Nikolay Amiantov 659bea9dda dropbear: disable on Darwin 2016-06-11 03:38:57 +03:00
Nikolay Amiantov 9a1d6fe701 fontforge: 20150824 -> 20160404 2016-06-11 02:43:44 +03:00
Arseniy Seroka bf71761b69 Merge pull request #16083 from matthewbauer/fix-exif-darwin
exif: use libintl on darwin
2016-06-10 21:13:45 +03:00
Rushmore Mushambi 62db274e5b Merge pull request #16104 from rushmorem/update-vault
vault: 0.5.2 -> 0.5.3
2016-06-10 14:48:21 +02:00
Rickard Nilsson 548a136345 google-cloud-sdk: 109.0.0 -> 113.0.0 2016-06-10 09:07:01 +00:00
Rickard Nilsson 656c48f141 opentsdb: 2.1.1 -> 2.2.0 2016-06-10 08:17:20 +00:00
Rok Garbas 5f34b5476b goaccess: 0.9.4 -> 1.0
also there is no need for local variables
2016-06-10 04:33:27 +02:00
Kranium Gikos Mendoza cc05622761 augeas: 1.2.0 -> 1.5.0 2016-06-10 10:23:44 +08:00
Rickard Nilsson 9657844db2 fluentd: 0.12.6 -> 0.14.0 2016-06-10 01:35:39 +00:00
rushmorem 1f99f81d24 vault: 0.5.2 -> 0.5.3 2016-06-10 00:46:26 +02:00
rushmorem 6e709b180e storebrowse: mark broken
`storebrowse` depends on https://code.google.com/archive/p/gosqlite/
which leads to gosqlite.googlecode.com/hg/sqlite which now 404s.
2016-06-09 22:09:07 +02:00
Rushmore Mushambi 83c40ada7e Merge pull request #16017 from kamilchm/rework-go
Rework goPackages
2016-06-09 17:09:13 +02:00
Vladimír Čunát bd458e56b6 Merge #14356: docbook updates 2016-06-09 13:11:53 +02:00
Kamil Chmielewski 8cd1d4cda5 buildGoPackage: use Go 1.6 by default 2016-06-09 13:08:10 +02:00
Kamil Chmielewski 734d152977 buildGo16Packages: fetchgit -> fetchFromGitHub 2016-06-09 13:08:10 +02:00
Kamil Chmielewski bbc37e0eb7 Moving from fetchgit generated by go2nix to fetchFromGitHub where rev is
a tag
2016-06-09 13:08:10 +02:00
Kamil Chmielewski 9683f5751f FIX: deis and gawp shas 2016-06-09 13:08:09 +02:00
Kamil Chmielewski 7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Kamil Chmielewski 6d9b9681f9 ngrok: FIX go-bindata moved to all-packages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski b70c24f1f2 vault: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski 9e273d5b29 consul--template: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski abcec97b1e confd: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski f473582a75 hologram: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski 8bfff0f5a6 i3cat: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski 6909d0e456 vimPlugins: FIX fzf outside goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski e44d38125c s3gof3r: extracted from goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski 93b9ebfde8 ngrok: extracted from goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski a1f3808e2f lxd: extracted from goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski d765026f99 go-upower-notify: extracted from goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski e2e3d8802f go-sct: extracted from goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski ce81a8a65d go-mtpfs: extracted from goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski e5b9d23de7 flannel: extracted from goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski 387246080b mongodb-tools: extracted from goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski dbf48cd10b fzf: application extracted from goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski dfe1064b4e asciinema: top level pkgs extracted from goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski 81f3092e11 Reusing go libs in deis build 2016-06-09 11:21:30 +02:00
Kamil Chmielewski 5c2628a704 When using common deps include only specified packages, not all set 2016-06-09 11:21:30 +02:00
Kamil Chmielewski bfa32800c3 First programs extracted from go-packages: deis and gawp 2016-06-09 11:21:30 +02:00
Jinjing Wang 4bc528ce28 shadowsocks-libev: 2.4.6 -> 2.4.7 2016-06-09 09:51:07 +08:00
Matthew Bauer 2b7b6047a5 exif: use libintl on darwin
fixes #16034
2016-06-08 20:11:03 -05:00
Benno Fünfstück ba09675232 zap: update 2.4.3 -> 2.5.0 2016-06-08 20:21:39 +02:00
obadz ab70ae2edf Merge pull request #15647 from layus/auctex
ktikz: init at 0.10
2016-06-08 17:17:50 +01:00
zimbatm d220132f22 httpie: 0.9.2 -> 0.9.3 (#16067) 2016-06-08 16:38:08 +01:00
Joachim Fasting 8fc6ca75a9
torbrowser: 6.0 -> 6.0.1 2016-06-08 16:51:53 +02:00
Damien Cassou 1048d3ddd3 Merge pull request #16058 from DamienCassou/offlineimap-6.7.0.1
offlineimap: 6.7.0 -> 6.7.0.1
2016-06-08 06:34:53 +02:00
Damien Cassou 2ba759b1e2 offlineimap: 6.7.0 -> 6.7.0.1 2016-06-08 06:22:16 +02:00
Robert Helgesson 584020f181 cloc: 1.66 -> 1.68 2016-06-07 20:58:18 +02:00
obadz ca067ff248 xgeometry-select: remove license field. license is unknown. 2016-06-07 17:56:01 +01:00
obadz d39d085adf xgeometry-select: init at 7e7361e 2016-06-07 14:44:55 +01:00
Joachim Fasting 700ced7d3c Merge pull request #15870 from sirn/tmuxinator-081
tmuxinator: 0.6.9 -> 0.8.1
2016-06-07 14:45:07 +02:00
Joachim Fasting 38ba568634 Merge pull request #16019 from cleverca22/master
toxvpn: update versions and allow systemd to be optional
2016-06-06 23:41:33 +02:00
Tobias Geerinckx-Rice 86f9ead288
exfat: 1.2.3 -> 1.2.4 2016-06-06 22:40:43 +02:00
Tobias Geerinckx-Rice b04e2fab7c
bruteforce-luks: 1.2.0 -> 1.2.1 2016-06-06 21:58:19 +02:00
Tobias Geerinckx-Rice 2b0f12c073
debian-devscripts: 2.16.4 -> 2.16.5 2016-06-06 21:58:19 +02:00
FlorentBecker d7de8bc6e9 patoline: remove (source is unavailable) (#15918) 2016-06-06 10:49:00 +02:00
Luca Bruno 5428a295e6 Merge pull request #15999 from womfoo/duc
duc: 1.3.3 -> 1.4.1
2016-06-06 10:18:31 +02:00
michael bishop e8108e0d22
toxvpn: update versions and allow systemd to be optional 2016-06-06 05:00:15 -03:00
Guillaume Maudoux f3a753829d auctex: enable preview 2016-06-05 18:45:09 +02:00
koral 92471cbc8f rmlint: 2.4.2 -> 2.4.4 2016-06-05 17:33:29 +02:00
koral 179f5e9500 moreutils: 0.58 -> 0.59 2016-06-05 17:14:38 +02:00
Kranium Gikos Mendoza 5016ad645f duc: 1.3.3 -> 1.4.1 2016-06-05 22:00:22 +08:00
aszlig 53bf7e1907
pcsclite: 1.8.16 -> 1.8.17
Upstream changes:

  - Fix SCardEndTransaction() issue with a SCARD_SHARE_EXCLUSIVE
    connection
  - Fix an issue when used with systemd (problem in signal handler)
  - SCardGetAttrib(): set pcbAttrLen when buffer is too small
  - Doxygen: SCardGetAttrib() pbAttr can be NULL
  - Doxygen: SCardGetAttrib() *pcbAttrLen contains the buffer size
  - fix compilation warnings and link errors on SunOS
  - Some other minor improvements

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @viric, @wkennington
2016-06-04 16:40:34 +02:00
aszlig bc877d8bfc
pcsclite: Explicitly set ipcdir
Some libraries using PCSC-Lite still tend to refer to /var/run/pcscd
instead of /run/pcscd, so let's make sure this won't happen.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @viric, @wkennington
2016-06-04 16:38:57 +02:00
aszlig fa559de8af
pcsc-cyberjack: Init at 3.99.5_SP09
It's a driver module for PCSC-Lite, which allows to use the USB readers
from REINER SCT, a reader that is very commonly used in Germany for
online banking and for reading/writing data from/to the national
identity card.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-06-04 16:38:57 +02:00
aszlig 70246d7cfa
pcsclite: Introduce PCSCLITE_HP_DROPDIR env var
This allows to override the directory where PCSC-Lite searches for USB
drivers at runtime and should make our NixOS module much more clean so
that we don't need to imperatively stitch together plugin directories
anymore.

I'm using a GNU extension for the ternary operator to avoid computing
getenv("PCSCLITE_HP_DROPDIR") twice:

https://gcc.gnu.org/onlinedocs/gcc/Conditionals.html#Conditionals

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @viric, @wkennington
2016-06-04 16:38:57 +02:00
Joachim Fasting 4178dbc42c Merge pull request #15842 from romildo/upd.aria2
aria2: 1.22.0 -> 1.23.0, uget: 2.0.5 -> 2.0.8
2016-06-03 18:30:43 +02:00
Georges Dubus a942635724 Merge pull request #15944 from 0w0/openfortivpn_1.0.1_to_1.1.4
openfortivpn: 1.0.1 -> 1.1.4
2016-06-03 16:58:28 +02:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Matthias Beyer 871c4d78e8
diffstat: 1.60 -> 1.61 2016-06-03 16:04:41 +02:00
Matthias Beyer 97e64c3cf5
discount: 2.1.6 -> 2.2.0 2016-06-03 16:04:41 +02:00
Matthias Beyer 5ba49a427b
signing-party: 2.1 -> 2.2 2016-06-03 15:59:50 +02:00
Joachim Fasting 47b1c5368e Merge pull request #15868 from mbakke/less-483
less: 481 -> 483
2016-06-03 15:50:21 +02:00
Joachim Fasting c3a522c054 Merge pull request #15950 from cleverca22/master
runit: fix closure size
2016-06-03 15:45:20 +02:00
Joachim Fasting 07933ad15f
tcpcrypt: 0.3-rc1 -> 0.4, refactoring
- Use `fetchFromGitHub`
- Cleanup build inputs
- meta cleanups
- Strip binaries
- Multiple outputs
2016-06-03 15:43:12 +02:00
michael bishop 85b87796ae
runit: fix closure size 2016-06-03 06:46:54 -03:00
0w0 a26f113611 openfortivpn: 1.0.1 -> 1.1.4 2016-06-03 14:19:52 +08:00
Gabriel Ebner 0e16c80f81 Merge pull request #15915 from ericsagnes/pkg-update/fcitx
fcitx: 4.2.9 -> 4.2.9.1, fix build
2016-06-02 20:53:09 +02:00
Bjørn Forsman fbde3a7452 sam-ba: init at 2.16
Programming tools for Atmel SAM3/7/9 ARM-based microcontrollers.

(I've only runtime tested the 64-bit binary, not the 32-bit one.)
2016-06-02 12:44:35 +02:00
Eric Sagnes 098c58cac8 fcitx: 4.2.9 -> 4.2.9.1, fix build 2016-06-02 11:01:56 +09:00