3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

11193 commits

Author SHA1 Message Date
Vladimír Čunát 2e03ae274d Merge branch 'master' into staging 2016-12-22 11:28:56 +01:00
Graham Christensen 7c94d62243 Merge pull request #21348 from dochang/lnav
lnav: 0.8.0 -> 0.8.1
2016-12-21 20:35:54 -05:00
Desmond O. Chang fdd9832e2c lnav: 0.8.0 -> 0.8.1 2016-12-22 09:18:50 +08:00
Desmond O. Chang dd6025dbce yank: 0.7.0 -> 0.7.1 2016-12-22 09:17:36 +08:00
Stefan Goetz 9251f57133 youtube-dl: 2016-12-15 -> 2016-12-20 (#21342) 2016-12-22 00:18:17 +01:00
Ricardo Ardissone 44a8fb956e nrg2iso: init at 0.4.0 2016-12-21 16:29:34 +02:00
Hoang Xuan Phu 5a31ad1bbf
simp_le: switch to zenhack/simp_le
kuba/simp_le seems unmaintained.
fixes #21174
2016-12-21 12:11:04 +01:00
Hoang Xuan Phu 17322ca4fd
certbot: 0.6.0 -> 0.9.3 2016-12-21 12:04:56 +01:00
Aristid Breitkreuz 06cfff71dd parted: re-enable checks 2016-12-20 21:57:28 +01:00
Joachim Fasting a34eae0ecb
stun: gzip -9 -> gzip -9n
Note that it does not seem to make a difference to `nix-build --check`.
2016-12-20 15:32:14 +01:00
Joachim Fasting 8246a845b4
zerotierone: gzip -9 -> gzip -9n
Note that it does not seem to make a difference to `nix-build --check`.
2016-12-20 15:32:07 +01:00
Aristid Breitkreuz bb18e10ba0 Merge remote-tracking branch 'origin/master' into staging 2016-12-20 14:05:30 +01:00
Joachim Fasting 3e92b56be3
tor: 0.2.8.10 -> 0.2.8.12
Notably contains fix for CVE-2016-1254

cc @grahamc
2016-12-19 23:49:17 +01:00
zimbatm 0c7afce7dd goaccess: 1.0 -> 1.1.1 2016-12-19 18:30:53 +00:00
Aristid Breitkreuz 2fdd4973ec parted: disable checks to fix Hydra build (fixes #21281) 2016-12-19 13:10:07 +01:00
Rickard Nilsson 327a650f09 google-cloud-sdk: 134.0.0 -> 138.0.0 2016-12-19 09:05:45 +01:00
Stefan Goetz 8ca29a7960 youtube-dl: 2016.12.12 -> 2016.12.15 (#21258) 2016-12-18 20:47:15 +01:00
Thomas Tuegel dd7dc94725 Merge pull request #21057 from gnidorah/master3
qtstyleplugins: init at 2016-12-01, kdecoration-viewer: init at 2015-08-20
2016-12-18 13:13:58 -06:00
Alex Ivanov bb63d4af9c kdecoration-viewer: init at 2015-08-20 2016-12-18 20:49:29 +03:00
Nikolay Amiantov 1cb3831f1c Merge pull request #21231 from abbradar/no-fmod
Update DOOM forks, remove top-level fmod
2016-12-18 00:29:46 +03:00
Graham Christensen 2fb80e573f Merge pull request #21187 from bzizou/ior
ior: init at 3.0.1
2016-12-17 15:54:35 -05:00
Vladimír Čunát 3a0f1975b0
Revert "Revert "Merge pull request #21234 from l2dy/coreutils-up""
This reverts commit ffb90e8c4f.
This moves the coreutils update from master.
2016-12-17 20:30:09 +01:00
Vladimír Čunát 86e4c9ed46
Merge branch 'master' into staging 2016-12-17 20:29:25 +01:00
Vladimír Čunát ffb90e8c4f
Revert "Merge pull request #21234 from l2dy/coreutils-up"
This reverts commit ee28ea0e91, reversing
changes made to f281ce8c29.
Moving to staging instead.
2016-12-17 20:28:50 +01:00
ikervagyok fa80bf7b0d packagekit: add 'enableNixBackend' as an option (#21157)
* packagekit: disable nix-backend

Packagekit fails to build on my machines, as long as it's nix-backend is enabled

* packagekit: add 'enableNixBackend' as an option
2016-12-17 16:53:27 +01:00
devhell 09855fe2e5
profile-cleaner: 2.35 -> 2.36
fixes #21237
2016-12-17 16:45:51 +01:00
Tim Steinbach ee28ea0e91 Merge pull request #21234 from l2dy/coreutils-up
coreutils: 8.25 -> 8.26
2016-12-17 10:22:54 -05:00
Jaka Hudoklin 8a85fc9531 Merge pull request #21068 from offlinehacker/pkgs/completions/add
Add bash completions for a few packages
2016-12-17 15:37:27 +01:00
Zero King 1141aa1faa coreutils: 8.25 -> 8.26 2016-12-17 13:59:09 +00:00
Ricardo M. Correia 096e8ab45f Merge pull request #21218 from mimadrid/update/ripgrep-0.3.2
ripgrep: 0.2.1 -> 0.3.2
2016-12-17 13:39:56 +01:00
Nikolay Amiantov 0063c8acb4 p7zip: add setup hook 2016-12-17 15:33:12 +03:00
mimadrid 2077a60c2f
ripgrep: 0.2.1 -> 0.3.2 2016-12-17 00:16:40 +01:00
Bruno Bzeznik 8f3e3d2576 ior: init at 3.0.1 2016-12-16 23:12:42 +01:00
Paul Liu 1b6e2b9a19 Fix netpbm installation for OS X (#21194)
* Update meta.platform to linux ++ darwin for netpbm
2016-12-16 09:30:50 +00:00
Tom Saeger e0e1bdc25c Fixup description of ripgrep. 2016-12-15 17:41:22 -06:00
Graham Christensen 5cbb0f7fbf
unzip: patch for CVE-2014-9913 and CVE-2016-9844 2016-12-15 17:17:58 -05:00
Jascha Geerds b44e52b134 languagetool: Add myself as a maintainer 2016-12-15 22:18:29 +01:00
Pascal Wittmann 921a6f8b56
parallel: 20161022 -> 20161122 2016-12-15 21:23:25 +01:00
Gabriel Ebner 182c735527 mu: 0.9.16 -> 0.9.18 2016-12-15 14:45:46 -05:00
Franz Pletz dc0c7104ea
chrony: 2.4 -> 2.4.1 2016-12-15 15:35:22 +01:00
zimbatm 2a224c6795 fzf: 0.15.1 -> 0.15.9 2016-12-14 23:23:29 +00:00
Bjørn Forsman a1892edcee genimage: init at 9
Genimage is a tool to generate filesystem images from directory trees.
2016-12-14 17:44:05 +01:00
Joris Guyonvarch 4d2406c7d5 ffcast: init at 2.5.0 (#21141) 2016-12-14 14:22:00 +00:00
Jörg Thalheim c3edaab52d Merge pull request #21130 from tohl/master
small fixes
2016-12-14 14:35:05 +01:00
Jörg Thalheim ce31c6b019 Merge pull request #20744 from kampka/python-autorandr
autorandr: 59f6aec0b -> 53d29f9
2016-12-14 09:50:16 +01:00
Joachim Fasting b55cef7514
torbrowser: prefer local builds
The build consists of downloading some stuff & writing a wrapper, the
additional Hydra load is hardly justified.
2016-12-14 03:45:50 +01:00
Joachim Fasting 2221130710
torbrowser: support pulseaudio playback 2016-12-14 03:13:18 +01:00
Joachim Fasting 96be6a11a8
torbrowser: support H.264 playback
Fixes https://github.com/NixOS/nixpkgs/issues/20840

Some notes for future reference:
- Firefox only supports legacy gstreamer (0.10)
- gmp and ffmpeg are appearantly used by gst-ffmpeg so must be in the
  library search path
- Setting GST_DEBUG="*:3" or so was useful in figuring out what to add
2016-12-14 03:13:02 +01:00
Joachim Fasting a26acf99ad
torbrowser: 6.0.7 -> 6.0.8 2016-12-13 23:47:57 +01:00
Tomas Hlavaty d65ef03677 stunnel: 5.37 -> 5.38 2016-12-13 22:34:25 +01:00
Jörg Thalheim 8aecafcf5e tigervnc: fix missing Xvnc (xauth) (#21110)
the xorg patch was not applied.
Also a different root for `make install` is needed.
In addition more unnessary option are disabled.
2016-12-13 17:27:23 +01:00
Stefan Goetz c1d60d8c1e youtube-dl: 2016.12.01 -> 2016.12.12 (#21122) 2016-12-13 14:59:49 +01:00
Tristan Helmich c8c6ff4a96 simp_le: bump acme dependency to newer version
acme_0_5_0 is no longer working and removed in another commit
2016-12-12 16:26:28 +01:00
Jaka Hudoklin c1cbe26084 Merge pull request #21046 from montag451/aptly-completion
aptly: add bash completion
2016-12-12 01:36:28 +01:00
montag451 b871a208e5 aptly: add bash completion 2016-12-11 18:52:09 +01:00
Jörg Thalheim 5fa0161ce6 Merge pull request #21070 from offlinehacker/pkgs/vault/update/0.6.3
vault: 0.6.1 -> 0.6.3
2016-12-11 16:51:29 +01:00
Jörg Thalheim 4b245c530d Merge pull request #21071 from schneefux/pkg.httpie
httpie: 0.9.6 -> 0.9.8
2016-12-11 16:47:51 +01:00
Jaka Hudoklin a979297a96 valut: add bash completions 2016-12-11 15:14:41 +01:00
Jaka Hudoklin fe89c54903 vault: add offline as maintainer 2016-12-11 15:06:24 +01:00
Jaka Hudoklin 3097782fff vault: 0.6.1 -> 0.6.3 2016-12-11 15:06:16 +01:00
schneefux b6a4876258
httpie: 0.9.6 -> 0.9.8 2016-12-11 13:17:49 +01:00
zimbatm f9281609ae afl: 2.23b -> 2.35b 2016-12-11 00:28:14 +00:00
zimbatm ec7cdd95a7 direnv: 2.9.0 -> 2.10.0 2016-12-10 17:43:32 +00:00
Frederik Rietdijk c8eae2597e Merge pull request #20486 from pjones/pkg/gromit-mpx
gromit-mpx: init at 1.2
2016-12-10 14:51:14 +01:00
Christian Kampka a1d9d7efc0
btrbk: 0.22.2 -> 0.24.0 2016-12-10 14:08:28 +01:00
Vladimír Čunát b05b120779
Merge branch 'master' into staging 2016-12-09 19:11:05 +01:00
Eelco Dolstra c94454a45a nixUnstable: 1.12pre4523_3b81b26 -> 1.12pre4911_b30d1e7 2016-12-09 11:21:06 +01:00
Rob Vermaas 0a90a53441 Fix hash for p7zip patch (seems fetchurl hash was added, while fetch-patch function is used.
(cherry picked from commit 38b1bd9e72)
2016-12-09 07:59:25 +00:00
Graham Christensen 78c7d1b47b Merge pull request #20973 from grahamc/rollup-12
Roundup Rollup 12 (WIP)
2016-12-08 17:50:03 -05:00
Eelco Dolstra ece67bfa01
diffoscope: 52 -> 63 2016-12-08 17:54:26 +01:00
Lancelot SIX 4ea9f4e325
gnugrep: 2.25 -> 2.27
See http://lists.gnu.org/archive/html/info-gnu/2016-12/msg00004.html
for release announcement.
2016-12-08 17:28:52 +01:00
Joachim F 65778e7c59 Merge pull request #20826 from kierdavis/hashcat3
hashcat3: init at 3.10
2016-12-08 16:14:00 +01:00
Michael Raskin 64402bb9e0 getmail: 4.51.0 -> 4.52.0 2016-12-08 16:15:18 +01:00
Michael Raskin 9ad8afbf66 freeipmi: 1.5.4 -> 1.5.5 2016-12-08 16:15:18 +01:00
Michael Raskin d03260099f nilfs-utils: 2.2.5 -> 2.2.6 2016-12-08 16:15:18 +01:00
Alexey Shmalko 1c50bdd928 Merge pull request #18737 from chris-martin/secp256k1-flags
secp256k1: configure with more feature flags
2016-12-07 16:42:42 -08:00
Graham Christensen 0683c1a35c
p7zip: patch for CVE-2016-9296 2016-12-07 19:38:50 -05:00
Joe Hermaszewski 41256881bf gti: 2015-05-21 -> 2016-12-07
No need to replace gcc with cc thanks to
https://github.com/rwos/gti/pull/26
2016-12-07 22:53:34 +02:00
Graham Christensen c677c35922
calamares: remove due to being broken and insecure. 2016-12-07 08:10:39 -05:00
Kier Davis 7200424589
hashcat3: init at 3.10 2016-12-07 11:25:32 +00:00
demoslam d76c48796e silver-searcher: 0.33.0 -> 1.0.2 2016-12-06 22:22:03 -08:00
Graham Christensen 14e53ca5ab
sudolikeaboss: 0.2.1 -> 20161127-2d9afe1 2016-12-06 13:07:02 -05:00
Frederik Rietdijk 462a63bb1e beets: add missing dependency six, fixes #20946 2016-12-06 16:48:56 +01:00
Joachim Fasting 148ee2cba9
privoxy: homepage now reachable via https 2016-12-06 15:48:39 +01:00
Joachim Fasting 1a427cf625
privoxy: enable pie 2016-12-06 15:48:28 +01:00
Mikael Brockman d2fc461f6b
awslogs: init at 0.7
fixes #20921
2016-12-06 10:56:54 +01:00
Chris Martin 02ecd0f0f7 pssh: init at 2.3.1 2016-12-06 00:46:48 -05:00
Tristan Helmich 90292a8093 nzbget: 17.0-r1686 -> 17.1 2016-12-05 21:11:22 +01:00
Joachim F c98023b2b3 Merge pull request #20918 from joachifm/privoxy-bump
privoxy: 3.0.24 -> 3.0.26
2016-12-05 15:38:38 +01:00
Joachim Fasting 407537a4bc
privoxy: 3.0.24 -> 3.0.26
With some minor cosmetics
2016-12-05 13:20:51 +01:00
Joachim Fasting 07c0cdcba2
torsocks: enable install check 2016-12-05 13:18:54 +01:00
Joachim Fasting 95608c3e8d
torsocks: redo patching, ensure getcap is available 2016-12-05 13:18:50 +01:00
Joachim Fasting 8aebb6b181
torsocks: expression cleanups
- Remove redundant preConfigure
  torsocks installs into $libdir/torsocks, so setting libdir=$out/lib
  doesn't really help.  To put the shared objects into $out/lib we'd have
  to manually move them into $out and patch various files (the script
  itself expects $libdir/torsocks).
- Use nativeBuildInputs
2016-12-05 13:18:47 +01:00
Joachim Fasting 9353d8c1ea
torsocks: 2.1.0 -> 2.2.0 2016-12-05 13:18:08 +01:00
Jaka Hudoklin e10198e7f4 Merge pull request #20496 from offlinehacker/pkgs/gocryptfs/init
gocryptfs: init at 1.1.1
2016-12-04 22:23:09 +01:00
Joachim Fasting 2f861e6ba6
chkrootkit: 0.50 -> 0.51, fix build 2016-12-04 22:10:06 +01:00
Vladimír Čunát ad0d7f6a05
Merge branch 'staging' 2016-12-04 19:22:36 +01:00
Tuomas Tynkkynen 659f75bfcd coreutils-prefixed: Fix build since the single-binary changes
With the symlinked build it's only renaming 'coreutils' to
'gcoreutils' and leaving all the actual command symlinks alone.

Instead of custom renaming scripts, let's use --program-prefix
from the autotools kitchen sink. This has the nice(?) bonus that
the manpages also get prefixed with 'g' now.

The build system refuses to enable both single-binary build and
--program-prefix - but the symlink-based single-binary build couldn't
possibly work either (as it will be looking at "$0" for which command
to execute).
2016-12-04 18:21:02 +02:00
Lorenzo Manacorda 09fac98bf0 blueman: use "with" expression for variable 2016-12-04 15:14:06 +01:00
Frederik Rietdijk fd6dbd9d17 blueman: add missing pycairo 2016-12-04 14:21:37 +01:00
Vladimír Čunát 3dd219f071
Merge "forked" staging branches together 2016-12-04 10:07:19 +01:00
Franz Pletz e3d54be387
dhcpcd: 6.11.3 -> 6.11.5 2016-12-04 01:40:26 +01:00
Vladimír Čunát 1960fb5275
pciutils: 3.5.1 -> 3.5.2 2016-12-03 11:07:49 +01:00
Joachim Fasting d06bf820ea
tor: 0.2.8.9 -> 0.2.8.10
Per upstream, this contains primarily stability & performance fixes.
Notably, the relase fixes a bug that would sometimes make clients
unusable after leaving standby mode, as well as plugging a memory leak.
2016-12-03 07:17:13 +01:00
aszlig 1f9cbcd21d
beets: Set Python version via top-level attribute
This largely reverts commit 599312739e.

The main reason is that it breaks the plugins, because the mentioned
commit didn't change the attributes for the plugins as well.

But instead of just fixing the attributes when we import the plugin
packages, let's just override pythonPackages in all-packages.nix.

Right now, Beets is in transition to Python 3, so we don't need to wait
that long until we can remove the dependency on Python 2:

https://github.com/beetbox/beets/releases/tag/v1.4.1

Once Python 3 support is no longer beta, we can just change this by
changing one line only instead of several.

Tested this by building beets with both external plugins.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @FRidh
2016-12-03 05:25:13 +01:00
Eric Sagnes 813e5284cf urlwatch: 2.2 -> 2.5 2016-12-02 13:14:22 +09:00
Joachim F 2de33456f1 Merge pull request #20837 from goetzst/youtube-dl
youtube-dl: 2016.11.27 -> 2016.12.01
2016-12-01 22:57:45 +01:00
Frederik Rietdijk d9ae633d98 Merge pull request #20838 from lsix/update_hdf5
hdf5: 1.8.16 -> 1.8.18
2016-12-01 21:23:29 +01:00
Frederik Rietdijk 19ca20c91f pythonPackages.rpm: rpm for specific python version
rpm provides a Python module that is used by certain packages. We need
to override pkgs.rpm to get a correct version.
2016-12-01 21:07:33 +01:00
Frederik Rietdijk 74276caf19 koji -> pythonPackages.koji
koji is both a library and an application. It is used in Nixpkgs
primarily as a library and therefore I move it.
2016-12-01 21:07:33 +01:00
Lancelot SIX 16eb67ac9c
hdf5: 1.8.16 -> 1.8.18
For release announcement, see
https://support.hdfgroup.org/ftp/HDF5/current18/src/hdf5-1.8.18-RELEASE.txt
2016-12-01 17:23:15 +01:00
Stefan Götz e72b7ebd98 youtube-dl: 2016.11.27 -> 2016.12.01 2016-12-01 15:40:37 +01:00
Pascal Wittmann 130bc32268 Merge pull request #20824 from offlinehacker/pkgs/convoy/init
convoy: init at 0.5.0
2016-12-01 14:35:22 +01:00
Susan Potter 75cdbf48ae
torbrowser: 6.0.6 -> 6.0.7 2016-12-01 00:13:58 -06:00
Graham Christensen 390f6a985b
Revert "Revert "bzip2: patch for CVE-2016-3189""
This reverts commit 6393ca650e.
2016-11-30 19:30:52 -05:00
Jaka Hudoklin 3675631f63 convoy: init at 0.5.0 2016-11-30 23:28:18 +01:00
Tuomas Tynkkynen 8a4d6516ee Merge remote-tracking branch 'upstream/staging' into master 2016-11-30 00:34:23 +02:00
Chris Martin d7afb872cd secp256k1: 2016-05-30 -> 2016-11-27, more flags (#18637) 2016-11-29 09:36:53 -05:00
Alexander Tsamutali c9b8a6585d Add tools/networking/polysh 2016-11-29 17:32:21 +03:00
Vincent Demeester 41ed3a8dd1
lnav: fix compilation
nix-env -i lnav currently result of a failure:

    command_executor.cc:34:21: fatal error: pcrecpp.h: No such file or
    directory

This fixes by using pcre-cpp instead of pcre.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-28 06:45:23 -05:00
aszlig 83410d9954
beets: 1.3.19 -> 1.4.1
Full upstream release announcement:

https://github.com/beetbox/beets/releases/tag/v1.4.1

I had to rebase the keyfinder-default-bin.patch in order to apply with
the new release.

Other than that I didn't test whether beets works on my machine, as I
have a more or less temporary setup at the moment.

However, since the bump of mutagen to version 1.34 in commit
555928c228, the mediafile tests fail and
thus this commit unbreaks beets.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-11-28 08:58:08 +01:00
Franz Pletz e394c305a8 Merge pull request #20620 from rnhmjoj/fakeroute
fakeroute: init at 0.3
2016-11-28 03:01:15 +01:00
Graham Christensen 7b5619506b Merge pull request #20250 from guillaumekoenig/add-encryptr-2.0.0
encryptr: init at 2.0.0
2016-11-27 20:59:56 -05:00
Joachim F 625ec7604d Merge pull request #20751 from elitak/f3
f3: corrected version number
2016-11-27 16:32:28 +01:00
Joachim F 4f701660b3 Merge pull request #20750 from goetzst/youtube-dl
youtube-dl: 2016-11-22 -> 2016-11-27
2016-11-27 16:32:00 +01:00
Pascal Wittmann e8f7c31dfb
opkg: 0.3.1 -> 0.3.3 2016-11-27 15:58:29 +01:00
Eric Litak 0a77fc86b2 f3: corrected version number 2016-11-27 06:52:38 -08:00
Pascal Wittmann f4d163aab7
zsh-navigation-tools: 2.1.16 -> 2.2.7 2016-11-27 15:49:34 +01:00
Stefan Götz 22e9476e59 youtube-dl: 2016-11-22 -> 2016-11-27 2016-11-27 15:06:34 +01:00
Jörg Thalheim 03d3531fb3 Merge pull request #20724 from elitak/f3
f3: newer git rev, build extra binaries
2016-11-27 13:15:44 +01:00
Eric Litak c4650769f5 f3: newer git rev, build extra binaries 2016-11-27 02:40:58 -08:00
Jörg Thalheim b8019981a6 Merge pull request #20736 from zimbatm/su-exec-0.2
su-exec: init at 0.2
2016-11-27 01:27:10 +01:00
Christian Kampka dcc2bfddfe autorandr: 59f6aec0b -> 53d29f9 2016-11-26 21:32:58 +01:00
Robert Helgesson be34ee415b
cpulimit: 2.3 -> 2.4 2016-11-26 21:18:59 +01:00
Tuomas Tynkkynen 2d679dbe74 ntp: Don't use seccomp on non-x86
It only has the allowed system call numbers defined for i386 and x86_64
so it fails to build otherwise.
2016-11-26 20:38:17 +02:00
zimbatm 7f4e514a31 su-exec: init at 0.2 2016-11-26 16:48:13 +00:00
Franz Pletz 9007303001
curl: add upstream patch to fix HTTP2 performance issues
See #20639. Patch has to be in nixpkgs because fetchurl depends on curl.
2016-11-26 14:48:05 +01:00
Vladimír Čunát 925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Joachim F 00597a07bb Merge pull request #20644 from romildo/upd.xcape
xcape: git-2015-03-01 -> 1.2
2016-11-25 13:19:56 +01:00
Frederik Rietdijk 310b5fb7be Merge pull request #20710 from nico202/cowpatty
coWPAtty: init at 4.6
2016-11-25 12:44:57 +01:00
roxma 78f81c5bac proxychains: fix build, add -ldl to LDFLAGS
Closes #20355
2016-11-25 12:17:11 +01:00
Nicolò Balzarotti 54b42cb454 coWPAtty: init at 4.6 2016-11-25 11:25:07 +01:00
Frederik Rietdijk 18637d877a magic-wormhole: move to python-packages
since it is actually a library.
2016-11-25 09:13:01 +01:00
Sebastian Hagen 0f9f74f1d5 less: 483 -> 481: Use recommended upstream version since less-483.tar.gz has disappeared
This is a fix for the current package source file
  http://www.greenwoodsoftware.com/less/less-483.tar.gz
not being available anymore.

We bump the less version back to 481, and adjust the source package hash
accordingly. This is a (slight) downgrade from 483 as opposed to an
upgrade since
  a) 481 is the current Recommended version by http://www.greenwoodsoftware.com/less/download.html
  b) Upstream is unreliable about keeping experimental versions around.
2016-11-25 02:38:16 +00:00
Michael Raskin e29e246720 debootstrap: 1.0.80 -> 1.0.87 2016-11-24 22:52:19 +01:00
Frederik Rietdijk b91c43d8d3 afl-qemu: use python2 2016-11-24 22:28:04 +01:00
Frederik Rietdijk 2de9321880 nodejs: add python to passthru
so nodeEnv uses the exact same version.

See also https://github.com/svanderburg/node2nix/issues/25
2016-11-24 22:28:04 +01:00
Frederik Rietdijk b1f60ba8cf libcpuid: use python2 2016-11-24 22:28:03 +01:00
Frederik Rietdijk f3c8692232 rdiff-backup: use python2 and buildPythonApplication 2016-11-24 22:28:03 +01:00
Frederik Rietdijk f8c93fd939 kargo: use python2 2016-11-24 22:28:03 +01:00
Frederik Rietdijk 080daf40c8 rubber: use python2 2016-11-24 22:28:03 +01:00
Frederik Rietdijk 09a5864d28 tor-arm: use python2 2016-11-24 22:28:03 +01:00
Frederik Rietdijk 3ebca4f4cf vde2: use python2 2016-11-24 22:28:03 +01:00
Frederik Rietdijk 599312739e beets: use python2 2016-11-24 22:28:03 +01:00
Frederik Rietdijk 7dd7b9e218 arandr: use python2 2016-11-24 22:28:02 +01:00
Frederik Rietdijk c355a73e2c s3cmd: use python2 2016-11-24 22:28:02 +01:00
Frederik Rietdijk a881da7548 euca2ools: use python2 2016-11-24 22:28:02 +01:00
Frederik Rietdijk 1e52bed8a3 createrepo_c: use python2 2016-11-24 22:28:02 +01:00
Frederik Rietdijk 90d0bde89a bareos: use python2 2016-11-24 22:28:02 +01:00
Vladimír Čunát ceda8cb203
pciutils: fixup finding modules to libkmod's way
Fixes #20683.
2016-11-24 16:50:56 +01:00
Vladimír Čunát 516f839c0d
Revert "pciutils: fixup finding modules to libkmod's way"
This reverts commit 286c836b3f.
It's bigger rebuild than I expected, I'm sorry.  Moving to staging.
2016-11-24 16:50:20 +01:00
Vladimír Čunát 286c836b3f
pciutils: fixup finding modules to libkmod's way
Fixes #20683.
2016-11-24 16:46:28 +01:00
Travis Whitaker 528d353b65 graphviz: Make derivations pure on non-NixOS systems. 2016-11-24 14:45:45 +01:00
Alexey Lebedeff 7e3176bca2 blivet: Remove unneccesary patching
Fixes https://github.com/NixOS/nixops/issues/552

`--cache` argument is now mandatory for `pvscan` both from hetzner rescue
system and from nixpkgs.
2016-11-24 14:13:26 +03:00
Jörg Thalheim 9338d326c2 Merge pull request #20643 from makefu/snapraid/update/11.0
snapraid: 10.0 -> 11.0
2016-11-24 12:00:13 +01:00
Jascha Geerds 79ea04c6c7 Merge pull request #20646 from romildo/upd.aria2
aria2: 1.28.0 -> 1.29.0
2016-11-23 23:48:22 +01:00
Nikolay Amiantov c240000451 thermald: 1.5.3 -> 1.5.4 2016-11-24 01:17:59 +03:00
Nikolay Amiantov 5cda77808a fprintd: 0.6.0 -> 0.7.0 2016-11-24 01:17:59 +03:00
Nikolay Amiantov e5167e8763 update-resolv-conf: 2016-04-24 -> 2016-09-30 2016-11-24 01:17:58 +03:00
Nikolay Amiantov 77a61cabe9 logmein-hamachi: 2.1.0.165 -> 2.1.0.174 2016-11-24 01:17:58 +03:00
Nikolay Amiantov 5a8e60e97d tlp: 0.8 -> 0.9 2016-11-24 01:17:58 +03:00
Nikolay Amiantov 3223e61e6b grub4dos: 0.4.6a-2016-08-06 -> 0.4.6a-2016-11-09 2016-11-24 01:17:58 +03:00
Nikolay Amiantov a44cfd6e0d virtualglLib: 2.5 -> 2.5.1 2016-11-24 01:17:58 +03:00
Nikolay Amiantov be95ceaff2 treewide: quote URLs in my packages 2016-11-24 01:17:52 +03:00
Domen Kožar ce6abb9495 nixopsUnstable: init at 2016-11-23 2016-11-23 17:35:36 +01:00
rnhmjoj d753527bd4
fakeroute: init at 0.3 2016-11-23 15:22:55 +01:00
Franz Pletz 6c2a1b55b5
tmux: use currently maintained bash completion repo 2016-11-23 13:23:32 +01:00
makefu 247a77ad00
snapraid: 10.0 -> 11.0 2016-11-23 10:50:58 +01:00
romildo 6f5a704205 aria2: 1.28.0 -> 1.29.0 2016-11-23 07:49:19 -02:00
romildo b4077f3210 xcape: git-2015-03-01 -> 1.2 2016-11-23 07:30:00 -02:00
Joachim F 7a27cf64d8 Merge pull request #20634 from goetzst/youtube-dl
youtube-dl: 2016.11.14.1 -> 2016.11.22
2016-11-22 22:59:20 +01:00
Lorenzo Manacorda f00f4b59b0 magic-wormhole: init at 0.8.1 2016-11-22 20:26:37 +01:00
Stefan Götz 4bd96a475e youtube-dl: 2016.11.14.1 -> 2016.11.22 2016-11-22 20:23:26 +01:00
John Wiegley 113986f07a
gnupg21: Add -lintl on Darwin systems 2016-11-22 09:00:11 -08:00
Bjørn Forsman 682bb54cc4 phrasendrescher: init at 1.0
It's a cracking tool that finds passphrases of SSH keys.
2016-11-22 17:33:12 +01:00
montag451 7d5abdca11 aptly: use wrapProgram instead of propagatedUserEnvPkgs (#20622) 2016-11-22 17:02:32 +01:00
Sophie Taylor 91d2071e7a openntpd: 5.7p4 -> 6.0p1 (#20602) 2016-11-22 03:45:09 +01:00
Franz Pletz cc925a0162
stunnel: 5.36 -> 5.37 2016-11-22 03:16:47 +01:00
Franz Pletz 009e37d277
ntp: fix ntp-wait script, depends on perl 2016-11-21 23:25:21 +01:00
Franz Pletz 67fd21a170
ntp: use seccomp on linux 2016-11-21 23:11:05 +01:00
Franz Pletz db66a95e5b
ntp: 4.2.8p8 -> 4.2.8p9
Includes fixes for 10 CVEs and contains other fixes.

See http://support.ntp.org/bin/view/Main/SecurityNotice#November_2016_ntp_4_2_8p9_NTP_Se.
2016-11-21 22:49:02 +01:00
John Wiegley e8d86ee7b4 Merge pull request #20538 from lsix/update_gnupg21
gnupg21: 2.1.15 -> 2.1.16
2016-11-21 08:41:00 -08:00
Joachim F ba947dcd58 Merge pull request #20567 from TravisWhitaker/tigervnc-update
tigervnc: 1.6.0 -> 1.7.0
2016-11-21 12:53:54 +01:00
Joachim F d66b8145d0 Merge pull request #20593 from montag451/aptly
aptly: init at 0.9.7
2016-11-21 12:51:09 +01:00
Josef Kemetmueller 23b922c98a mc: Fix darwin build
We remove linux specific packages from the darwin build of midnight
commander. Also slang wouldn't build on darwin without libiconv.
2016-11-21 12:30:30 +02:00
montag451 59ba4276b7 aptly: init at 0.9.7 2016-11-21 02:01:37 +01:00
Robert Helgesson bf0b20bb01
autojump: 22.2.4 -> 22.5.0 2016-11-20 21:55:03 +01:00
Pascal Wittmann dd3c853b43
Fix typos: licence -> license 2016-11-20 18:11:29 +01:00
Pascal Wittmann f7e0bc2ae7
Make all meta.maintainers attributes lists 2016-11-20 18:06:03 +01:00
Pascal Wittmann 264e2eebd7
parallel: 20160722 -> 20161022 2016-11-20 16:36:57 +01:00
Pascal Wittmann 1416ed7b08
vtun: 3.0.3 -> 3.0.4 2016-11-20 16:36:52 +01:00
Rok Garbas c2e5c30bb7 offlineimap: 7.0.6 -> 7.0.9 2016-11-20 15:47:10 +01:00
Travis Whitaker 39ad303e21 tigervnc: 1.6.0 -> 1.7.0 2016-11-19 23:34:53 -08:00
Pascal Wittmann 31a770b21c
progress: 0.13 -> 0.13.1 2016-11-19 22:14:52 +01:00
Joachim Fasting f32a8eb6cc
xidel: refactor & fix eval
- Fix eval by removing reference to non-existent stdenv.glibc
- Simplify patchelf calls
- Set meta.platforms = linux
2016-11-19 14:29:22 +01:00
Pascal Wittmann 4cdfa0b96a
axel: 2.7 -> 2.11 2016-11-19 10:51:56 +01:00
Vladimír Čunát b69f568f4c
Merge branch 'staging'
Hydra rebuild looks fine; only a few Darwin jobs is queued:
http://hydra.nixos.org/eval/1304891?compare=1304807
2016-11-19 04:35:51 +01:00
Graham Christensen 775a729da7 Merge pull request #20497 from grahamc/monit
monit: 5.19.0 -> 5.20.0 for CVE-2016-7067
2016-11-18 21:19:44 -05:00
Lancelot SIX 98092df841 gnupg21: 2.1.15 -> 2.1.16 2016-11-19 00:11:44 +01:00
Mateusz Kowalczyk 21a1611269 Merge pull request #20523 from romildo/upd.nitrogen
nitrogen: 1.5.2 -> 1.6.0
2016-11-18 21:38:47 +00:00
Aristid Breitkreuz 3ebefe8178 kbfs: 2016-08-02 -> 2016-11-18 2016-11-18 22:35:58 +01:00
Frederik Rietdijk 58f0dcfeb1 Merge pull request #20365 from hakuch/fix_opam
clingo, gringo: Revert opam solver dependency changes
2016-11-18 18:49:07 +01:00
romildo 1a486c47af nitrogen: 1.5.2 -> 1.6.0 2016-11-18 09:49:27 -02:00
Robert Helgesson 4142e756ca
svtplay-dl: 1.7 -> 1.8 2016-11-18 00:12:00 +01:00
Aristid Breitkreuz 711a42e03a keybase: update 1.0.17 -> 1.0.18 2016-11-17 22:55:15 +01:00
Pascal Wittmann 69d3536852 ncdu: 1.11 -> 1.12 2016-11-17 22:34:03 +01:00
Vladimír Čunát e68d8e05aa Revert "lz4: 131 -> 1.7.3"
This reverts commit 1f0a12ee8d.
Systemd build was broken and such change should probably go through
staging anyway.
2016-11-17 21:51:34 +01:00
Franz Pletz 6a5ae21c47 Merge pull request #20421 from mayflower/refactor/clamav-service
clamav service: refactor
2016-11-17 19:37:53 +01:00
Franz Pletz 6f1308ba95
Revert "btrfs-progs: 4.8.2 -> 4.8.3"
This reverts commit e82c325bff.

This package update breaks the `update-grub.pl` script:

    updating GRUB 2 menu...
    Btrfs did not return a path for the subvolume at /
    error: unable to activate new configuration

This backwards-incompatible change is the culprit:

    $ /nix/store/np25r3yzv2r41ji7v73j110inpj8lhn2-btrfs-progs-4.8.2/bin/btrfs subvol show /
    / is toplevel subvolume

vs.

    $ /nix/store/h53vs13nqvjwahpl26a4s7ygqk9xw1mw-btrfs-progs-4.8.3/bin/btrfs subvol show /
    /
    	Name: 			<FS_TREE>
    	UUID: 			-
    	Parent UUID: 		-
    	Received UUID: 		-
    	Creation time: 		-
    	Subvolume ID: 		5
    	Generation: 		6004631
    	Gen at creation: 	0
    	Parent ID: 		0
    	Top level ID: 		0
    	Flags: 			-
    	Snapshot(s):
2016-11-17 17:47:18 +01:00
Tobias Geerinckx-Rice 1f0a12ee8d
lz4: 131 -> 1.7.3
‘make install’ now supports FreeBSD out of the box (untested).
2016-11-17 16:27:31 +01:00
Domen Kožar 2326c8de4d cloud-utils: 0.27 -> 0.29
We keep the existing hacks for growpart to work
inside the initrd

Fixes #15736 #17015
2016-11-17 15:15:42 +01:00
Graham Christensen 1376aeba42
monit: 5.19.0 -> 5.20.0 for CVE-2016-7067 2016-11-17 08:45:56 -05:00
Jaka Hudoklin 9e92237ed7 gocryptfs: init at 1.1.1 2016-11-17 14:15:47 +01:00
Thomas Tuegel 3d5a033c96 Merge pull request #20427 from ttuegel/multiple-outputs-networkmanager
networkmanager: multiple outputs
2016-11-17 06:34:58 -06:00
Vladimír Čunát 5af7b82336
Merge branch 'master' into staging
To incorporate some larger security rebuilds (jasper).
2016-11-17 11:14:05 +01:00
Peter Jones 6c9cc6339f
gromit-mpx: init at 1.2 2016-11-16 16:32:13 -07:00
Robert Helgesson 38de6ed18e
gmic: 1.7.7 -> 1.7.8 2016-11-17 00:06:41 +01:00
Robert Helgesson b25f9ff20e
mimeo: 2016.2 -> 2016.11 2016-11-17 00:06:41 +01:00
Tobias Geerinckx-Rice d3e54d71c1
debian_devscripts: 2.16.6 -> 2.16.8 2016-11-16 19:14:30 +01:00
Daniel Peebles f6a7296499 Merge pull request #16540 from matthewbauer/xcbuild
xcbuild: add wrapper
2016-11-16 12:11:15 -05:00
Rushmore Mushambi 244c18c70d Merge pull request #20460 from retrry/master
Rust updates
2016-11-16 18:30:01 +02:00
Tobias Geerinckx-Rice e3a7fc3905
eid-mw: 4.1.18 -> 4.1.19 2016-11-16 13:32:25 +01:00
Tobias Geerinckx-Rice 2034ffdc07
dpkg: 1.18.14 -> 1.18.15 2016-11-16 13:20:32 +01:00
Tadas Barzdzius e2eec8f436 exa: mark as broken 2016-11-16 13:27:12 +02:00
Matthew Bauer 4685bd7853
xcbuild: update meta and comments 2016-11-15 19:13:22 -06:00
Matthew Bauer 25485ece2a
xcbuild: add name to platform.nix 2016-11-15 18:58:13 -06:00
Matthew Bauer ec409c8e96
contacts: use xcbuild instead of xcodebuild 2016-11-15 18:58:11 -06:00
Joachim Fasting f477bc98be
torbrowser: 6.0.5 -> 6.0.6 2016-11-15 22:57:35 +01:00
Stefan Goetz 2ca507a2b8 youtube-dl: 2016-11-08.1 -> 2016-11-14.1 (#20440) 2016-11-15 22:01:29 +01:00
Tobias Geerinckx-Rice 3c3dfbc402
aha: 0.4.10.1 -> 0.4.10.2 2016-11-15 21:44:04 +01:00
Thomas Tuegel 520064e4b5
networkmanager: multiple outputs 2016-11-15 07:15:04 -06:00
Franz Pletz 9e1e3b2880
clamav service: refactor
* Sync systemd units with upstream. Upstream uses SIGUSR2 instead of SIGHUP
  to reload the clamd service.

* Convert freshclam service to a oneshot service activated by a systemd timer.
  This way we can make clamd wait for freshclam to finish fetching the virus
  database before failing to start if the database doesn't exist yet.

* Fixes console tools to work as expected as they require hardcoded config
  file locations.
2016-11-15 04:47:14 +01:00
Franz Pletz 02e9c88d77
clamav: don't bundle freshclam config with package
Building clamav is expensive due to the bundled llvm.

Closes #20304.
2016-11-15 02:06:02 +01:00
Vladimír Čunát b5e89fe9bf
Merge branch 'master' into staging 2016-11-15 00:20:19 +01:00
Tobias Geerinckx-Rice 7981d3437d
aha: 0.4.9 -> 0.4.10.1 2016-11-14 14:14:52 +01:00
Eelco Dolstra ce4cf12a3b Merge pull request #20397 from obadz/e2fsprogs
e2fsprogs: 1.42.13 -> 1.43.3
2016-11-14 11:01:32 +01:00
Tobias Geerinckx-Rice 8ef3eaeb4e
dpkg: remove commented old postPatch
This was supposed to be removed in 7f71b89454
since it doesn't appear to be needed any longer.
2016-11-14 05:32:22 +01:00
Tobias Geerinckx-Rice e82c325bff
btrfs-progs: 4.8.2 -> 4.8.3 2016-11-14 05:28:22 +01:00
Tobias Geerinckx-Rice 7f71b89454
dpkg: 1.18.10 -> 1.18.14 2016-11-14 01:45:49 +01:00
obadz 83fe4fa0bf e2fsprogs: 1.42.13 -> 1.43.3 2016-11-13 21:03:32 +00:00
Pascal Wittmann 181ed4c82b bmon: 3.8 -> 3.9 2016-11-13 21:50:11 +01:00
Aristid Breitkreuz 8600e38bca google-cloud-sdk: add assertion for x86/x86-64 Linux 2016-11-13 11:56:25 +01:00
Aristid Breitkreuz ed9b1c673b google-cloud-sdk: 122.0.0 -> 134.0.0 2016-11-13 11:38:35 +01:00
Jesse Haber-Kucharsky 51b04c1bf5 Revert opam solver dependency changes
- Reverts the change to the monolithic `clingo` package in favor of the
  previous split between `clasp` and `gringo` since `opam` works with
  the latter but not (for some reason) with the former.

- Adds explicit non-support for Python in `gringo`. This is not necessary
  for opam.

- Forces usage of the `std::to_string` functions in the C++ standard
  library instead of the incomplete alternative implementations inside
  of the `gringo` sources.
2016-11-12 08:39:52 -05:00
Alex Ivanov 6be6760144 yandex-disk: 0.1.5.948 -> 0.1.5.978 2016-11-12 12:02:24 +03:00
Pascal Wittmann 50bb53238b Merge pull request #20312 from gnidorah/master2
dtrx: add archivers to dependencies
2016-11-11 17:25:38 +01:00
Stefan Goetz ba5f7673c6 youtube-dl: 2016-11-04 -> 2016-11-08.1 (#20292) 2016-11-10 16:30:13 +01:00
Alex Ivanov ec99fb434f dtrx: add archivers to dependencies 2016-11-10 17:41:20 +03:00
Tristan Helmich 34e04bf401 azure-vhd-utils: init at 20160614 2016-11-10 02:06:55 +01:00
mingchuan edc5cdc3c8 opencc: init at 1.0.4 2016-11-10 01:48:28 +01:00
Bart Brouns 2c754df9b3 clipster: init at unstable 2016-09-12 2016-11-09 21:31:50 +01:00
Tobias Geerinckx-Rice e1220105e3
netsniff-ng: 0.6.1 -> 0.6.2 2016-11-09 02:24:45 +01:00
Frederik Rietdijk 1f501a2ced xpra: use python2 2016-11-08 22:48:55 +01:00
Frederik Rietdijk dd5256993e certbot: use python2 2016-11-08 22:48:54 +01:00
Frederik Rietdijk 0674ed1b6b bup: use python2 2016-11-08 22:48:54 +01:00
Eelco Dolstra 459448727e gnutar: Fix comment 2016-11-08 10:02:37 +01:00
Guillaume Koenig 031d639b4d encryptr: init at 2.0.0 2016-11-08 09:48:08 +01:00
Joachim F 54f057266d Merge pull request #20244 from womfoo/bump/xdotool-3.20160805.1
xdotool: 3.20150503.1 -> 3.20160805.1
2016-11-08 00:58:51 +01:00
Vladimír Čunát 593b46fd1d
Merge branch 'staging'
There are security fixes inside.
2016-11-07 23:48:34 +01:00
Vladimír Čunát 3e6d04da57
texlive: disable xindy on Darwin for now (#20062) 2016-11-07 22:57:41 +01:00
Kranium Gikos Mendoza f17e13a0d5 xdotool: 3.20150503.1 -> 3.20160805.1 2016-11-08 05:24:06 +08:00
Graham Christensen c30ff9effc Merge pull request #20224 from asymmetric/youtube-dl-rtmp
youtube-dl: add optional support for RTMP (default enabled)
2016-11-07 07:43:29 -05:00
Frederik Rietdijk bb35828d97 Merge pull request #19925 from FRidh/dup
duplicity: use buildPythonApplication
2016-11-07 11:41:32 +01:00
Nikolay Amiantov ab21519858 bumblebee: use fetchpatch for GitHub patches 2016-11-07 11:02:46 +03:00
Nikolay Amiantov 1e8384a20b Merge pull request #20003 from gnidorah/master
bumblebee: backport critical libkmod.patch
2016-11-07 10:58:29 +03:00
Benno Fünfstück 0e78ed82bf dirb: init at 2.22 2016-11-07 00:52:13 +01:00
Lorenzo Manacorda 2fcbe451f2 youtube-dl: add optional support for RTMP 2016-11-06 17:42:32 +01:00
Joachim F be59aa055b Merge pull request #20178 from 8573/8573/pkg/add/agrep/1
agrep: init at 3.41.5
2016-11-06 15:18:39 +01:00
Joachim F 5bfbf6a0fa Merge pull request #20077 from FlorentBecker/remove_pdfjam
pdfjam: remove obsolete version
2016-11-06 15:16:47 +01:00
Michael Raskin 20fe51661d xlaunch: remove; it was fine-tuned to an old NixOS state and such functionality is forbidden by systemd 2016-11-06 11:42:45 +01:00
Vladimír Čunát f77801d88d Merge branch 'master' into staging 2016-11-06 11:26:02 +01:00
Edward Tjörnhammar 721c3d48e1
i2pd: 2.9.0 -> 2.10.0 2016-11-06 08:13:03 +01:00
Stefan Goetz 9254567f18 youtube-dl: 2016-11-02 -> 2016-11-04 (#20196) 2016-11-05 20:46:19 +01:00
Frederik Rietdijk 770c2b6417 Merge pull request #20194 from mayflower/graylog_2.1.2
graylog: 2.1.1 -> 2.1.2
2016-11-05 19:48:37 +01:00
Tobias Geerinckx-Rice aa0a7194e9
zstd: 1.0.0 -> 1.1.1 2016-11-05 18:44:11 +01:00
Tristan Helmich ee63779005 graylog: 2.1.1 -> 2.1.2 2016-11-05 18:37:48 +01:00
Vladimír Čunát cb6a81c607
jing-trang: fixup indentation problems 2016-11-05 10:17:56 +01:00
Vladimír Čunát fbb33ab8c9 saxon: use our standard share/java/*.jar location 2016-11-05 10:17:44 +01:00
Vladimír Čunát c6fcd28e2d
jing-trang: add back and update; removed in #20142
This fixes the tarball, as we use jing to validate nixpkgs manual!
/cc maintainer @bjornfor.
2016-11-05 10:03:29 +01:00
c74d 0033f6076e agrep: init at 3.41.5
In category `tools`, subcategory `text`, add a package definition for
the program [`agrep`] [1] — "Approximate `grep` for fast fuzzy string
searching".

I have tested this patch per nixpkgs manual section 11.1 ("Making
patches").

[1]: <https://www.tgries.de/agrep/>
2016-11-05 08:55:29 +00:00
Shea Levy ac59e2f184 tar: patch for CVE-2016-6321
https://lwn.net/Vulnerabilities/705216/
2016-11-04 23:05:26 -04:00
Tim Steinbach c86624c3db Merge pull request #20142 from NeQuissimus/dead_packages
Dead packages (Round 1)
2016-11-04 23:05:10 -04:00
Tim Steinbach 7a372f0be7
cowsay: init at 3.03+dfsg1-16 2016-11-04 23:04:05 -04:00
Tim Steinbach 3bb889c34b
Remove g500-control
Sources no longer available
2016-11-04 11:30:17 -04:00
Tim Steinbach 6dd1796b0e
Remove trang
Source no longer exists
2016-11-04 10:54:09 -04:00
Tim Steinbach 7329435fab
Remove jing
No longer exists
2016-11-04 10:27:01 -04:00
Tim Steinbach 893bfb1a1b
Remove fuse-zip
Original sources have moved to BitBucket but clearly this is not used by anybody
2016-11-04 09:42:39 -04:00
Tim Steinbach e6b054faab
Remove cowsay
Sources no longer exist
2016-11-04 09:32:08 -04:00
Sophie Taylor c5cac5051a cjdns v17.3 -> v18 2016-11-04 11:52:28 +01:00
Tim Steinbach df76eac6c6
Remove mcrl
Does not build because source no longer exists
2016-11-03 21:34:28 -04:00
= f14888b2fe reaverwps-t6x: init at 1.5.2 2016-11-03 23:45:14 +02:00
= 5245e4f1c2 pixiewps: init at 1.2.2 2016-11-03 23:45:14 +02:00
Joachim F ea8a038702 Merge pull request #20122 from hiberno/hiberno-remove-maintainership
Remove myself as maintainer.
2016-11-03 13:04:09 +01:00
Théo Zimmermann 93fbb947b3 aspcud: fix by updating the dependencies (#20086)
Depends on gringo but gringo is now maintained as part of the clingo
suite. This commit removes gringo (standalone) and replace it with
the latest version of clingo. This update follows closely the old
derivation for gringo (see 99e06fe).
2016-11-03 12:14:45 +01:00
Christian Lask 2d524a37f8 Remove myself as maintainer. 2016-11-03 11:54:54 +01:00
Eric Sagnes 5d6eaaa179 screenfetch: add bc dependency (#20097) 2016-11-03 05:01:36 +01:00
Tim Steinbach 29f679d32e Merge pull request #19861 from womfoo/fix/netdata
netdata: allow execution without a config file
2016-11-02 19:45:21 -04:00
Tim Steinbach 04b22dd935 Merge pull request #19982 from sternenseemann/netcat
Make netcat-openbsd the default netcat
2016-11-02 19:44:29 -04:00
Stefan Goetz 64a3317889 youtube-dl: 2016-10-31 -> 2016-11-02 (#20103) 2016-11-02 20:30:31 +01:00
Eelco Dolstra 1e1609da6a curl: 7.50.3 -> 7.51.0
Fixes 11 CVEs:

https://curl.haxx.se/changes.html#7_51_0
2016-11-02 10:38:17 +01:00
Florent Becker f00e28164b pdfjam: remove obsolete version
pdfjam is included in texlive
fixes #19826
2016-11-02 10:30:34 +01:00
Bjørn Forsman 03200ab74b sg3_utils: 1.31 -> 1.42 2016-11-01 22:34:41 +01:00
Joachim Fasting 0ee7d1ea4e
encfs: 1.8.1 -> 1.9.1
Packaging changes
- Uses cmake
- Removes depends on rlog and boost, uses tinyxml to parse xml

Note that the encfssh utility is disabled, it requires patching to
work (and didn't work in previous versions of the package, either).
Better to leave it unusable until fixed.
2016-11-01 15:57:29 +01:00
Maciek Starzyk 70bf493185 obnam: 1.19.1 -> 1.20.2 2016-11-01 13:00:52 +01:00
Joachim F 8f680da009 Merge pull request #20034 from rnhmjoj/bdf2psf
bdf2psf: 1.148 -> 1.152
2016-11-01 00:38:21 +01:00
rnhmjoj 80918cad0b
bdf2psf: 1.148 -> 1.152 2016-10-31 23:52:49 +01:00
Bjørn Forsman ee40829097 borgbackup: 1.0.7 -> 1.0.8 2016-10-31 22:25:50 +01:00
Stefan Goetz ea92304a6a youtube-dl: 2016-10-25 -> 2016-10-31 (#20021) 2016-10-31 18:18:06 +01:00
Franz Pletz c4f54821eb
darkice: fix and simplify dependencies 2016-10-31 14:38:13 +01:00
koral c76f50fec6 asciidoctor: 1.5.4 -> 1.5.5 2016-10-31 10:15:18 +01:00
Alex Ivanov f8a17768cd bumblebee: remove long time obsolete substitution 2016-10-31 09:49:34 +03:00
Alex Ivanov 1cb54a7dd0 bumblebee: backport critical libkmod.patch 2016-10-30 20:47:13 +03:00
sternenseemann bbe9159725 netcat-openbsd: install man page 2016-10-30 15:06:16 +01:00
sternenseemann e2372502d3 netcat: make netcat-openbsd the default netcat (#19411)
The motivation for this change is the following: As gnu-netcat,
e. g. does not support ipv6, it is not suitable as default netcat.

This commit also fixes all obvious build issues caused by this change.
2016-10-30 15:06:04 +01:00
Jude Taylor e80a6dc62b mpw: build from github to fix segfault 2016-10-30 04:15:41 -07:00
Jascha Geerds 9ca0521099 silver-searcher: 0.32.0 -> 0.33.0 2016-10-30 01:12:41 +02:00
Bjørn Forsman 5c1fd6763f xpra: 0.17.5 -> 0.17.6
Many fixes.
2016-10-30 01:01:26 +02:00
Gabriel Ebner 3feb910354 vdirsyncer: 0.13.1 -> 0.14.0 2016-10-29 09:01:07 -04:00
Graham Christensen 55909c32d1 Merge pull request #16286 from kirelagin/gpg2-osx
Enhance gnupg experience on OS X
2016-10-28 21:35:37 -04:00
Joachim Fasting a79695e3e2
dnscrypt-wrapper: 0.2.1 -> 0.2.2
Upstream changed distribution terms to what they call "0-clause BSD" aka
ISC.
2016-10-29 03:04:03 +02:00
Kirill Elagin 213dc21443 gnupg: Variable path to pinentry
This is needed for pinentry-mac which has the pinentry binary
at an OS X-ish path.
2016-10-29 00:24:51 +03:00
Kirill Elagin 62d9edb9b9 gnupg: Rename parameter x11Support -> guiSupport
Because it is really about GUI in general, not X11 (e.g. OS X).
2016-10-28 23:18:57 +03:00
Sean Bartell 64b1fe26a7 nc6: remove
The download sources are gone and the program is obsolete now that
the popular versions of netcat support IPv6. See:
http://www.deepspace6.net/projects/netcat6.html
2016-10-28 10:54:33 -05:00
Joachim F 5d5564e42f Merge pull request #19654 from KoviRobi/remind-fix-tkremind
remind: fix tkremind
2016-10-28 16:43:19 +02:00
Frederik Rietdijk cbc25e5506 duplicity: use buildPythonApplication 2016-10-27 17:16:40 +02:00
Peter Simons 84268a561a Merge pull request #19921 from reinhardt/fix/duplicity-dependencies
duplicity: updated dependencies
2016-10-27 16:30:59 +02:00
Zero King c9204f7206 nmap: 7.12 -> 7.31 (#19923) 2016-10-27 13:55:08 +02:00
Manuel Reinhardt 8f6470f33a duplicity: updated dependencies
fixes #18112
https://github.com/NixOS/nixpkgs/issues/18112
2016-10-27 08:36:02 +01:00
Tim Steinbach 68dd264ccd
btrfs-progs: 4.6.1 -> 4.8.2 2016-10-26 20:11:28 -04:00
Vladimír Čunát 1cd7466650
Merge #19800: fix clisp + xindy -> texlive on Darwin 2016-10-26 21:01:12 +02:00
Michael Raskin dbbe37bd94 gencfsm: use standalone libgee_0_6 as not every version of gnome3_* has libgee_1 after gnome 3.22 addition 2016-10-26 16:51:24 +02:00
Frederik Rietdijk 9b4a4b15bb gencfsm: mark as broken
With staging merged into master, we now have gnome3 = gnome3_22;.

and

error: while querying the derivation named ‘gnome-encfs-manager-1.8.16’:
while evaluating the attribute ‘nativeBuildInputs’ of the derivation
‘gnome-encfs-manager-1.8.16’ at
nixpkgs/pkgs/tools/security/gencfsm/default.nix:6:3:
while evaluating ‘getOutput’ at nixpkgs/lib/attrsets.nix:453:23, called
from undefined position:
attribute ‘libgee_1’ missing, at
nixpkgs/pkgs/tools/security/gencfsm/default.nix:14:27

cc maintainer @spacefrogg
2016-10-26 16:02:46 +02:00
zimbatm 9970b28680 Merge pull request #19799 from vmandela/ruby-zoom
ruby-zoom: init at 4.1.0
2016-10-26 13:18:43 +01:00
Venkateswara Rao Mandela 219b9d5086 ruby-zoom: init at 4.1.0
From the website,

https://gitlab.com/mjwhitta/zoom

Zoom adds some convenience to ag/ack/grep by allowing you to quickly
open your search results in your editor of choice.

Also available as a ruby gem.

https://rubygems.org/gems/ruby-zoom

In addition to including the ruby-zoom tool, we also added a global
override for the ruby-terminfo gem to handle the ncurses build time
dependency.
2016-10-26 17:26:26 +05:30
Frederik Rietdijk 7077a270bf Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-26 13:06:43 +02:00
Peter Hoeg 41b2a376a3 colord-kde: 2016-02-24 -> 0.5.0 2016-10-26 14:51:52 +08:00
Kranium Gikos Mendoza 8ce23cfec2 netdata: allow execution without a config file 2016-10-25 23:09:18 +08:00
Kranium Gikos Mendoza 237c15d883 netdata: allow UI to load when running as non-root 2016-10-25 22:56:15 +08:00
Stefan Goetz dad62ec21a youtube-dl: 2016.10.19 -> 2016.10.25 (#19858) 2016-10-25 16:30:17 +02:00
Andrew Scott 1c8cb703a6 mlocate: init at version 0.26 2016-10-25 13:03:04 +01:00
Jascha Geerds 6d70dd2760 kargo: init at 0.4.6 2016-10-25 11:46:00 +02:00
Mike Sperber 0fba729ded xindy: add dependency on libiconv
... as the build process invokes iconv.
2016-10-25 10:45:50 +02:00
Graham Christensen a95a5e48a9 Merge pull request #19824 from NeQuissimus/httpstat_1_2_1
httpstat: 1.2.0 -> 1.2.1
2016-10-24 19:16:20 -04:00
Franz Pletz ffca975de7
kea: init at 1.1.0 2016-10-24 20:02:23 +02:00
Tim Steinbach df7b8df4ca Merge pull request #19820 from avnik/update/qastools
qastools: 0.18.1 -> 0.21.0
2016-10-24 10:53:26 -04:00
Tim Steinbach ca74b4e8c7
httpstat: 1.2.0 -> 1.2.1 2016-10-24 10:13:40 -04:00
Alexander V. Nikolaev 979ee2ae1e qastools: 0.18.1 -> 0.21.0 2016-10-24 15:37:01 +03:00
Kovacsics Robert (NixOS) b5417b3e77 remind: fix tkremind 2016-10-24 11:24:04 +01:00
Tim Steinbach 8f457026ad Merge pull request #19808 from vbgl/lftp-4.7.3
lftp: 4.7.1 -> 4.7.3
2016-10-23 20:55:52 -04:00
Tim Steinbach f188dc0e2f Merge pull request #19807 from mimadrid/update/sudo-1.8.18p1
sudo: 1.8.18 -> 1.8.18p1
2016-10-23 20:51:10 -04:00
Kai Harries 2756711652
network-manager: give path to pppd executable
This fixes an issue I have faced when trying to connect to the internet
via wwan gsm modem.

(cherry picked from commit 0775adc599)

Closes https://github.com/NixOS/nixpkgs/pull/19812
2016-10-23 20:41:58 +02:00
Jaka Hudoklin 7956b2d65e xpra: add audio streaming support 2016-10-23 20:11:45 +02:00
Vincent Laporte 27750ac53a lftp: 4.7.1 -> 4.7.3 2016-10-23 18:03:55 +02:00
mimadrid 19b6d90cab
sudo: 1.8.18 -> 1.8.18p1 2016-10-23 17:57:16 +02:00
Joachim F 9088abc337 Merge pull request #19783 from joachifm/unbound
unbound: 1.5.9 -> 1.5.10
2016-10-23 16:28:34 +02:00
José Romildo Malaquias 8b7e3c3537 oblogout: init at 2009-11-18 2016-10-23 11:45:30 +02:00
Kai Harries dace6a176d
gnupg: take libusb include path from pkg-config
This makes smartcards (like the Nitrokey)  usable again.
2016-10-23 09:00:08 +02:00
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