Commit Graph

95963 Commits

Author SHA1 Message Date
John Ericson
8ca8293dbc libxml2: Don't use stdenv.cross 2017-06-28 00:51:59 -04:00
romildo
aad03268cb moka-icon-theme: 2017-02-13 -> 5.3.6 2017-06-27 22:52:00 -03:00
Diego Pontoriero
3dfa1d2282
google-cloud-sdk: 155.0.0 -> 159.0.0 2017-06-27 17:34:19 -07:00
Charles Strahan
8e73afb2e1 zoom-us: don't add mesa to the LD_LIBRARY_PATH
zoom-us was failing to launch under the proprietary nvidia drivers,
as described in the comments of #26596.

Closes #26916
2017-06-27 18:43:20 -04:00
Diego Pontoriero
5b90fa0151
terraform: 0.9.6 -> 0.9.9. 2017-06-27 15:04:11 -07:00
Langston Barrett
6fd4c3956e django-polymorphic: init at 1.2 2017-06-27 21:12:29 +00:00
Karn Kallio
07dc20e436 kcachegrind : Fix build by adding missing dependencies. 2017-06-27 22:33:06 +02:00
Tomas Hlavaty
6739a1773e sbcl: 1.3.17 -> 1.3.18
The attached patch updates sbcl version.

From efdeb164ab3ca748a960791b093638c982465e97 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Tue, 27 Jun 2017 22:15:17 +0200
Subject: [PATCH] sbcl: 1.3.17 -> 1.3.18
2017-06-27 16:29:52 -04:00
Frederik Rietdijk
f2b97e061a python.pkgs.intelhex: fix patch 2017-06-27 22:27:49 +02:00
Shea Levy
4d2597981d Partially revert "terraform: 0.9.4 -> 0.9.6."
Terraform point releases are significant changes, we need to keep old ones around

This reverts commit 6a27b46dee.
2017-06-27 16:26:07 -04:00
Michael Fellinger
54419f3016 using inherited instead 2017-06-27 22:22:08 +02:00
Michael Fellinger
704e04b108 dockerTools.buildImage: configurable timestamp
This way not all images have to be from 47 years ago, making it much easier to find the one you're looking for.
2017-06-27 22:11:17 +02:00
Karn Kallio
c710ddf7cd okteta : Fix build by adding missing dependencies. 2017-06-27 22:10:00 +02:00
Joachim F
2c30e5e754 Merge pull request #25441 from Hodapp87/draftsight
draftsight: init at 2017-SP1
2017-06-27 21:04:30 +01:00
leenaars
10126e13ef openpa: init at 1.0.4 (#26033) 2017-06-27 20:52:23 +01:00
Joachim F
767a8b2e9a Merge pull request #26073 from florianjacob/piwik-package
piwik & piwik service: init at 3.0.4
2017-06-27 20:51:16 +01:00
Joachim F
bccd3feed2 Merge pull request #26450 from oxij/pkg/fix/tor-browser
firefoxPackages: tor-browser: use gtk2 by default (like tor-browser-bin does)
2017-06-27 20:41:27 +01:00
Joachim F
4e44b63892 Merge pull request #26453 from oxij/pkg/fix/ranger
ranger: add imagePreviewSupport option and make previews work out of the box
2017-06-27 20:40:57 +01:00
Shea Levy
711637a4a7 Merge branch 'master' of github.com:NixOS/nixpkgs 2017-06-27 15:35:47 -04:00
Shea Levy
551dcb6783 Add ansible 2.3 2017-06-27 15:22:31 -04:00
Karn Kallio
67e4072282 k3b : Fix build by adding missing dependencies. 2017-06-27 21:14:00 +02:00
Joachim F
8dda321c1f Merge pull request #26724 from schneefux/pkg.shaarli
shaarli: 0.8.4 -> 0.9.0
2017-06-27 20:08:48 +01:00
Stefan Lau
55fc963122 rustRegistry: 2017-06-25 -> 2017-06-27 2017-06-27 21:06:33 +02:00
Vincent Laporte
b475d5f04c ocamlPackages.atd: 1.1.2 -> 1.12.0 2017-06-27 19:01:18 +00:00
Radek Benkel
53de56c0cc sauce-connect: 4.4.2 -> 4.4.7 (#26893) 2017-06-27 19:18:35 +01:00
Jörg Thalheim
f5b8a8fc10 Merge pull request #26882 from mzaccari/jruby-9.1.5.0
jruby: 9.0.5.0 -> 9.1.5.0
2017-06-27 18:45:14 +01:00
Vincent Laporte
9c68a8b2d2 ocamlPackages.angstrom: 0.4.0 -> 0.5.1 2017-06-27 17:28:33 +00:00
Trevor Joynson
068341b1c7 iptstate: init at 2.2.6 (#26878)
* Add iptstate package

* iptstate: nit pick
2017-06-27 18:27:13 +01:00
Jörg Thalheim
c30cf6f0f1 Merge pull request #26891 from orivej/libunwind
libunwind: 1.1 -> 1.2.1
2017-06-27 18:18:57 +01:00
Jörg Thalheim
d2c500f05c Merge pull request #26900 from cohei/update-fswatch
fswatch: 1.5.0 -> 1.9.3
2017-06-27 18:08:28 +01:00
Daiderd Jordan
5740c9e0e1 Merge pull request #26772 from robx/fix-v8
v8_3_16_14: fix OS X build by passing deployment version
2017-06-27 18:31:28 +02:00
Vincent Laporte
b13245c2a3 ocamlPackages.bos: 0.1.4 -> 0.1.6 2017-06-27 16:14:29 +00:00
Joachim F
c27fc66856 Merge pull request #26904 from Ma27/geogebra/make-language-configurable
geogebra: make `language` configurable
2017-06-27 16:21:00 +01:00
Joachim F
e6b7dcd1f6 Merge pull request #26871 from NickHu/dfhack
dfhack: 0.43.05-alpha4 -> 0.43.05-r1
2017-06-27 16:14:36 +01:00
Joachim F
bcbf45ff1f Merge pull request #26886 from jonafato/remove-thunderbird-bin-updater
Remove old thunderbird-bin update script
2017-06-27 16:12:37 +01:00
tkatchev
45f6bb6ba5 boost-build: update to version 2016.03 2017-06-27 18:00:40 +03:00
Thomas Tuegel
dbb3037d27 Merge pull request #26902 from ttuegel/plasma-5.10.3
plasma5: 5.10.2 -> 5.10.3
2017-06-27 08:06:32 -05:00
Tim Steinbach
d2e199ca3c
linux: 4.4.73 -> 4.4.74 2017-06-27 08:14:47 -04:00
Tim Steinbach
493ae24872 Merge pull request #26870 from lsix/update_nano
nano: 2.8.4 -> 2.8.5
2017-06-27 08:12:52 -04:00
Tim Steinbach
719b506bad Merge pull request #26803 from NeQuissimus/rkt_1_27_0
rkt: 1.26.0 -> 1.27.0
2017-06-27 08:09:40 -04:00
Thomas Tuegel
074bccb43b
plasma5: 5.10.2 -> 5.10.3
This is a scheduled bugfix release. Several fixes are related to integrating
Plasma 5.10 and Qt 5.9, particularly a serious bug in KWin.
2017-06-27 06:58:34 -05:00
Josef Kemetmueller
2cb5246dd8 gogs: 0.10.18 -> 0.11.19 2017-06-27 11:41:19 +00:00
TANIGUCHI Kohei
f48e400133 fswatch: 1.5.0 -> 1.9.3 2017-06-27 20:24:30 +09:00
Robert
107d53f40c bundix: 2.2.0 -> 2.2.1 (#26894)
This fixes `fetchurl-force.nix` not being installed, which breaks
bundix for some gems.

E.g.

```
$ nix-build --argstr url https://rubygems.org/gems/nio4r-2.1.0.gem /nix/store/y6959dxal86l3alc0ryf7752prbbkzxg-bundix-2.2.0/lib/ruby/gems/2.3.0/gems/bundix-2.2.0/lib/bundix/fetchurl-force.nix
error: getting status of ‘/nix/store/y6959dxal86l3alc0ryf7752prbbkzxg-bundix-2.2.0/lib/ruby/gems/2.3.0/gems/bundix-2.2.0/lib/bundix/fetchurl-force.nix’: No such file or directory
```
2017-06-27 10:24:16 +01:00
Cray Elliott
71e495e10f winetricks: 20170327 -> 20170614 2017-06-27 02:00:49 -07:00
Maximilian Bosch
9516bbf172
geogebra: make language configurable 2017-06-27 09:51:06 +02:00
Orivej Desh
842250064b libunwind: 1.1 -> 1.2.1 2017-06-27 01:30:48 +00:00
Jon Banafato
d8e5c75f75 Remove old thunderbird-bin update script
`thunderbird-bin` appears to now use the
`maintainers/scripts/update.nix` script instead of this ruby script, so
the latter should be removed.
2017-06-26 19:54:24 -04:00
Franz Pletz
b8bfc8dae2
httpd: don't install suid executables into nix store 2017-06-27 01:51:18 +02:00
WilliButz
72ed360277 freeradius: 3.0.12 -> 3.0.14 (#26874) 2017-06-27 01:44:00 +02:00
Frederik Rietdijk
9dbfd87ab6 Merge pull request #26849 from vbgl/skrooge-2.8
skrooge: 2.7.0 -> 2.8.1
2017-06-26 22:23:36 +02:00
Frederik Rietdijk
25b12febee Merge pull request #26857 from jerith666/krfb-qtx11extras
krfb: add new qtx11extras dependency
2017-06-26 22:16:28 +02:00
Daniel Peebles
2dc0eaf0f1 Merge pull request #26797 from LnL7/erlang-versions
erlang: remove erlangR16 and all versioned variants from all-packages
2017-06-26 16:04:28 -04:00
Daiderd Jordan
1389f28cd0 Merge pull request #26804 from LnL7/erlangR19
erlang: change default to R19
2017-06-26 22:00:03 +02:00
Daiderd Jordan
d76bc8ed15 Merge pull request #26818 from LnL7/llvm-manpages
llvm-packages: get rid of extra build depedencies for manpages
2017-06-26 21:40:55 +02:00
Robert Vollmert
c3da83cd40 v8_3_16_14: fix OS X build
Issues addressed:
- xcode build failed with
    ... was built for newer OSX version (10.10) than being linked (10.5)
  fixed by setting GYP mac deployment target to the nix value
- a gyp bug when SDKROOT is not set (and removed an orphaned gyp patch
- path to python in generated gyp-mac-tool
- noisy build due to static assert warnings, by silencing warnings
- use of system xcodebuild and libtool replaced by darwin.cctools
2017-06-26 21:28:43 +02:00
Jörg Thalheim
2da82a1d19 racerd: 2016-12-24 -> 2017-02-17 2017-06-26 20:22:09 +01:00
Michael Zaccari
107fabf41c jruby: 9.0.5.0 -> 9.1.5.0 2017-06-26 14:45:15 -04:00
Daiderd Jordan
071803955e
llvm-packages: mark manpages as lowPrio 2017-06-26 20:25:14 +02:00
Daiderd Jordan
f65b5365bb
darwin-stdenv: remove llvm/clang manpage overrides from 2017-06-26 20:24:17 +02:00
Daiderd Jordan
f60a36a910
llvm-packages: get rid of extra build depedencies for manpages
Fixes #26756
2017-06-26 20:24:16 +02:00
Vladimír Čunát
ce8178ed93
qtinstaller: fix broken meta
The invalid meta.outputsToInstall has been blocking channel updates.
https://mailman.science.uu.nl/pipermail/nix-dev/2017-June/023991.html
2017-06-26 19:47:19 +02:00
Vincent Laporte
456089b74d ocamlPackages.mlgmp: disable for OCaml ≥ 4.03 2017-06-26 19:38:47 +02:00
Vincent Laporte
ac83ef3994 glsurf: 3.3 -> 3.3.1 2017-06-26 19:24:33 +02:00
Jörg Thalheim
a9ba1e101e rustNightlyBin: 2017-05-30 -> 2017-06-26 2017-06-26 15:18:55 +01:00
Tim Steinbach
c90a4b8541
linux: 4.12-rc6 -> 4.12-rc7 2017-06-26 09:58:37 -04:00
David McFarland
63a1a2ac63 stdenv: disable -fPIC on cygwin
It's always on, and you get a warning if you specify it
2017-06-26 09:33:44 -03:00
David McFarland
bf517c1c16 pkgconfig: fix cygwin build 2017-06-26 09:33:35 -03:00
David McFarland
f4a2351b2b gdbm: fix cygwin build 2017-06-26 09:33:32 -03:00
David McFarland
f81117e324 stdenv: remove leftover 'system' reference
the rest were removed in 1dc6f15de9
2017-06-26 09:33:28 -03:00
David McFarland
cbc0db08f9 zlib: fix cygwin build 2017-06-26 09:33:25 -03:00
David McFarland
c580ab4fcf openssl: fix cygwin build 2017-06-26 09:33:22 -03:00
David McFarland
b92840487e gettext: fix cygwin build 2017-06-26 09:33:19 -03:00
David McFarland
260afef667 libiconv: remove old cygwin hacks 2017-06-26 09:33:16 -03:00
David McFarland
84a4ee5c04 gpm: allow cygwin 2017-06-26 09:33:12 -03:00
David McFarland
a08024bcb0 procps-ng: allow cygwin 2017-06-26 09:33:09 -03:00
David McFarland
f3c039ff8d perl-LocaleGettext: fix test failure on cygwin by setting $LANG 2017-06-26 09:33:06 -03:00
David McFarland
af165175da bash: fix cygwin build 2017-06-26 09:33:03 -03:00
David McFarland
18125e6f50 help2man: help wrapper find libintl on cygwin 2017-06-26 09:26:10 -03:00
David McFarland
33eec8e105 ncurses: fix cygwin build 2017-06-26 09:26:10 -03:00
David McFarland
3c76cd7626 libxslt: fix cygwin libtool error 2017-06-26 09:26:10 -03:00
David McFarland
087c32715b python2: copy stub library to output on cygwin 2017-06-26 09:26:10 -03:00
David McFarland
f254af9c19 w3m: remove old cygwin patch 2017-06-26 09:26:10 -03:00
David McFarland
504f11bbab glib: allow cygwin 2017-06-26 09:26:10 -03:00
David McFarland
23efc95a74 gzip: remove cygwin hack
The file being patched doesn't exist any more, and gzip now builds
on cygwin without this.
2017-06-26 09:26:10 -03:00
David McFarland
dd8d0e3000 cygwin: force native symlinks for libraries
This will override the existing winsymlinks setting.  nativestrict
will cause ln to fail if it's unable to create a native symlink.
Native symlinks are required for the windows dll loader to find the
libraries.

This script is also used for cross-mingw, but setting CYGWIN
shouldn't cause a problem.
2017-06-26 09:26:10 -03:00
David McFarland
cdc5cf52c1 cygwin: rebase fixes
- use fixupOutputsHook to find libs in all outputs
- don't rebase symlinks
2017-06-26 09:26:10 -03:00
Nick Hu
24156c64b4 dfhack: 0.43.05-alpha4 -> 0.43.05-r1 2017-06-26 10:18:55 +01:00
Lancelot SIX
1b792b4edf
nano: 2.8.4 -> 2.8.5
See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00012.html
for release information.
2017-06-26 11:01:55 +02:00
Jörg Thalheim
ff04c361cf Merge pull request #26812 from bramd/fix/brltty-5.5
brltty: 5.4 -> 5.5
2017-06-26 10:01:30 +01:00
Nicolas Truessel
813feae594 chromium: 59.0.3071.86 -> 59.0.3071.109 2017-06-26 09:24:56 +02:00
Franz Pletz
b788956239
libcgroup: do not set suid bit in nix store 2017-06-26 09:13:34 +02:00
Emmanuel Rosa
994998e475 thunderbird: 52.2.0 -> 52.2.1 2017-06-26 09:01:45 +02:00
Michał Pałka
80e0cda7ff xen: patch for XSAs: 216, 217, 218, 219, 220, 221, 222, and 224
XSA-216 Issue Description:

> The block interface response structure has some discontiguous fields.
> Certain backends populate the structure fields of an otherwise
> uninitialized instance of this structure on their stacks, leaking
> data through the (internal or trailing) padding field.

More: https://xenbits.xen.org/xsa/advisory-216.html

XSA-217 Issue Description:

> Domains controlling other domains are permitted to map pages owned by
> the domain being controlled.  If the controlling domain unmaps such a
> page without flushing the TLB, and if soon after the domain being
> controlled transfers this page to another PV domain (via
> GNTTABOP_transfer or, indirectly, XENMEM_exchange), and that third
> domain uses the page as a page table, the controlling domain will have
> write access to a live page table until the applicable TLB entry is
> flushed or evicted.  Note that the domain being controlled is
> necessarily HVM, while the controlling domain is PV.

More: https://xenbits.xen.org/xsa/advisory-217.html

XSA-218 Issue Description:

> We have discovered two bugs in the code unmapping grant references.
>
> * When a grant had been mapped twice by a backend domain, and then
> unmapped by two concurrent unmap calls, the frontend may be informed
> that the page had no further mappings when the first call completed rather
> than when the second call completed.
>
> * A race triggerable by an unprivileged guest could cause a grant
> maptrack entry for grants to be "freed" twice.  The ultimate effect of
> this would be for maptrack entries for a single domain to be re-used.

More: https://xenbits.xen.org/xsa/advisory-218.html

XSA-219 Issue Description:

> When using shadow paging, writes to guest pagetables must be trapped and
> emulated, so the shadows can be suitably adjusted as well.
>
> When emulating the write, Xen maps the guests pagetable(s) to make the final
> adjustment and leave the guest's view of its state consistent.
>
> However, when mapping the frame, Xen drops the page reference before
> performing the write.  This is a race window where the underlying frame can
> change ownership.
>
> One possible attack scenario is for the frame to change ownership and to be
> inserted into a PV guest's pagetables.  At that point, the emulated write will
> be an unaudited modification to the PV pagetables whose value is under guest
> control.

More: https://xenbits.xen.org/xsa/advisory-219.html

XSA-220 Issue Description:

> Memory Protection Extensions (MPX) and Protection Key (PKU) are features in
> newer processors, whose state is intended to be per-thread and context
> switched along with all other XSAVE state.
>
> Xen's vCPU context switch code would save and restore the state only
> if the guest had set the relevant XSTATE enable bits.  However,
> surprisingly, the use of these features is not dependent (PKU) or may
> not be dependent (MPX) on having the relevant XSTATE bits enabled.
>
> VMs which use MPX or PKU, and context switch the state manually rather
> than via XSAVE, will have the state leak between vCPUs (possibly,
> between vCPUs in different guests).  This in turn corrupts state in
> the destination vCPU, and hence may lead to weakened protections
>
> Experimentally, MPX appears not to make any interaction with BND*
> state if BNDCFGS.EN is set but XCR0.BND{CSR,REGS} are clear.  However,
> the SDM is not clear in this case; therefore MPX is included in this
> advisory as a precaution.

More: https://xenbits.xen.org/xsa/advisory-220.html

XSA-221 Issue Description:

> When polling event channels, in general arbitrary port numbers can be
> specified.  Specifically, there is no requirement that a polled event
> channel ports has ever been created.  When the code was generalised
> from an earlier implementation, introducing some intermediate
> pointers, a check should have been made that these intermediate
> pointers are non-NULL.  However, that check was omitted.

More: https://xenbits.xen.org/xsa/advisory-221.html

XSA-222 Issue Description:

> Certain actions require removing pages from a guest's P2M
> (Physical-to-Machine) mapping.  When large pages are in use to map
> guest pages in the 2nd-stage page tables, such a removal operation may
> incur a memory allocation (to replace a large mapping with individual
> smaller ones).  If this allocation fails, these errors are ignored by
> the callers, which would then continue and (for example) free the
> referenced page for reuse.  This leaves the guest with a mapping to a
> page it shouldn't have access to.
>
> The allocation involved comes from a separate pool of memory created
> when the domain is created; under normal operating conditions it never
> fails, but a malicious guest may be able to engineer situations where
> this pool is exhausted.

More: https://xenbits.xen.org/xsa/advisory-222.html

XSA-224 Issue Description:

> We have discovered a number of bugs in the code mapping and unmapping
> grant references.
>
> * If a grant is mapped with both the GNTMAP_device_map and
> GNTMAP_host_map flags, but unmapped only with host_map, the device_map
> portion remains but the page reference counts are lowered as though it
> had been removed. This bug can be leveraged cause a page's reference
> counts and type counts to fall to zero while retaining writeable
> mappings to the page.
>
> * Under some specific conditions, if a grant is mapped with both the
> GNTMAP_device_map and GNTMAP_host_map flags, the operation may not
> grab sufficient type counts.  When the grant is then unmapped, the
> type count will be erroneously reduced.  This bug can be leveraged
> cause a page's reference counts and type counts to fall to zero while
> retaining writeable mappings to the page.
>
> * When a grant reference is given to an MMIO region (as opposed to a
> normal guest page), if the grant is mapped with only the
> GNTMAP_device_map flag set, a mapping is created at host_addr anyway.
> This does *not* cause reference counts to change, but there will be no
> record of this mapping, so it will not be considered when reporting
> whether the grant is still in use.

More: https://xenbits.xen.org/xsa/advisory-224.html
2017-06-26 07:01:24 +00:00
Bas van Dijk
35e5719fe9 elasticsearch: 5.4.0 -> 5.4.2 2017-06-26 08:47:28 +02:00
Vincent Laporte
4c0203b094 ocamlPackages.lablgtk_2_14: disable for OCaml ≥ 4.04 2017-06-26 08:39:05 +02:00
Jörg Thalheim
7df83abe85 keepassx-community: 2.1.4 -> 2.2.0 2017-06-26 07:31:44 +01:00
Vincent Laporte
8d8fdce611 ocamlPackages.lablgtk: don’t strip 2017-06-26 08:27:03 +02:00
Vincent Laporte
6b89bcbaa6 ocamlPackages.core_bench: fix on OCaml ≥ 4.03 2017-06-26 07:57:17 +02:00
Vincent Laporte
e082162f09 ocamlPackages.type_conv-{108,109}: disable for OCaml ≥ 4.03 2017-06-26 05:02:42 +02:00
Vincent Laporte
41b3b2c077 ocamlPackages.sexplib_p4: disable for OCaml ≥ 4.03 2017-06-26 04:38:49 +02:00
Vincent Laporte
459f17a8d5 ocamlPackages.uri_p4: disable for OCaml ≥ 4.03 2017-06-26 04:10:02 +02:00
Vincent Laporte
7829eb794f ocamlPackages.reason: 1.13.4 -> 2.0.0 2017-06-26 04:10:02 +02:00
Vincent Laporte
f0dbe18e9b ocamlPackages.twt: don’t strip 2017-06-26 04:10:02 +02:00
Pascal Bach
e5def4442e minio: 20170316 -> 20170613 2017-06-26 04:07:37 +02:00
Franz Pletz
d4002bd6d4 Merge pull request #26863 from cleverca22/update-toxvpn
toxvpn: 20161230 -> 2017-06-25
2017-06-26 03:51:51 +02:00
Franz Pletz
d80f2e18c6
uthash: 1.9.9 -> 2.0.2 2017-06-26 03:48:42 +02:00
Franz Pletz
edf5cbdc33
librsync: 1.0.0 -> 2.0.0 2017-06-26 03:48:41 +02:00
Franz Pletz
1a7f330335
burp_1_3: remove 2017-06-26 03:48:41 +02:00
Franz Pletz
356bac704a
burp: 1.4.40 -> 2.0.54 2017-06-26 03:48:41 +02:00
Franz Pletz
3156263876
rsync: build with iconv, zlib & popt from nixpkgs
The rsync binary was previously built without iconv support which is needed
for utf-8 conversions on darwin. Fixes #26864.

Additionally rsync used to be built with bundled versions of zlib and popt
that were outdated. This decreases the size of the rsync binary by ~82KB.
2017-06-26 03:48:41 +02:00
Tim Steinbach
1a25495b63
git: 2.13.1 -> 2.13.2 2017-06-25 21:13:23 -04:00
AndersonTorres
0e14a8621d mpv: eliminate config.mpv options
Removing all `config.mpv.*` options will improve readability. MPV has many
configurable options, and using the config approach is prone to confusion and
unnecessary code duplication. If needed, the user can `override` the relevant
variables in the function itself, so no functionality is lost.

Closes issue #26786
2017-06-26 02:51:09 +02:00
Franz Pletz
639b74e7be
Revert "linux: patch CVE-2017-1000364 (stack clash)"
This reverts commit aab71b31d5.

This was integrated into the stable 4.9 and 4.11 kernels.
2017-06-26 02:23:59 +02:00
Franz Pletz
40a04291c9
Merge branch 'master' into staging 2017-06-26 02:23:38 +02:00
Franz Pletz
7cfd1c8c1b
glibc: fix i686 build 2017-06-26 02:19:08 +02:00
taku0
800deb5273 thunderbird: 52.2.0 -> 52.2.1 2017-06-26 09:08:38 +09:00
taku0
22773a20e5 thunderbird-bin: 52.2.0 -> 52.2.1 2017-06-26 09:08:28 +09:00
michael bishop
bb16bced36
toxvpn: 20161230 -> 2017-06-25 2017-06-25 20:17:20 -03:00
Franz Pletz
d42f502c84
Revert "cc-wrapper: add stackcheck hardening (stack clash)"
This reverts commit 4150f5e8ba.

The stack protector hardening breaks the llvm_4 build.
2017-06-26 01:12:38 +02:00
Franz Pletz
a4252649bf
Revert "cc-wrapper: fix darwin"
This reverts commit c3a8595276.

The stack protector hardening breaks the llvm_4 build.
2017-06-26 01:12:11 +02:00
Pascal Bach
572786387d gitlab-runner: 9.2.0 -> 9.3.0 2017-06-26 01:08:30 +02:00
aszlig
bd63daae03
chromium: Add installation of libGLESv2.so
The following errors occur when you start Chromium prior to this commit:

[2534:2534:0625/202928.673160:ERROR:gl_implementation.cc(246)] Failed to
load .../libexec/chromium/swiftshader/libGLESv2.so:
../libexec/chromium/swiftshader/libGLESv2.so: cannot open shared object
file: No such file or directory
[2534:2534:0625/202928.674434:ERROR:gpu_child_thread.cc(174)] Exiting
GPU process due to errors during initialization

While in theory we do not strictly need libGLESv2.so, in practice this
means that the GPU process isn't starting up at all which in turn leads
to crawling rendering performance on some sites.

So let's install all shared libraries in swiftshader.

I've tested this with the chromium.stable NixOS VM test and also locally
on my machine and the errors as well as the performance issues are gone.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-06-25 22:43:25 +02:00
Matt McHenry
cbb39f4382 krfb: add new qtx11extras dependency 2017-06-25 15:35:59 -04:00
Peter Simons
c43a2d392f git-annex: the overrideScope must be applied first to avoid bug https://github.com/NixOS/nixpkgs/issues/26852 2017-06-25 21:24:22 +02:00
Jörg Thalheim
ea5330c0e2 Merge pull request #26118 from yurrriq/update/pkgs/misc/lilypond-with-fonts
lilypond-with-fonts: fix quoting
2017-06-25 18:30:15 +01:00
Jörg Thalheim
239920d745 Merge pull request #26831 from volth/plv8-init-2.0.3
plv8: init at 2.0.3
2017-06-25 18:20:37 +01:00
Benno Fünfstück
883148ef26 pip-tools: fix build 2017-06-25 18:55:18 +02:00
Vincent Laporte
999892fd1e skrooge: 2.7.0 -> 2.8.1 2017-06-25 18:45:39 +02:00
Gabriel Ebner
252e9ec84a microcodeIntel: 20161104 -> 20170511 2017-06-25 17:41:57 +02:00
Joachim F
90d3a0314c Merge pull request #26836 from Ma27/update/geogebra
geogebra: 5-0-361-0 -> 5-0-369-0
2017-06-25 16:35:13 +01:00
Joachim F
c235bf3e3d Merge pull request #26792 from mdorman/emacs-updates
Automated Emacs package updates
2017-06-25 15:33:19 +01:00
Roman Volosatovs
fd0f02628b
mopidy-local-sqlite: init at 1.0.0 2017-06-25 14:26:15 +02:00
Bram Duvigneau
dac2a7693a brltty: 5.4 -> 5.5 2017-06-25 12:12:57 +00:00
Franz Pletz
ed515c8080
weechat: 1.8 -> 1.9 2017-06-25 14:03:18 +02:00
Jörg Thalheim
a93225fc6c Merge pull request #26835 from unaizalakain/init_qgo
qgo: init at unstable-2016-06-23
2017-06-25 12:05:32 +01:00
Jörg Thalheim
7a10cc84a0 rustRegistry: switch to mkDerivation
fixes #26582
2017-06-25 11:56:29 +01:00
tilpner
c610f99d8f Expose custom Rust registry versions
This allows users to specify a custom registry src,
because currently every packager would need to create
an outdated Cargo.lock just to be compatible with the
probably outdated rustRegistry in nixpkgs.

Currently there is no easy way to convince cargo to
do that, so this makes that workaround unnecessary.
2017-06-25 11:56:15 +01:00
Maximilian Bosch
f5665e9ab4
geogebra: 5-0-361-0 -> 5-0-369-0 2017-06-25 12:39:30 +02:00
Jörg Thalheim
46427b77f4 Merge pull request #26690 from DIzFer/telegram-update
tdesktop: 1.0.27 -> 1.1.7
2017-06-25 11:37:21 +01:00
Unai Zalakain
6e52efe9eb
qgo: init at unstable-2016-06-23 2017-06-25 12:29:18 +02:00
Peter Simons
b4973a5bbb hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
ec9f3d302b.
2017-06-25 12:21:55 +02:00
Peter Simons
9721c54592 git-annex: replacing optparse-applicative needs a deep override
| Warning: This package indirectly depends on multiple versions of the same
 | package. This is highly likely to cause a compile failure.
 | package wai-app-static-3.1.6.1 requires optparse-applicative-0.13.2.0
 | package tasty-rerun-1.1.6 requires optparse-applicative-0.13.2.0
 | package tasty-0.11.2.1 requires optparse-applicative-0.13.2.0
 | package git-annex-6.20170520 requires optparse-applicative-0.14.0.0
2017-06-25 12:21:55 +02:00
Jörg Thalheim
4ef00cab4e Merge pull request #26733 from juliendehos/opencv
opencv: add openblas support
2017-06-25 10:41:46 +01:00
Jörg Thalheim
bc488d4cb5 Merge pull request #26834 from calvertvl/upgrade-calibre-to-3.1.1
calibre: 2.84.0 -> 3.1.1
2017-06-25 10:22:50 +01:00
Jörg Thalheim
f506b72308 krita: 3.1.3 -> 3.1.4 2017-06-25 10:18:45 +01:00
Jörg Thalheim
bc7d575c52 Merge pull request #26740 from lsix/update_gsl
gsl: 2.3 -> 2.4
2017-06-25 10:11:50 +01:00
Jörg Thalheim
de21c43257 Merge pull request #26829 from dywedir/tiled
tiled: 0.18.2 -> 1.0.1
2017-06-25 09:48:10 +01:00
Jörg Thalheim
24e9ec3166 marble: fix src hash 2017-06-25 09:38:32 +01:00
Jörg Thalheim
f319442b77 keepassxc: fix 4.9 compatibility 2017-06-25 09:36:06 +01:00
Jörg Thalheim
0ae147c50a Merge pull request #26771 from aij/fix/libatomic_ops
libatomic_ops: Provide alternate URL
2017-06-25 09:17:10 +01:00
Jörg Thalheim
ad42e5f6e5 Merge pull request #26795 from veprbl/root_6.10.00
root: 6.09.02 -> 6.10.00
2017-06-25 09:14:30 +01:00
Frederik Rietdijk
fcd5804d7f konversation: 1.6.2 -> 1.7.2 and fix build 2017-06-25 09:56:34 +02:00
Frederik Rietdijk
fdf181237b yakuake: fix build 2017-06-25 09:56:34 +02:00
Frederik Rietdijk
c7bc8b42f2 kdeconnect: fix build 2017-06-25 09:56:34 +02:00
Victor Calvert
e600317768 calibre: 2.84.0 -> 3.1.1
links-privacy patch was removed as the content server was
rewritten in calibre 3.0.

The rewrite also needed a couple more python packages.
2017-06-25 03:52:36 -04:00
Jörg Thalheim
3913522a41 Merge pull request #26828 from rvolosatovs/init/mopidy-local-images
mopidy-local-images: init at 1.0.0
2017-06-25 08:39:56 +01:00
Roman Volosatovs
69eddfa090 pythonPackages.pylast: 0.5.11 -> 1.8.0 (#26825)
* maintainers: add rvolosatovs

* pythonPackages.pylast: 0.5.11 -> 1.8.0

* pythonPackages.pylast: refactor

- Update homepage
- Add rvolosatovs to maintainers
- Fix test comment

* pylast: move out of python-packages.nix
2017-06-25 08:32:05 +01:00
Jörg Thalheim
6aad18a668 pythonPackages.uritools: keep alphabetic order 2017-06-25 08:24:50 +01:00
Jörg Thalheim
6450a14880 Merge pull request #26826 from rvolosatovs/init/uritools
pythonPackages.uritools: init at 2.0.0
2017-06-25 08:22:31 +01:00
Jörg Thalheim
4b6b811b34 Merge pull request #26827 from rvolosatovs/init/spotipy
pythonPackages.spotipy: init at 2.4.4
2017-06-25 08:18:09 +01:00
Jörg Thalheim
5d5dde671e pythonPackages.spotipy: keep alphabetic ordering 2017-06-25 08:16:58 +01:00
Jörg Thalheim
5b7fd8f3b8 nailgun: use makeWrapper 2017-06-25 07:46:51 +01:00
Volth
60e19e7393 plv8: init at 2.0.3 2017-06-25 01:20:51 +00:00
Volth
649a036dcc nailgun: init at 0.9.1 2017-06-25 01:08:09 +00:00
Roman Volosatovs
4ebaed854f
mopidy-local-images: init at 1.0.0 2017-06-25 00:26:02 +02:00
dywedir
33e4afa172 tiled: 0.18.2 -> 1.0.1 2017-06-25 01:08:00 +03:00
Roman Volosatovs
4abb292f75
pythonPackages.spotipy: requests2 -> requests
Seems like this breaks build of #26518
2017-06-24 23:58:37 +02:00
Roman Volosatovs
ca69972f9a
pythonPackages.spotipy: init at 2.4.4 2017-06-24 23:56:34 +02:00
Roman Volosatovs
90f85a2de5
pythonPackages.uritools: init at 2.0.0 2017-06-24 23:54:19 +02:00
Bjørn Forsman
6916f24e84 treewide: enableParallelBuild -> enableParallelBuilding 2017-06-24 22:22:48 +02:00
Thomas Tuegel
1593bd2423 Merge pull request #26817 from ttuegel/qt-5.9
Qt 5.9
2017-06-24 15:19:36 -05:00
Thomas Tuegel
69438a397f
khotkeys: fix intermittant parallel build failure 2017-06-24 15:18:58 -05:00
Jörg Thalheim
c0303c7110 Merge pull request #26822 from 4z3/bitlbee-facebook
bitlbee-facebook: 1.1.0 -> 1.1.1
2017-06-24 20:45:18 +01:00
Der Pfirsich
2c6fbc737f spotify: 1.0.55.487.g256699aa-16 -> 1.0.57.474.gca9c9538-30 (#26794) 2017-06-24 20:41:05 +01:00
Jörg Thalheim
09704d35f2 Merge pull request #26762 from dtzWill/update/creduce
creduce: 2.6.0 -> 2.7.0, now uses LLVM 4
2017-06-24 19:59:30 +01:00
Jörg Thalheim
6741b3ac7c Merge pull request #26807 from ajevans85/crashplan-4-8-3
crashplan: 4.8.2 -> 4.8.3
2017-06-24 19:57:28 +01:00
Tim Steinbach
03aed4cfcf
linux-copperhead: 4.11.6.d -> 4.11.7.a 2017-06-24 14:50:41 -04:00
tv
267ea50604 bitlbee-facebook: 1.1.0 -> 1.1.1 2017-06-24 20:37:32 +02:00
Jörg Thalheim
8f9d3bfddb Merge pull request #26594 from jchildren/master
antlr4_7: init at 4.7
2017-06-24 18:55:08 +01:00
Jörg Thalheim
5dc7314c53 Merge pull request #26749 from gentoofreak/libopus-1.2
libopus: 1.1.5 -> 1.2
2017-06-24 18:43:58 +01:00
Dmitry Kalinkin
ada12f46dc
root: 6.09.02 -> 6.10.00
also workaround #26197
2017-06-24 13:38:25 -04:00
Jörg Thalheim
d853c3b895 Merge pull request #26707 from dywedir/rust-bindgen
rust-bindgen: 0.24.0 -> 0.25.5
2017-06-24 18:23:20 +01:00
Jörg Thalheim
c09d4ae6a8 Merge pull request #26729 from igsha/languagetool
languagetool: fix arguments passing
2017-06-24 18:21:00 +01:00
Jörg Thalheim
d4f45ae393 Merge pull request #26734 from nh2/statifier-1.7.4
statifier: 1.7.3 -> 1.7.4
2017-06-24 18:16:25 +01:00
Jörg Thalheim
3e735addd0 Merge pull request #26757 from dtzWill/update/upx-3.94
upx: 3.93 -> 3.94
2017-06-24 18:05:25 +01:00
Daiderd Jordan
09c1768afd
plex: 1.5.5 -> 1.5.7 2017-06-24 19:00:30 +02:00
Samuel Leathers
5d7fd7e7fa mailhog: init at 1.0.0 (#26821)
* mailhog: init at 1.0.0

* formatting nitpicks
2017-06-24 17:05:34 +01:00
Jörg Thalheim
da1525260b Merge pull request #26820 from sigma/pr/hugo-0.24
hugo: 0.24 -> 0.24.1
2017-06-24 16:40:01 +01:00
Volth
85b9ff29e9 rrdtool: apply upstream patch to fix file permission
fixes #26780 #26782
2017-06-24 16:38:20 +01:00
Yann Hodique
1be7323f5a hugo: 0.24 -> 0.24.1 2017-06-24 08:26:44 -07:00
Hector Jusforgues
6bb5e991ab perl-packages: fix typo in comment (#26819) 2017-06-24 16:25:19 +01:00
Jörg Thalheim
40ccf99373 Merge pull request #26743 from sigma/pr/hugo-0.24
hugo: 0.23 -> 0.24
2017-06-24 16:23:52 +01:00
Tim Steinbach
b06cb59fc1
linux: 4.9.33 -> 4.9.34 2017-06-24 11:22:56 -04:00
Tim Steinbach
3a68f0bb78
linux: 4.11.6 -> 4.11.7 2017-06-24 11:20:32 -04:00
Masayuki Takeda
69153f12e4 networkmanager: fix arping path 2017-06-24 14:46:16 +02:00
Thomas Tuegel
22b10bac78
qt5: 5.8.0 -> 5.9.0
Qt 5.8 is immediately removed because its support window is ended.

The qtlocation module is built with `enableParallelBuilding = false` so that the
clipper library will be built before the components which link to it.

kjs now depends directly on pcre. The dependency was previously propagated from
qtbase, which now depends on pcre2.
2017-06-24 07:43:57 -05:00
Bjørn Forsman
b8658f629b fetchgit: support "git@server:repo" URLs
Update the code that extracts the base name from a git repo URL so that
it can deal with URLs like "git@server:repo".
2017-06-24 14:34:08 +02:00
Jörg Thalheim
909fb246fd Merge pull request #26783 from Gricad/openmpi
openmpi: 1.10.1 -> 1.10.7
2017-06-24 12:12:26 +01:00
Daiderd Jordan
961d42d80f Merge pull request #26811 from gleber/erlang-makeExtensible
erlang: use makeExtensible
2017-06-24 13:00:36 +02:00
Jörg Thalheim
8810a69adb Merge pull request #26778 from therealpxc/fish
fish: 2.5.0 -> 2.6.0
2017-06-24 12:00:20 +01:00
Gleb Peregud
0123200dee stdenv: add stawman docs for makeOverridable
Also fix a typo in docs in haskell-modules.
2017-06-24 12:47:57 +02:00
Gleb Peregud
de0e9e7a86 erlang: refactor: switch to lib.makeExtensible
Use standardized implementation of attribute set extensibility mechanism
instead of manually re-implementing it.

Suggested by @cstrahan at https://github.com/NixOS/nixpkgs/pull/26668.
2017-06-24 12:30:04 +02:00
Jörg Thalheim
5e2de6d846 iwd: 2017-04-21 -> 2017-06-02 2017-06-24 10:29:14 +01:00
Jörg Thalheim
dc6e5dce2d lttng-tools: 2.9.3 -> 2.9.5 2017-06-24 10:26:53 +01:00
Jörg Thalheim
088ab901c5 lttng-ust: 2.9.0 -> 2.9.1 2017-06-24 10:26:31 +01:00
Jörg Thalheim
a087e5a53a lttng-modules: 2.9.1 -> 2.9.3 2017-06-24 10:26:19 +01:00
ajevans
76e019ad9f crashplan: 4.8.2 -> 4.8.3 2017-06-24 16:19:30 +10:00
Peter Hoeg
68a4dc82c0 heimdall: add OSX docs too 2017-06-24 13:18:04 +08:00
Peter Hoeg
276adb96fa heimdall: 1.4.1 -> 1.4.2 2017-06-24 12:49:11 +08:00
John Ericson
87fab3d6a5 Merge some merged cross-compilation PRs into into staging 2017-06-23 20:24:27 -04:00
Daiderd Jordan
dc1ae6f18d
erlang: use R18 for packages that don't work with R19 2017-06-24 01:52:31 +02:00
Daiderd Jordan
39497df1ef
erlang: change default R18 -> R19 2017-06-24 01:52:24 +02:00
Tim Steinbach
328617accd
rkt: 1.26.0 -> 1.27.0 2017-06-23 19:24:19 -04:00
aszlig
06271b6eba
krita: Fix build dependencies
First of all, we need a newer version of Vc, because at least version
1.1.0 is required for Krita 3.1.3.

Also, qtmultimedia and qtx11extras were missing.

Built and tested successfully on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
2017-06-23 22:15:05 +02:00
John Ericson
a24031317a Merge pull request #26798 from obsidiansystems/ios-cross-stdenv
ios-cross: Just properly use the cc-wrapper
2017-06-23 15:00:19 -04:00
Daiderd Jordan
0fafa0d7d7
erlang: remove erlangR16 and all versioned variants from all-packages
Fixes #24047

All of the variants are still available in the beam.interpreters attrset.
2017-06-23 19:58:05 +02:00
Daiderd Jordan
54a370ff5f
beam-packages: add erlangR20 2017-06-23 19:42:31 +02:00
Daiderd Jordan
b0b5911fc1 Merge pull request #26764 from mdaiter/erlangR20
erlangR20: init
2017-06-23 19:37:49 +02:00
Frederik Rietdijk
cb0851d5fa Merge pull request #26714 from siddharthist/flask-restplus
flask-restplus: update to 0.10
2017-06-23 19:19:11 +02:00
John Ericson
afd2bdbad2 Merge pull request #26007 from obsidiansystems/cc-wrapper-prefix
Get rid of gcc-cross-wrapper
2017-06-23 11:22:34 -04:00
Ivan Jager
a9c9040a02 libatomic_ops: Provide alternate URL
www.ivmaisoft.com is currently down.
2017-06-23 10:21:12 -05:00
Michael Alan Dorman
eea95af5d1 melpa-packages: 2017-06-23
Removals:
 - todochiku - Removed from melpa
2017-06-23 11:05:12 -04:00
Michael Alan Dorman
40e17794ce melpa-stable-packages: 2017-06-23 2017-06-23 11:05:12 -04:00
Michael Alan Dorman
a10c8a97b4 org-packages: 2017-06-23 2017-06-23 11:05:12 -04:00
Michael Alan Dorman
8a714e3bb6 elpa-packages: 2017-06-23 2017-06-23 11:05:11 -04:00
Thomas Tuegel
0d1a1a4954
plasma-workspace: no propagatedBuildInputs
Only libraries may have propagatedBuildInputs.
2017-06-23 09:55:04 -05:00
Vladimír Čunát
c76f8d9c7a
knot-resolver: maintenance 1.3.0 -> 1.3.1 2017-06-23 14:48:29 +02:00
Vladimír Čunát
75872f3161
knot-dns: security 2.5.1 -> 2.5.2
https://lists.nic.cz/pipermail/knot-dns-users/2017-June/001144.html
2017-06-23 14:48:10 +02:00
Matthew Daiter
d79b4766a5 erlangR20: init 2017-06-23 12:51:58 +02:00
Peter Simons
e31b99c187 haskell-network: use older version to compile with GHC 7.4.x and before
Recent versions of network no longer support base libraries that old.
2017-06-23 12:49:37 +02:00
Peter Simons
6b6cf6942c haskell-optparse-applicative: fix build with pre-8.0.x versions of GHC 2017-06-23 12:49:37 +02:00
Peter Simons
8ddaef6ddf haskell: fix logic error in generic builder introduced in 00892b7e4e
Closes https://github.com/NixOS/nixpkgs/issues/26760.
2017-06-23 12:49:36 +02:00
Peter Simons
d83fb640db haskell-opencv: ensure that the underlying C++ library has contrib code enabled
0335b93284 (commitcomment-22638850)
2017-06-23 12:49:36 +02:00
Peter Simons
bc20886345 git-annex: enable shell completions for zsh and fish
The latest optparse-applicative version can do that.
2017-06-23 12:49:36 +02:00
Peter Simons
5148757e8c haskell-hspec-core: break infinity dependency cycle
Test suite dependencies silently and temporary depend on hspec-core in their
test suites.
2017-06-23 12:49:36 +02:00
Peter Simons
7673cd0cd4 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
e0fa80e591.
2017-06-23 12:49:29 +02:00
Peter Simons
167b27b6a7 LTS Haskell 8.19 2017-06-23 12:48:44 +02:00
Alexandre Peyroux
be2b6c2e47 gramalecte: init at v0.5.17 2017-06-23 11:21:40 +02:00
Jörg Thalheim
69ca7b1457 Merge pull request #26784 from markus1189/ammonite-disable-remote-logging
ammonite: disable remote logging by default
2017-06-23 10:03:31 +01:00
Peter Jones
aa3f37ceed pythonPackages.intelhex init at 2.1 2017-06-23 10:54:48 +02:00
Frederik Rietdijk
4f0d812abc python.pkgs.spyder: remove maintainers
since we both do not use this package anymore.
cc @bjornfor
2017-06-23 10:44:42 +02:00
Jörg Thalheim
f3b626cf4d Merge pull request #26770 from volth/jetbrains-update-script-2
jetbrains updater: use perlPackages.LWPProtocolhttps
2017-06-23 09:42:51 +01:00
Frederik Rietdijk
a807c96e20 Merge pull request #26752 from rnhmjoj/graphviz
pythonPackages.pygraphviz: fix build
2017-06-23 10:40:01 +02:00
Markus Hauck
5c2d4ef6cf ammonite: disable remote logging by default 2017-06-23 09:37:47 +02:00
Bruno Bzeznik
621a1146d6 openmpi: 1.10.1 -> 1.10.7
- No more need for the nbc patch
- Cpusets support fixed
2017-06-23 08:39:49 +02:00
Patrick Callahan
e620135a87 fish: 2.5.0 -> 2.6.0 2017-06-22 21:09:15 -07:00
aszlig
63fb845fcf
virtualbox: Rebase hardened.patch on top of 5.1.22
The merge of the version bump in
6fb9f89238 didn't take care of our patch
for the hardening mode and thus enabling VirtualBox without also
force-disabling hardening mode will result in a build error.

While the patch is largely identical with the old version, I've removed
one particular change around the following code:

    if (pFsObjState->Stat.st_mode & S_IWOTH)
        return supR3HardenedSetError3(VERR_SUPLIB_WORLD_WRITABLE, pErrInfo,
                                      "World writable: '", pszPath, "'");

In the old version of the patch we have checked whether the path is
within the Nix store and suppressed the error return if that's the case.

The reason why I did that in the first place was because we had a bunch
of symlinks which were writable.

In VirtualBox 5.1.22 the code specifically checks whether the file is a
symlink, so we can safely drop our change.

Tested via all of the "virtualbox" NixOS VM subtests and they now all
succeed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-06-23 05:48:54 +02:00
Tim Steinbach
6fb9f89238 Merge pull request #25368 from bachp/virtualbox-5.1.22
virtualbox: 5.1.18 -> 5.1.22
2017-06-22 21:23:47 -04:00
Tim Steinbach
4e08459f9b
linux-hardened-copperhead: 4.11.6c -> 4.11.6d 2017-06-22 21:12:20 -04:00