3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

10674 commits

Author SHA1 Message Date
Tim Steinbach 5678d86ab2 Merge pull request #19786 from KaiHa/nitrokey-0.5.1
nitrokey-app: 0.4.0 -> 0.5.1
2016-10-22 19:22:06 -04:00
Bram Duvigneau f1d45add3b brltty: 5.2 -> 5.4 2016-10-22 22:03:45 +00:00
Kai Harries 0ef41e5477 nitrokey-app: 0.4.0 -> 0.5.1 2016-10-22 22:28:27 +02:00
Domen Kožar 5e28dcc502 amazon-glacier-cmd-interface: init at 2016-09-01 2016-10-22 21:51:25 +02:00
Joachim Fasting 0c0801e9c4
unbound: 1.5.9 -> 1.5.10
Fixes a fair number of bugs, see https://www.unbound.net/download.html.

Also use https for meta.homepage.
2016-10-22 20:47:11 +02:00
Frederik Rietdijk e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Frederik Rietdijk 9475510027 duplicity: use python2 2016-10-22 16:47:22 +02:00
Tim Steinbach bf46b99402 Merge pull request #19740 from NeQuissimus/statsd_0_8_0
statsd: 0.7.2 -> 0.8.0
2016-10-21 09:17:26 -04:00
Peter Hoeg cbec6a304a vmfs-tools: init at 2016-01-16 2016-10-21 13:08:00 +03:00
Tim Steinbach 2bc237ebe2
statsd: 0.7.2 -> 0.8.0 2016-10-20 17:35:03 -04:00
Graham Christensen 4d10b58cc1 Merge pull request #19730 from aneeshusa/fix-openssh-CVE-2016-8858
openssh: Patch CVE-2016-8858
2016-10-20 17:12:43 -04:00
Vladimír Čunát 4d5b893002 Merge #19081: gnome-3.22
Also master commits are brought in.
2016-10-20 23:04:10 +02:00
Aneesh Agrawal 7374105a96 openssh: Patch CVE-2016-8858
Also add myself as a maintainer.
2016-10-20 14:55:14 -04:00
Tim Steinbach fa82166070 Merge pull request #19689 from aycanirican/ssldump
ssldump: init at 09b3
2016-10-20 13:20:30 -04:00
Hans-Christian Esperer 3b96bfd1c6 Works only under linux 2016-10-20 16:35:58 +02:00
Hans-Christian Esperer 510111a1c3 fpm2: init at 0.79 2016-10-20 15:06:31 +02:00
Philipp 5c3a6d6802 Added package for dehydrated. (#19651)
* Added package for dehydrated.
2016-10-20 13:32:05 +02:00
Jörg Thalheim 09d736d8e9 Merge pull request #19693 from aske/nixops-python2
nixops: explicitly specify python2
2016-10-20 11:01:27 +02:00
Pascal Wittmann 24c3271e39 Merge pull request #17554 from KaiHa/master
nitrokey-app: init at 0.4.0
2016-10-20 07:55:05 +02:00
Kai Harries c43243f085 nitrokey-app: add kaiha as maintainer 2016-10-20 07:15:45 +02:00
Stefan Götz 985a25e99e youtube-dl: 2016.10.16 -> 2016.10.19 2016-10-19 20:26:50 +02:00
Sergiu Ivanov 45459c1c27 bibtex2html: init at 1.98 2016-10-19 19:24:09 +02:00
Robert Helgesson 31853a73fa
svtplay-dl: 1.6 -> 1.7 2016-10-19 17:53:08 +02:00
Kirill Boltaev 0c34b202e3 nixops: explicitly specify python2 2016-10-19 18:51:44 +03:00
Aycan iRiCAN fe41a8560b ssldump: init at 09b3 2016-10-19 14:15:42 +00:00
Joachim F 7b4a9cd5f3 Merge pull request #19657 from romildo/upd.cmst
cmst: 2016.04.03 -> 2016.10.03
2016-10-19 05:24:26 +02:00
Frederik Rietdijk 0e3b5834c0 glusterfs: use python2
configure reports that only python2 is supported.
2016-10-18 23:16:09 +02:00
Frederik Rietdijk 6b724f069b cli53: use python2 2016-10-18 23:16:07 +02:00
Frederik Rietdijk 582ab2cf4e koji: use python2 2016-10-18 23:16:07 +02:00
Frederik Rietdijk b08c00f67d dblatex: use python2 2016-10-18 23:16:07 +02:00
Frederik Rietdijk cf66e2feab parted: use python2 2016-10-18 23:16:06 +02:00
Frederik Rietdijk 509ef439ac ceph: use python2
print statement
2016-10-18 23:16:04 +02:00
Frederik Rietdijk b33d3cca02 ecryptfs: use python2
print statement
2016-10-18 23:16:04 +02:00
Aneesh Agrawal 1d9a98cae0 salt: use Python 2 2016-10-18 23:14:36 +02:00
Frederik Rietdijk 78f46d23fe knockknock: use python2 2016-10-18 23:14:36 +02:00
Frederik Rietdijk 727fcd3d2b httpstat: fix it 2016-10-18 23:14:36 +02:00
Frederik Rietdijk af11ff4cdd gitfs: use python2 2016-10-18 23:14:35 +02:00
Frederik Rietdijk 0389aa9f7d getmail: use python2 2016-10-18 23:14:35 +02:00
Frederik Rietdijk f7b983aeaf grin: use python2 2016-10-18 23:14:33 +02:00
romildo bcca1cf326 aria2: 1.27.1 -> 1.28.0 2016-10-18 17:47:39 -02:00
romildo 5a049dfc15 cmst: 2016.04.03 -> 2016.10.03 2016-10-18 15:31:51 -02:00
Graham Christensen 3268f423df Merge pull request #19634 from joachifm/tor-2_8_9
tor: 0.2.8.8 -> 0.2.8.9
2016-10-18 07:02:28 -04:00
Graham Christensen 8df7a31498 Merge pull request #19642 from asymmetric/youtube-dl
youtube-dl: 2016.10.07 -> 2016.10.16
2016-10-18 06:58:32 -04:00
Lorenzo Manacorda beebf04710 youtube-dl: 2016.10.07 -> 2016.10.16 2016-10-18 10:45:20 +02:00
michael bishop 153ff5a69a
ipxe: allow usage of preConfigure again, and add a simpler way to extend the options 2016-10-18 02:18:52 -03:00
Joachim Fasting b3ffc580ec
tor: 0.2.8.8 -> 0.2.8.9
Fixes a security hole that could be exploited for a denial of service
attack against a tor client, relay, hidden service, or authority [1].

[1]: https://trac.torproject.org/projects/tor/ticket/20384
2016-10-18 00:44:41 +02:00
Nikolay Amiantov ed12afd1f9 Merge pull request #19586 from aske/uniemoji
ibus-engines.uniemoji: 2016-09-20 -> 0.6.0
2016-10-18 02:41:54 +04:00
Joachim F ac3fb8389c Merge pull request #19598 from nfjinjing/shadowsocks-libev
shadowsocks-libev: 2.5.0 -> 2.5.5
2016-10-17 22:32:48 +02:00
Thomas Tuegel 953fd050c0 Merge pull request #19621 from peterhoeg/peruse
peruse: init at 1.1
2016-10-17 09:17:38 -05:00
Peter Hoeg 2a4098d74c peruse: init at 1.1
Includes kirigami at 1.1.0
2016-10-17 20:50:12 +08:00
Chris Darnell e21f858922 screenFetch: 2016-01-13 -> 2016-10-11 2016-10-16 19:07:49 -04:00
Jinjing Wang 29191da7a0 shadowsocks-libev: 2.5.0 -> 2.5.5 2016-10-16 22:41:50 +08:00
Tim Steinbach 641fbb2140 Merge pull request #19596 from schneefux/httpie
httpie: 0.9.3 -> 0.9.6
2016-10-16 10:11:25 -04:00
schneefux 92487043ae
httpie: 0.9.3 -> 0.9.6 2016-10-16 15:44:29 +02:00
Kirill Boltaev 51dd34f103 ibus-engines.uniemoji: 2016-09-20 -> 0.6.0 2016-10-16 01:42:09 +03:00
Alexander Ried 4094d63dea NetworkManager-strongswan: init at 1.4.0 2016-10-15 20:32:16 +02:00
Graham Christensen bd2ad683d3 Merge pull request #19483 from RamKromberg/fix/a2ps
a2ps: fix build
2016-10-15 13:18:29 -04:00
derchris 9624080e86 bareos: 15.2.1 -> 15.2.4 2016-10-15 11:46:57 +02:00
zimbatm cdbb020a1f fixes bundlerEnv calls 2016-10-14 16:56:42 +01:00
Franz Pletz 8f794cd6b8
zfstools: 0.3.3 -> 0.3.6 2016-10-14 17:34:34 +02:00
Eelco Dolstra 811b876fab Revert "openssl, curl, git: Respect $NIX_SSL_CERT_FILE"
This reverts commit 942dbf89c6. Sorry,
this was supposed to go to staging instead of master...
2016-10-14 16:01:54 +02:00
Tim Steinbach 2cfe0407b8 Merge pull request #19545 from derchrisuk/netdata
netdata: 1.0.0 -> 1.4.0
2016-10-14 09:27:13 -04:00
Vladimír Čunát 061758490f Merge branch 'master' into staging
... to get the openssl mass rebuild: 942dbf89c.
2016-10-14 13:16:11 +02:00
zimbatm 6351c4d24b Merge pull request #19180 from zimbatm/bundler-env-bins
Bundler env bins
2016-10-14 11:51:23 +01:00
Nikolay Amiantov 7619bea1fe Merge pull request #19544 from kamilchm/blueman
blueman: hicolor_icon_theme dependency
2016-10-14 14:34:50 +04:00
Eelco Dolstra 942dbf89c6 openssl, curl, git: Respect $NIX_SSL_CERT_FILE
$NIX_SSL_CERT_FILE overrides $SSL_CERT_FILE, which in turn overrides
the default CA path (/etc/ssl/certs/ca-certificates.crt). This allows
Nix to set a CA path without interfering with other packages (such as
Homebrew).

See https://github.com/NixOS/nix/issues/921.
2016-10-14 12:06:10 +02:00
derchris 0acd3b3b42 netdata: 1.0.0 -> 1.4.0 2016-10-14 12:05:42 +02:00
Kamil Chmielewski 745b659481 blueman: hicolor_icon_theme dependency 2016-10-14 12:03:04 +02:00
Vladimír Čunát 027efec879 Merge staging without python splitting for now
The split needs more time to finish rebuilding,
but the rest seems OK and there are security fixes.
2016-10-14 09:24:21 +02:00
Vladimír Čunát 6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Franz Pletz c766c7f095
fastd: fix meta.platforms typo 2016-10-14 00:02:30 +02:00
Tuomas Tynkkynen c66124e9b7 sshpass: 1.05 -> 1.06 2016-10-14 00:58:07 +03:00
Jörg Thalheim 13ff831440 Merge pull request #19524 from nshalman/shfmt-0.2.0
shfmt: 2016-06-16 -> 0.2.0
2016-10-13 22:22:34 +02:00
Frederik Rietdijk efb6052f40 Python: fixup modules that were removed 2016-10-13 22:11:30 +02:00
Franz Pletz 29bd3898a6
fastd: init at 18 2016-10-13 21:42:17 +02:00
Nahum Shalman 94cf6fbc35 shfmt: 2016-06-16 -> 0.2.0 2016-10-13 15:24:39 -04:00
Frederik Rietdijk cffdffe1f6 Merge pull request #19309 from FRidh/outputs
Python: use separate output for tkinter
2016-10-13 10:40:14 +02:00
Vladimír Čunát 727fc259d6 Merge branch 'master' into staging 2016-10-13 09:53:16 +02:00
Dan Peebles f35ab9c2f8 rpm-ostree: 2016.1 -> 2016.10
This also updates a bunch of its dependencies to enable the update,
and gets rid of libhif because upstream stopped maintaining it as
such, instead using it internally in other projects until they can
agree on an interface for it. Nothing seemed to be using libhif so
I'm not too concerned about removing it.
2016-10-12 20:31:02 +00:00
Tim Steinbach d313a114f1 Merge pull request #19488 from peterhoeg/mysqltuner
mysqltuner: init at 1.6.18
2016-10-12 12:41:08 -04:00
Peter Hoeg 7849677a70 mysqltuner: init at 1.6.18 2016-10-12 21:26:53 +08:00
Lorenzo Manacorda ff4fde36b7 youtube-dl: 2016.09.27 -> 2016.10.07 (#19476) 2016-10-12 13:29:33 +02:00
Ram Kromberg 1b0163ea16 a2ps: fix build 2016-10-12 14:15:21 +03:00
Frederik Rietdijk f3c6236eb4 Merge pull request #19442 from peterhoeg/lc
linkchecker: make it work with newer requests2
2016-10-12 10:21:29 +02:00
Jascha Geerds 30a3a09857 tmuxp: 1.2.0 -> 1.2.2 2016-10-11 23:53:02 +02:00
Vladimír Čunát 6898810ba6 Merge #19297: openssh: apply patch to fix vulnerability
NEWKEYS null pointer dereference.
2016-10-11 20:08:30 +02:00
Profpatsch fa5d919ae9
man-db: wrap groff instead of compiling in
Some manpages, e.g. `systemd.time` were broken in a way that they
were rendered from the beginning after part of the page, and then only
lasted for maybe a third of their length.

So we just add groff in the wrapper instead of the configure phase like
every other distribution seems to do, and that fixes it.
Patch by @Mic92.

Fixes #19323.
2016-10-11 18:34:36 +02:00
Profpatsch bef6bef0d2
stdenv/stripHash: print to stdout, not to variable
`stripHash` documentation states that it prints out the stripped name to
the stdout, but the function stored the value in `strippedName`
instead.

Basically all usages did something like
`$(stripHash $foo | echo $strippedName)` which is just braindamaged.
Fixed the implementation and all invocations.
2016-10-11 18:34:36 +02:00
Robert Helgesson 7b3073e8fa
svtplay-dl: 1.5 -> 1.6 2016-10-11 15:52:24 +02:00
Alexander Ried bbb2f64588 tinc: 1.0.28 -> 1.0.29 (#19444) 2016-10-11 12:57:00 +02:00
Peter Hoeg b120ef422c linkchecker: make it work with newer requests2
linkchecker has an odd version check for requests2 that fails on
versions > 2.9.x.

We patch out the check as we are providing a recent requests2. This
patch should be dropped when linkchecker >v9.3 is released.

We now also run the tests although I had to remove one failing test.
Yes, that's covering up the issue but we're still better off than
before.
2016-10-11 11:02:52 +08:00
Sander van der Burg b44e79e240 lhasa: init at 0.3.1 2016-10-10 20:48:00 +00:00
Jörg Thalheim 6f389da98d Merge pull request #19399 from sternenseemann/master
Add libgee_0_8 and valadoc-unstable
2016-10-10 11:52:33 +02:00
Frederik Rietdijk 104c50dd1a Python: remove modules and pythonFull 2016-10-10 10:33:24 +02:00
Alexander Ried 9f0dffa84e networkmanagerapplet: 1.2.2 -> 1.4.2
Needs ModemManager for configuration of WWAN and jansson for
team configuration editing.
2016-10-10 09:42:59 +02:00
Alexander Ried 2117769601 modemmanager: 1.4.6 -> 1.6.2
Now supports systemd resume
2016-10-10 09:42:59 +02:00
Alexander Ried 1fa0a69fc2 networkmanager_openvpn: 1.2.2 -> 1.2.6 2016-10-10 09:42:59 +02:00
Alexander Ried 6bdf707641 networkmanager_vpnc: 1.2.2 -> 1.2.4 2016-10-10 09:42:59 +02:00
Alexander Ried 6f8a8fd9d4 networkmanager_pptp: 1.2.2 -> 1.2.4 2016-10-10 09:42:59 +02:00
Alexander Ried f9aa64a6c4 networkmanager_openconnect: no update 2016-10-10 09:42:59 +02:00
Alexander Ried 8f631f575c networkmanager: 1.2.2 -> 1.4.2 2016-10-10 09:42:59 +02:00
Jörg Thalheim 905239db28 Merge pull request #18868 from RonnyPfannschmidt/enpass
enpass: init at 5.3.0
2016-10-10 07:56:56 +02:00
sternenseemann 3fb2993cb3 maintainers: rename lukasepple according to github account name 2016-10-09 22:04:22 +02:00
Jörg Thalheim c40b3e55e7 Merge pull request #19373 from rnhmjoj/afpfs
afpfs-ng: init at 0.8.2
2016-10-09 21:12:59 +02:00
rnhmjoj 8546928f69
afpfs-ng: init at 0.8.2 2016-10-09 20:13:49 +02:00
jhhuh 89cbb88d26 bup-0.28.1: fix on darwin, upstream released patch removed 2016-10-09 16:54:51 +02:00
Robin Gloster e904bb4871
nixbot: init at unstable-2016-10-09 2016-10-09 15:05:02 +02:00
Ronny Pfannschmidt 98895f5b67 enpass: init at 5.3.0 2016-10-09 13:16:50 +02:00
Robin Gloster 8d317336ef
sslscan: use fetchFromGitHub 2016-10-09 12:52:02 +02:00
Jörg Thalheim 5275d07fea Merge pull request #19357 from NeQuissimus/httpstat
httpstat: init at 1.2.0
2016-10-09 11:28:31 +02:00
Tim Steinbach 26f75f7d31
httpstat: init at 1.2.0 2016-10-08 18:48:04 -04:00
zimbatm aa01863858 asciidoctor: simplify 2016-10-08 22:38:57 +01:00
zimbatm 0f6e3a3cde lolcat: simplify 2016-10-08 22:38:57 +01:00
zimbatm a4506d9b7a fluentd: simplify 2016-10-08 22:38:57 +01:00
zimbatm 16cf3cf687 fpm: simplify 2016-10-08 22:38:57 +01:00
zimbatm 1657d28895 hiera-eyaml: simplify 2016-10-08 22:38:56 +01:00
zimbatm 194ac466ee foreman: simplify 2016-10-08 22:38:56 +01:00
Jörg Thalheim 2d9148dc8a Merge pull request #17815 from juliendehos/zimreader_tntnet221
zimreader: update for using tntnet-2.2.1 ?
2016-10-08 23:17:12 +02:00
Julien Dehos 5ddf7e0f10 zimreader: update for using tntnet-2.2.1 2016-10-08 16:55:07 +02:00
Franz Pletz fa405aa264 bind: split out dnsutils & host binaries (#18903)
These tools are commonly used but don't require the other bind binaries.
Bind's libs are used, so they've also been split into an extra output.

The old version of host isn't maintained anymore and was removed From Debian
back in 2009: https://packages.qa.debian.org/h/host.html
2016-10-08 16:01:15 +02:00
Graham Christensen a72dd11b3e Merge pull request #19341 from grahamc/sudolikeaboss
sudolikeaboss: init at 0.2.1
2016-10-08 08:52:02 -04:00
Profpatsch bc8733aae6 geteltorito: switch to upstream dist (#19226)
Upstream has now a versioned release, so we switch over from the github
mirror.
2016-10-08 13:52:22 +02:00
Peter Hoeg 56c9c71f13 f2fs-tools: 1.6.1 -> 1.7.0 (#19352) 2016-10-08 13:44:58 +02:00
Damien Cassou 225cc1c106
vdirsyncer: 0.11.3 -> 0.13.1
vdirsyncer > 0.13.0 does not support python 2 anymore.
https://github.com/pimutils/vdirsyncer/blob/master/CHANGELOG.rst#version-0130
2016-10-08 09:15:11 +02:00
Chris Darnell 4358c1660e xtitle: 0.2 -> 0.3 (#19351) 2016-10-08 07:11:41 +02:00
Graham Christensen 969cffca97
sudolikeaboss: init at 0.2.1 2016-10-07 22:19:33 -04:00
Graham Christensen 1dcfa0df6a Merge pull request #19336 from DamienCassou/umlet-14.2
umlet: 13.3 -> 14.2
2016-10-07 17:51:26 -04:00
Damien Cassou 79f6563000
umlet: 13.3 -> 14.2 2016-10-07 20:59:56 +02:00
Michael Weiss 8d17e63465 lf: init at 2016-10-02
Add the package "lf" (as in "list files") at version 2016-10-02
(nightly) under the category "tools/misc", add it to the top-level
package collection and set myself as the maintainer.

I have tested this package under NixOS and Gentoo+Nix.
2016-10-07 14:07:46 +02:00
Bjørn Forsman 3f7d2f72e7 gmvault: 1.8.1-beta -> 1.9.1
Adds support for OAuth2 (among other things).
2016-10-06 23:52:33 +02:00
Hendrik Schaeidt d6d12ebc55
openvpn: disable libpam support on OSX to enable build 2016-10-06 20:24:02 +02:00
Thomas Tuegel 2e255a2edd
Merge branch 'staging' 2016-10-06 09:51:02 -05:00
Graham Christensen 83a8cb1dc2
openssh: apply patch to fix https://bugzilla.redhat.com/show_bug.cgi?id=1380296 2016-10-06 08:54:10 -04:00
Michael Weiss 8268f0a759 pgpdump: init at v0.31
Add the package "pgpdump" at version v0.31 under the category
"tools/security", add it to the top-level package collection and set
myself as the maintainer (I added myself to lib/maintainers.nix).

I have tested this package under NixOS and Gentoo+Nix.
2016-10-06 03:17:01 +02:00
Robin Gloster cd1ec18b42 thin-provisioning-tools: init at 0.6.3 (#19268) 2016-10-05 20:28:28 +02:00
Vladimír Čunát 07d12fbef1 fontforge: get rid of output hash depending on git
... to avoid git changes being mass rebuilds.
Thanks to Mic92 for the solution idea.
See discussion under: https://github.com/NixOS/nixpkgs/pull/19248
2016-10-05 19:04:03 +02:00
Vladimír Čunát 30f551d8b2 Merge branch 'master' into staging 2016-10-05 19:02:48 +02:00
Bjørn Forsman 1021797201 languagetool: fix eval 2016-10-05 17:04:50 +02:00
Graham Christensen 78b5ce35ce Merge pull request #19200 from vbgl/asymptote-on-darwin
asymptote: fix build on Darwin
2016-10-05 09:19:35 -04:00
Edward Tjörnhammar e4bdbfc247
languagetool: init at 3.5 2016-10-05 15:11:20 +02:00
Thomas Tuegel d067b7bd35
Merge branch 'kde-5' into staging 2016-10-04 21:50:17 -05:00
Joachim F 65aa53fbed Merge pull request #18495 from yshui/master
Add new input method: fcitx-libpinyin
2016-10-04 22:46:11 +02:00
Michael Raskin 8de1da7ccb mc: 4.8.17 -> 4.8.18 2016-10-04 10:04:33 +02:00
Profpatsch c535924f5f geteltorito: init at 0.6 (#18614) 2016-10-04 04:07:56 +02:00
Nicolas Mattia 86c78073d8 r10k: remove unused docker dependency 2016-10-03 19:50:16 +02:00
Jörg Thalheim 888f6a1280 Merge pull request #19199 from wizeman/u/fix-help2man-hash
help2man: fix hash
2016-10-03 19:26:44 +02:00
Vincent Laporte 3cb65da139 asymptote: fix build on Darwin
No GLUT and no OSMesa
2016-10-03 19:09:56 +02:00
Michael Raskin 5e882ea558 freeipmi: 1.5.3 -> 1.5.4 2016-10-03 17:35:18 +02:00
Eelco Dolstra 69bb34673e Merge pull request #19196 from groxxda/xkbbindir
xserver: replace XKB_BINDIR with compile time option
2016-10-03 17:12:59 +02:00
Jörg Thalheim f3ed2b60a6 Merge pull request #19133 from groxxda/gtkvnc
gtk-vnc: remove gtk2 support, 0.5.3 -> 0.6.0
2016-10-03 16:19:11 +02:00
Alexander Ried e7ded267bd xserver: replace XKB_BINDIR with compile time option
---

Using the configure option relieves us of the patch and passing the path
via the env var in many places. Also the env var may not be inherited
when components like gdm spawn new sessions.
2016-10-03 15:03:02 +02:00
Thomas Tuegel 08aea87297
ibus: refresh cache at startup
Fixes #19134. (Maybe.)
2016-10-03 05:25:41 -05:00
zimbatm 400910c1f7 Merge pull request #19169 from nmattia/r10-add
r10k: init at 2.4.3
2016-10-02 20:50:05 +01:00
Nicolas Mattia e3f4ea02c9 r10k: init at 2.4.3 2016-10-02 21:10:56 +02:00
Jörg Thalheim 3732d1d2c3 pass: add procps dep only on linux (#19165)
fixes #18929
2016-10-02 18:57:42 +02:00
Kai Harries caeb218023 nitrokey-app: init at 0.4.0
Provides extra functionality for the Nitrokey Pro and Storage.

See https://github.com/Nitrokey/nitrokey-app and
https://www.nitrokey.com/download for information about the
nitrokey-app.
2016-10-02 18:43:26 +02:00
Joachim F c81c652940 Merge pull request #19116 from ericsagnes/pkg-update/ibus-table
ibus-table: 1.9.11 -> 1.9.14
2016-10-02 13:34:12 +02:00
Tuomas Tynkkynen 19225bf5cc Merge remote-tracking branch 'upstream/master' into staging 2016-10-02 10:36:47 +03:00
Jörg Thalheim 53e6c610e9
logstash: wrap around logstash-plugin
fixes #19096
2016-10-02 09:33:16 +02:00
Yuxuan Shui 293d1d09ef fcitx: Add fcitx engine libpinyin 2016-10-02 00:36:05 -04:00
Tuomas Tynkkynen f5dd3a703d treewide: Fix more lib.optional misuses 2016-10-02 00:44:10 +03:00
Tuomas Tynkkynen eda2dd3d2f treewide: Fix more 'lib.optional' misuses 2016-10-02 00:44:10 +03:00
Jörg Thalheim 5435f94371
logstash: 2.3.4 -> 2.4.0 2016-10-01 23:18:25 +02:00
Chris Van Vranken d2590d9d9e
logstash: wrapProgram to provide jre at runtime 2016-10-01 23:18:24 +02:00
Tuomas Tynkkynen 5bf5de58ea treewide: Fix 'lib.optional' misuses
These add a singleton list of a package to buildInputs.
2016-10-01 23:38:06 +03:00
Tuomas Tynkkynen c61cc2d56c ssdeep: No need to include patchelf in buildInputs
It's implicitly there on Linux.
2016-10-01 23:15:35 +03:00
Jörg Thalheim 46693bd6e8 Merge pull request #18043 from mogorman/kalibrate-hackrf
kalibrate-hackrf: init at 2016-08-27
2016-10-01 17:44:18 +02:00
Jaka Hudoklin 98a8146428 Merge pull request #19016 from offlinehacker/pkgs/flannel/update/0.6.2
flannel: update, add nixos module, add tests
2016-10-01 17:22:34 +02:00
Alexander Ried da658b98ce gtk-vnc: 0.5.3 -> 0.6.0
gtk3 build is now default
2016-10-01 17:14:31 +02:00
Alexander Ried ecd80b9a0e gtk-vnc: remove gtk2 support (unused) 2016-10-01 17:14:31 +02:00
Jaka Hudoklin eb1377ba30 flannel: 0.5.5 -> 0.6.2 2016-10-01 17:04:25 +02:00
Aneesh Agrawal fcee1d0b28
Remove redundant -DCMAKE_BUILD_TYPE=Release flags
Since commit 183d05a0 in 2012, this is the default.

fixes #18000
2016-10-01 16:13:41 +02:00
Jörg Thalheim 505f8e1c92 Merge pull request #19127 from makefu/update-snapraid
snapraid: 8.1 -> 10.0
2016-10-01 14:32:12 +02:00
makefu 0b6d9734c9
snapraid: 8.1 -> 10.0
enable tests for snapraid
2016-10-01 14:28:53 +02:00
Benno Fünfstück 1bae891e66 burpsuite: init at 1.7.06 2016-10-01 14:27:04 +02:00
Michael Raskin 3c25685ff7 wavefunctioncollapse: init at 0.0pre20160930 2016-10-01 13:47:11 +02:00
Michael Raskin 6546f56e71 syntex: init at 0.0pre20160915 2016-10-01 13:47:11 +02:00
Michael Raskin 3995f280ad convchain: init at 0.0pre20160901 2016-10-01 13:47:11 +02:00
Stefan Götz d49b5cd452 youtube-dl: 2016-09-19 -> 2016-09-27 2016-10-01 12:46:10 +02:00
Eric Sagnes d06566e090 ibus-libpinyin: 1.7.4 -> 1.8.0 2016-10-01 13:43:42 +09:00
Eric Sagnes 084bacd8d9 ibus-table: 1.9.11 -> 1.9.14
release notes:
- https://github.com/kaio/ibus-table/releases/tag/1.9.12
- https://github.com/kaio/ibus-table/releases/tag/1.9.13
- https://github.com/kaio/ibus-table/releases/tag/1.9.14
2016-10-01 12:40:02 +09:00
Jörg Thalheim e499d59bcb Merge pull request #19109 from matthiasbeyer/update-tmux
tmux: 2.2 -> 2.3
2016-09-30 23:02:25 +02:00
Matthias Beyer 65ec5b1dc4 tmux: 2.2 -> 2.3 2016-09-30 17:37:14 +02:00
Thomas Tuegel 65f44f3f3a Merge pull request #19094 from ericsagnes/pkg-update/ibus
ibus: 1.5.13 -> 1.5.14
2016-09-30 09:18:40 -05:00
Rob Vermaas cfd62a1045 dd-agent: D'oh, removing duplicate requests dep.
(cherry picked from commit acf91fd6ef)
2016-09-30 13:24:19 +00:00
Rob Vermaas a98dccf1e4 Fix dd-agent
(cherry picked from commit a6493ce4bd)
2016-09-30 13:15:23 +00:00
Eric Sagnes 9caa721e66 ibus: 1.5.13 -> 1.5.14
release notes: https://github.com/ibus/ibus/releases/tag/1.5.14
2016-09-30 09:57:51 +09:00
Nick Novitski 7650280e8b fzy: 0.4 -> 0.7 2016-09-29 18:31:40 +02:00
Jörg Thalheim 4d0ae0e754 Merge pull request #18980 from MostAwesomeDude/gcsfuse
gcsfuse: init at v0.19.0
2016-09-29 16:55:07 +02:00
Corbin 3f61b437ef gcsfuse: Don't depend on fuse. 2016-09-29 07:48:03 -07:00
Eelco Dolstra 518340624d Merge remote-tracking branch 'origin/master' into staging 2016-09-29 13:06:14 +02:00
Eelco Dolstra 9354e0e518 glxinfo: Drop dependency on mesa-noglu.dev and glu.dev 2016-09-29 13:05:29 +02:00
Frederik Rietdijk 74e3793300 Merge pull request #19025 from mbbx6spp/update-lastpass-cli-to-1.0.0
lastpass-cli: 0.9.0 -> 1.0.0
2016-09-29 09:45:25 +02:00
Frederik Rietdijk 33b3bd6b36 Merge pull request #18963 from rycee/package/xdxf2slob
Add xdxf2slob tool and dependencies
2016-09-29 09:08:53 +02:00
Corbin 1819d941b0 Address code review feedback. 2016-09-28 21:47:48 -07:00
Benno Fünfstück 4c493a32f9 ripgrep: update 0.1.17 -> 0.2.1 2016-09-29 00:51:14 +02:00
Tuomas Tynkkynen 633fb08a9a Merge pull request #19036 from makefu/init-mergerfs
mergerfs: init at 2.16.1
2016-09-28 23:27:43 +03:00
makefu 2960aa7f1b
mergerfs: init at 2.16.1 2016-09-28 22:17:57 +02:00
Joachim Fasting 10be782f25
connman: meta cleanup 2016-09-28 20:01:37 +02:00
Peter Simons 7c7e88b45e Merge pull request #19046 from rycee/bump/bash-completion
Bump bash completion to 2.4
2016-09-28 18:39:24 +02:00
Joachim F c166675b53 Merge pull request #19033 from makefu/init-wol
wol: init at 0.7.1
2016-09-28 18:00:39 +02:00
Robert Helgesson e8817a2d20
bash-completion: change attribute name
This changes the attribute name of bash-completion from `bashCompletion`
to `bash-completion`. Keeps `bashCompletion` as an alias for the new
name.
2016-09-28 17:46:29 +02:00
Vladimír Čunát 77604964b6 Merge branch 'master' into staging 2016-09-28 17:13:59 +02:00
Robert Helgesson d945046be9
xdxf2slob: init at 2015-06-30 2016-09-28 15:58:59 +02:00
makefu 36e0aedae7
f3: init at 6.0 2016-09-28 13:31:27 +02:00
makefu 16547d49da
wol: init at 0.7.1
wol, unlike wakelan, supports wake-on-lan passwords
2016-09-28 12:33:46 +02:00
Franz Pletz d5adf2cc0b
dhcp: 4.3.3 -> 4.3.4
Uses shipped version of libbind now.

Fix CVE-2016-2774 & CVE-2015-8605.

cc #18856
2016-09-28 10:50:29 +02:00
Susan Potter 87ffa1cea0 lastpass-cli: 0.9.0 -> 1.0.0 2016-09-27 21:35:41 -05:00
Graham Christensen dad5651bd4
rpm: 4.12.0 -> 4.13.0-rc1 for CVEs
Null pointer deref & out of bound reads. See: https://lwn.net/Vulnerabilities/685287/

Fedora is shipping the rc1 as well.

re: https://github.com/NixOS/nixpkgs/pull/18975
2016-09-27 21:07:35 -04:00
Alexey Shmalko 4dd6d9748c Merge pull request #18774 from cstrahan/xsel-update
xsel: 1.2.0 -> git-2016-09-02
2016-09-28 00:42:05 +03:00
Franz Pletz a6d4ea4c2c
treewide: remove executable flags from .nix files 2016-09-27 22:15:00 +02:00
Aneesh Agrawal 7b7d8ddbca salttesting: remove unused package
It was added as a dependency of Salt, which no longer depends on it.
2016-09-27 13:34:22 -04:00
aszlig 900a04e6c9
beets: Use pythonPackages.buildPythonApplication
The top-level attribute has been removed in commit
771ed59b48.

This has been partially resolved in commit
18bdd44729.

The latter change however only addressed the main derivations but missed
out on the plugins. This is now done by just passing pythonPackages down
the chain.

Tested by only evaluating the expression, not building.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @domenkozar, @pjones, @profpatsch
2016-09-27 00:07:45 +02:00
Frederik Rietdijk d5fd65df4e Merge pull request #18982 from aneeshusa/pin-packages-to-python2-part2
Pin packages to python2 part2
2016-09-26 18:33:26 +02:00
Aneesh Agrawal 777a6cafd9 asciidoc: Pin to Python 2 2016-09-26 11:36:27 -04:00
Corbin eef90e4153 gcsfuse: init at v0.19.0 2016-09-26 07:51:50 -07:00
Frederik Rietdijk 9e2c48994a getmail: pass in pythonPackages again
broken by 12bd2310ec
2016-09-26 16:06:57 +02:00
Michael Raskin 12bd2310ec getmail: 4.50.0 -> 4.51.0 2016-09-26 15:49:30 +02:00
Michael Raskin 7a15d8b3ab nilfs-utils: 2.2.4 -> 2.2.5 2016-09-26 15:49:30 +02:00
Michael Raskin 72249360f9 glusterfs: 3.8.1 -> 3.8.4 2016-09-26 15:49:30 +02:00
Michael Raskin 2a4e9db699 zpaq: propagate version for updater 2016-09-26 15:49:30 +02:00
Michael Raskin 6187cf1ddc zpaqd: 7.08 -> 7.15 2016-09-26 15:49:30 +02:00
Michael Raskin abe14c13d1 zpaq: 7.14 -> 715 2016-09-26 15:49:29 +02:00
Michael Raskin a430a38f17 ipmiutil: 2.9.9 -> 3.0.0 2016-09-26 15:49:29 +02:00
Frederik Rietdijk 3ba16c8234 Do not use top-level buildPythonPackage or buildPythonApplication
but instead use the one in pythonPackages.
2016-09-26 11:10:51 +02:00
Frederik Rietdijk 2f4da5bd83 gitfs: do not pass in buildPythonApplication 2016-09-26 11:10:51 +02:00
Frederik Rietdijk e06e26af08 getmail: pass in pythonPackages 2016-09-26 11:10:51 +02:00
Frederik Rietdijk 982ac542cb cli53: do not pass in buildPythonApplication 2016-09-26 11:10:51 +02:00
Frederik Rietdijk 18bdd44729 beets: pass in pythonPackages 2016-09-26 11:10:50 +02:00
Frederik Rietdijk 5220ee8db7 apt-offline: pass in pythonPackages 2016-09-26 11:10:50 +02:00
Frederik Rietdijk ee510f201d zbar: do not use top-level python packages 2016-09-26 11:10:50 +02:00
Robert Helgesson 1e12738dc4
svtplay-dl: 1.4 -> 1.5 2016-09-26 01:01:49 +02:00
Frederik Rietdijk d07270649c gtk-vnc: do not use top-level python packages 2016-09-25 23:19:40 +02:00
Corbin Simpson edddd76165 collectd: patch deprecated usage of readdir_r() (#18956) 2016-09-25 19:52:55 +02:00
Franz Pletz 668572753c
fuseiso: fix CVE-2015-8836 & CVE-2015-8837 2016-09-25 17:38:31 +02:00
Franz Pletz 76b142b915 Merge pull request #18894 from tailhook/ripgrep
Add ripgrep package
2016-09-25 14:28:29 +02:00
Pascal Bach 888551887b ipxe: 20141124 -> 20160831 (#18938)
HTTPS support is enabled
2016-09-25 04:35:46 +02:00
Arseniy Seroka 8269322d11 Merge pull request #18912 from grahamc/stunnel
stunnel: 5.31 -> 5.36
2016-09-25 01:05:31 +04:00
Arseniy Seroka f528ff3751 Merge pull request #18916 from Mic92/monit
monit: 5.10 -> 5.19.0
2016-09-25 01:03:32 +04:00
Arseniy Seroka b6ba143e5a Merge pull request #18923 from grahamc/davfs2
davfs2: 1.5.2 -> 1.5.3
2016-09-25 01:02:30 +04:00
Vladimír Čunát fffc7638cd Merge branch 'master' into staging 2016-09-24 18:54:31 +02:00
Joachim Fasting f0c85376b2
tor: 0.2.8.7 -> 0.2.8.8
Fixes two crashing bugs, nothing else of note.
2016-09-24 15:47:28 +02:00
Franz Pletz 63052c1126
collectd: 5.5.2 -> 5.6.0 2016-09-24 15:33:31 +02:00
Franz Pletz 7d5546af42
chrony: 2.3 -> 2.4 2016-09-24 15:33:05 +02:00
Franz Pletz c39195d699
a2ps: fix CVE-2001-1593 & CVE-2014-0466 2016-09-24 15:33:03 +02:00
Aneesh Agrawal 278d3050ae nmap: use python infra's .withPackages 2016-09-24 15:05:28 +02:00
Aneesh Agrawal 6321a1b67c nmap: pin to Python 2, make Python optional
Python 3 is not supported, so use python2Packages.

Python is only required for the `ndiff` and `zenmap` binaries, not the
main `nmap` binary, so disable Python by default to reduce the default
closure size, and add a `withPython` arg to re-enable it. Note that
Zenmap is the graphical program, so passing `graphicalSupport = true`
will also automatically enable Python support.
2016-09-24 15:05:28 +02:00
Graham Christensen 70bf407cf8
davfs2: 1.5.2 -> 1.5.3 2016-09-24 08:42:24 -04:00
Nikolay Amiantov 8925bb7415 Merge pull request #18815 from aske/uniemoji
ibus-engines.uniemoji: init at 2016-09-20
2016-09-24 13:17:55 +04:00
Jörg Thalheim 6b34a62ef8
monit: 5.10 -> 5.19.0
monit disables SSLv23 now by default, see

- https://mmonit.com/monit/changes/
- https://lwn.net/Vulnerabilities/691497/
2016-09-24 09:46:25 +02:00
Graham Christensen 90dae03cfe
stunnel: 5.31 -> 5.36 2016-09-23 22:26:25 -04:00
Aneesh Agrawal 34b5d639c6 SaltTesting: 2015.7.10 -> 2016.9.7 2016-09-23 20:33:36 -04:00
Aneesh Agrawal f61b23cd23 salt: 2015.8.8 -> 2016.3.3 2016-09-23 20:31:20 -04:00
Wilhelm Schuster c37e76b4d2 nixos-container: Use machinectl shell (#18825)
Using nsenter+su was suboptimal since the environment they provided was
not quite the same as the real container environment. See [1] for more
background.

Note that we directly invoke /bin/sh for `nixos-container root-login`
since setting the user's shell is quite complex. See [2] for a related
systemd issue.

[1]: https://github.com/systemd/systemd/issues/825#issuecomment-127917622
[2]: https://github.com/systemd/systemd/issues/1395
2016-09-24 00:40:41 +02:00
Paul Colomiets 1255d60b35 ripgrep: init at 0.1.17 2016-09-23 23:53:54 +03:00
rushmorem c2cae61392 vault: 0.6.0 -> 0.6.1 2016-09-23 19:57:07 +02:00
Eelco Dolstra 057bfdb689 Merge pull request #18877 from NeQuissimus/openvpn_2_3_12
openvpn: 2.3.11 -> 2.3.12
2016-09-23 18:06:18 +02:00
Eelco Dolstra fe8dedf4ef Merge pull request #18879 from NeQuissimus/curl_7_50_3
curl: 7.50.1 -> 7.50.3
2016-09-23 18:05:27 +02:00
Tim Steinbach cda53e434e
curl: 7.50.1 -> 7.50.3 2016-09-23 09:59:14 -04:00
Tim Steinbach 244aee5cd1
openvpn: 2.3.11 -> 2.3.12 2016-09-23 09:24:00 -04:00
Joachim F 7529fd3bff Merge pull request #18818 from Jookia/RFC_htpdate
Rfc htpdate
2016-09-23 15:19:49 +02:00
Eelco Dolstra 30899bba14 Merge pull request #18858 from groxxda/sudo
sudo: 1.8.17p1 -> 1.8.18
2016-09-23 13:25:45 +02:00
Mica Semrick e6633ad504 gmic: 1.7.4 -> 1.7.7 2016-09-23 12:17:02 +02:00
Alexander Ried 8e0d456daa sudo: 1.8.17p1 -> 1.8.18 2016-09-23 02:01:57 +02:00
Daiderd Jordan f62fef5fcb Merge pull request #18714 from RamKromberg/init/2mdoc
init: docbook2mdoc, texi2mdoc & pod2mdoc
2016-09-23 00:42:06 +02:00
Daiderd Jordan 9a4d60ef53 Merge pull request #18757 from romildo/upd.pnmixer
pnmixer: 2016-04-23 -> 0.7
2016-09-23 00:39:05 +02:00
Daiderd Jordan 992b59c9a1 Merge pull request #18605 from LnL7/darwin-fzf
fzf: fix cycle in bin output
2016-09-23 00:29:40 +02:00
Luca Bruno 19dc2ff732 Merge pull request #18824 from aske/xflux-gui
xflux-gui: 2016-08-08 -> 2016-09-21, fix icon display
2016-09-22 21:45:31 +01:00
zimbatm aec4a9fee7 fzf: 0.13.5 -> 0.15.1 2016-09-22 20:06:29 +01:00
Alexey Shmalko 124f25bc7d Merge pull request #18794 from romildo/upd.aria2
aria2: 1.26.1 -> 1.27.1
2016-09-22 10:45:06 +03:00
Jookia a83eadd81c htpdate: init at 1.1.3 2016-09-22 14:46:10 +10:00
Kirill Boltaev c0a2fd0ecb xflux-gui: 2016-08-08 -> 2016-09-21, fix icon display 2016-09-21 23:20:48 +03:00
Charles Strahan 4a4fd2747c
xsel: 1.2.0 -> git-2016-09-02
The last xsel release was in 2008. Since then, a number of bugs have
been fixed. For example, pasting a large chunk of text (>4000 chars)
into chrome would cause the current tab to hang indefinitely.

A couple examples in the wild:

https://github.com/kfish/xsel/issues/14
https://github.com/kfish/xsel/issues/13
https://github.com/kfish/xsel/pull/16
https://bugs.chromium.org/p/chromium/issues/detail?id=515401
https://github.com/electron/electron/issues/3116
https://github.com/neovim/neovim/issues/4719
2016-09-21 14:16:59 -04:00
Devresse Adrien 46f37ae78c davix: 0.4.0 -> 0.6.4 (#18768) 2016-09-21 19:35:50 +02:00
Tuomas Tynkkynen 0e226720f5 yle-dl: 2.9.1 -> 2.11
Also remove a hack that has been fixed by someone else in the meantime.
2016-09-21 19:39:59 +03:00
Kirill Boltaev 95e16c70aa ibus-engines.uniemoji: init at 2016-09-20 2016-09-21 18:22:20 +03:00
Rok Garbas 6ccdc388fe
rofi-pass: uses fetchFromGitHub and addes gnused, xclip, libnotify to PATH
fixes #18705
2016-09-21 16:14:27 +02:00
Tobias Pflug 3bd8c1bc56
rofi-pass: 1.3.2 -> 1.4.3 2016-09-21 16:14:27 +02:00
José Romildo Malaquias 01f3e331c5 aria2: 1.26.1 -> 1.27.1 2016-09-20 14:04:13 -03:00
Eelco Dolstra 7a4209c356 Merge remote-tracking branch 'origin/master' into staging 2016-09-20 17:46:09 +02:00
Lancelot SIX ea1afcd9f4 xorriso: 1.4.4 -> 1.4.6
See http://lists.gnu.org/archive/html/info-gnu/2016-09/msg00010.html
for release announcement

[Bjørn: remove "pkgs." from commit message subject.]
2016-09-20 15:51:36 +02:00
Moritz Ulrich febb35bd03 rustRegistry: 2016-08-23 -> 2016-09-20 2016-09-20 11:10:37 +02:00
José Romildo Malaquias c59d3cd849 xclip: 0.12-svn-20140209 -> 0.13 2016-09-20 10:17:29 +02:00
Stefan Goetz 3a534e8609 youtube-dl: 2016.07.16 -> 2016.09.19 (#18723)
* youtube-dl: 2016.07.16 -> 2016.09.18

* youtube-dl: 2016.09.18 -> 2016.09.19
2016-09-19 21:43:53 +02:00
Moritz Ulrich a36ecba2c9 pass: Add procps for pgrep to PATH. 2016-09-19 17:25:04 +02:00
Peter Simons 545040811b nbd: update to version 3.14 2016-09-19 15:45:12 +02:00
Tuomas Tynkkynen 5a6d6d4451 diffoscope: Use bin outputs of dependencies
All of the dependencies listed here are used via command-line tools. So
use getBin to avoid unnecessarily depending on development headers.
2016-09-19 16:09:34 +03:00
Tuomas Tynkkynen bb19e17d14 rpm: Split into multiple outputs
Patch away two things:

- %_includedir, %_oldincludedir, %_mandir, %_infodir macros from
  lib/rpm/platform/*/macros to avoid cycles between outputs. Hopefully
  anything doesn't really need those.
- Change %__ld, %__nm, %__objcopy, %__objdump in lib/rpm/macros to
  refer to the commands in PATH. Should be safe as %__cc for instance is
  already like that.
2016-09-19 16:09:34 +03:00
Tuomas Tynkkynen 48d7948808 rpm: Use list for configureFlags 2016-09-19 16:09:34 +03:00
José Romildo Malaquias a1ce861647 pnmixer: 2016-04-23 -> 0.7 2016-09-19 06:42:23 -03:00
Alexey Shmalko 930c682c53 Merge pull request #18752 from rnhmjoj/bdf2psf
bdf2psf: 1.147 -> 1.148
2016-09-19 09:21:34 +03:00
rnhmjoj 363976941b
bdf2psf: 1.147 -> 1.148 2016-09-19 01:08:22 +02:00
Franz Pletz 1234aaf47b
inadyn: 1.99.15 -> 2.0 2016-09-19 00:58:54 +02:00
Robin Gloster 4ec5e729c4
systemd-journal2gelf: fix after godeps changes 2016-09-19 00:08:21 +02:00
Robin Gloster 5650c92b01
systemd-journal2gelf: init at 20160414 2016-09-19 00:08:19 +02:00
Robin Gloster 55de97e020
byobu: 5.98 -> 5.112 2016-09-18 23:48:13 +02:00
Joachim F bb27f062e6 Merge pull request #18592 from bendlas/update-connman
connman: 1.32 -> 1.33
2016-09-18 13:54:01 +02:00
Alexey Shmalko 19898d8284 Merge pull request #18650 from Ericson2314/openvpn-pkcs11
pkcs11-helper: git rev -> 1.11, openvpn w/ pkcs11-helper support
2016-09-18 14:43:07 +03:00
Ram Kromberg f1c9f024d5 pod2mdoc: init at 0.0.10 2016-09-18 03:23:06 +03:00
Ram Kromberg 7176340bdc texi2mdoc: init at 0.1.2 2016-09-18 03:22:56 +03:00