mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity
82100 commits 329 branches 124 tags 6.7 GiB
Commit graph

19002 commits

Author SHA1 Message Date
Anthony Cowley c97ccd388c qhull: darwin compatibility 
The hand-rolled iterator declaration is incompatible with libc++'s, and
clang > 3.5 is stricter about this.

See
<https://lists.freebsd.org/pipermail/freebsd-ports-bugs/2014-December/298242.html>
for another reference to this issue.

The errors that occur are of the form:
reference to 'random_access_iterator_tag' is ambiguous
 2016-04-01 14:06:14 -04:00
Anthony Cowley 79b76d59b5 tbb: darwin compatibility 
Reflects the different extension of shared library files.
 2016-04-01 13:40:51 -04:00
Peter Simons 90d0b08237 Merge pull request #14371 from pmahoney/skarnet 
Update skarnet.org packages
 2016-04-01 17:59:14 +02:00
Patrick Mahoney fc1f5d2cf1 set target for darwin binary compat in skarnet.org packages 
skalibs:
execline:
s6-dns:
s6-networking:
s6-portable-utils:
s6-rc:
s6:

The above software uses the target triplet from `cc -dumpmachine` as a
binary compatibility check. However, on darwin, the output includes the
darwin version number, which leads to build failures against a binary
skalibs package built a different version of darwin than the current
system.

Explicitly setting target ensures code can be compiled against a skalibs
binary built on a different version of darwin.

See http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
 2016-04-01 10:39:37 -05:00
Patrick Mahoney e0c225857f update skarnet.org packages 
skalibs:           2.4.7.0 -> 2.3.9.0
execline:          2.1.4.0 -> 2.1.4.5
s6:                2.2.1.0 -> 2.2.4.3
s6-rc:             0.0.1.0 -> 0.0.2.1
s6-portable-utils: 2.0.5.2 -> 2.0.5.3
s6-linux-utils:    2.0.2.0 -> 2.0.2.3
s6-dns:            2.0.0.4 -> 2.0.0.7
s6-networking:     2.1.0.1 -> 2.1.0.4
 2016-04-01 10:38:58 -05:00
joachifm b9ba6e2f6b Merge pull request #14297 from elitak/mfi 
mfi: init at 2.1.11
 2016-04-01 14:57:28 +00:00
Arseniy Seroka e16485533b Merge pull request #14352 from devhell/mediainfo 
{lib}mediainfo{-gui}: 0.7.83 -> 0.7.84
 2016-04-01 15:16:22 +03:00
Eric Litak 0de2d2fbcd mfi: init at 2.1.11 
This package has some outdated dependencies, so old versions of mongodb
and v8 had to be re-added as well.
 2016-04-01 02:45:11 -07:00
vbgl f1beff232d Merge pull request #14357 from acowley/log4cxx 
log4cxx: darwin compatibility
 2016-04-01 11:26:00 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Rickard Nilsson efe33d6e87 openldap: 2.4.42 -> 2.4.44 2016-04-01 08:51:37 +02:00
Anthony Cowley a37491386c log4cxx: darwin compatibility 
This patch replicates the patch logic from the brew recipe
<56b57d583e/Library/Formula/log4cxx.rb>
which is necessary to build on darwin.
 2016-03-31 22:35:38 -04:00
devhell 33f345eed0 {lib}mediainfo{-gui}: 0.7.83 -> 0.7.84 
Built and tested locally.

From the changelog:
```
Version 0.7.84, 2016-03-31
x #I122, MPEG-4/MOV: Crash if mdhd timescale is 0
x MPEG-4/MOV: Infinite loop if malformed stsc / stsz (detected by
  fuzzing)
x MPEG-TS: some DVB Subtitles were not detected
x HLS: better handling of media playlists having EXT-X-BYTERANGE
```
 2016-03-31 23:36:50 +01:00
Thomas Tuegel 314792d9eb qtquick1: unset QML_IMPORT_PATH after loading 2016-03-31 16:12:35 -05:00
Thomas Tuegel da4b9d3b62 qtdeclarative: unset QML2_IMPORT_PATH after loading 2016-03-31 16:08:24 -05:00
Frederik Rietdijk 4bd01c5cbd openblas_2_14: remove 
because we don't need it for numpy anymore.
 2016-03-31 21:51:45 +02:00
Thomas Tuegel 7f336a4513 qtbase: unset QT_PLUGIN_PATH after loading 2016-03-31 14:36:30 -05:00
Nikolay Amiantov f752424924 qt55.qtbase: use more system libraries 2016-03-31 15:53:06 +03:00
Lluís Batlle i Rossell d2c00001f8 freeimage: updating to 3.17 
It is buggy in 32-bit: sizeof(uint64) != 8 !!.
 2016-03-31 12:35:57 +02:00
Frederik Rietdijk 40ed938ef2 Merge pull request #14267 from FRidh/openblas 
openblas: 0.2.15 -> 0.2.17
 2016-03-30 23:30:40 +02:00
Luca Bruno 184b7ba3c6 glib-tested: suppress gdbus test needing machine-id 2016-03-30 21:27:29 +02:00
Nikolay Amiantov a8f5991db7 libunity: init at 6.12.0 2016-03-30 22:22:51 +03:00
Nikolay Amiantov e0ee6dc8fc breakpad: init at 2016-03-28 2016-03-30 22:22:51 +03:00
Nikolay Amiantov 01e2511668 dee: init at 1.2.7 2016-03-30 22:22:51 +03:00
Nikolay Amiantov c419e3c6d6 libgee_0_6: init at 0.6.8 2016-03-30 22:22:51 +03:00
Nikolay Amiantov c091e61a09 pcre: add 16- and 32-bit character size versions 2016-03-30 22:22:51 +03:00
Luca Bruno 088231fe9f libiberty: add static variant 2016-03-30 17:51:19 +02:00
Tobias Geerinckx-Rice 6605fbfe25 libpsl: list 2016-03-10 -> 2016-03-30 2016-03-30 14:56:04 +02:00
Vladimír Čunát a26357eefe Merge recent staging (with binaries on Hydra) 2016-03-30 10:41:02 +02:00
Ryan Trinkle 8605dab964 webkitgtk: add darwin support 2016-03-30 09:40:36 +02:00
Anthony Cowley d52efcc9d3 assimp: add missing zlib dependency 
cmake searches for this package during the build phase.
 2016-03-29 15:38:48 -04:00
Lluís Batlle i Rossell 0c98b52816 Fix evaluation. (licenses, not licences) 
Thanks Domen.
 2016-03-29 17:47:07 +02:00
Lluís Batlle i Rossell f6a44bea9e Updating wings and dependencies to match erlang 
I updated the erlang esdl lib, added the erlang cl lib,
added opencl-headers and ocl-icd to make wings build and run.

I have not tested its opencl part; I only added dependencies so
it builds.
 2016-03-29 12:24:42 +02:00
Vladimír Čunát e69306c463 xmlsec: fix linkage, probably after #909 
This fixes builds of (some) reverse dependencies, e.g. aqbanking.
 2016-03-29 12:22:54 +02:00
Franz Pletz ebf21fd29e libressl_2_3: 2.3.2 -> 2.3.3 2016-03-29 04:55:14 +02:00
Patrick Callahan 565b7b34ed ignition.transport: init at 0.9.0 and 1.0.1 2016-03-28 11:44:37 -07:00
Patrick Callahan 3c95d6d1ea sdformat: init at 3.7.0 and 4.0.0 2016-03-28 11:44:37 -07:00
Patrick Callahan b682906b6a ignition robotics libs: init; .math: init at 2.3.0 2016-03-28 11:44:37 -07:00
Patrick Callahan 008bcf51a4 tinyxml-2: init at 3.0.0 2016-03-28 11:44:36 -07:00
Patrick Callahan 4316161495 ogre: 1.9.0 -> 1.9-hg 2016-03-28 11:10:48 -07:00
Joachim Fasting 72b5bfda97 v8: fix build(s) 
Ignore errors due to strict-overflow warnings; strip clang-only flag on
non-clang builds. Concerning the latter "fix", it's not entirely clear to me why
the -Wno-format-pedantic flag ends up being passed to gcc, the .gyp file appears
to already condition the inclusion of this flag on whether cc=clang.
 2016-03-28 17:13:40 +02:00
Frederik Rietdijk c1abb1d404 openblas: 0.2.15 -> 0.2.17 2016-03-28 15:58:10 +02:00
Vladimír Čunát f4cb39c3d3 mesa: maintenance update 11.1.1 -> 11.1.2 2016-03-28 14:02:36 +02:00
Vladimír Čunát a7d34e0c13 glu: fix the pkg-config file (fixes #14260) 2016-03-28 11:33:48 +02:00
Nikolay Amiantov 5471eed63c wxgtk: explicitly link to libX11 and libcairo 2016-03-27 20:53:55 +03:00
Domen Kožar 4a42548388 cmis: fix build with gcc5 2016-03-27 15:11:13 +02:00
Domen Kožar b1a8ae2a35 ffmpeg: fix bad merge 2016-03-27 13:31:04 +01:00
Domen Kožar b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Joachim Fasting 8f261d717d accelio: mark as broken on grsec kernels 
All hydra builds against grsec kernels fail.
 2016-03-27 01:44:16 +01:00
Joachim Fasting 74838cd03d accelio: kernel 4.2 is the most recent supported kernel 
All Hydra builds on more recent kernels fail; from reading
the accelio documentation, I get the impression that 4.2 is
the most recent supported kernel version.
 2016-03-26 20:16:28 +01:00
Nikolay Amiantov e781a8257b ffmpeg: add libopus support 2016-03-26 17:09:59 +03:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr 013f808a06 netcdf-fortran: init at 4.4.3 2016-03-26 10:33:39 +01:00
Nikolay Amiantov 0c6db0ca48 cc-wrapper: add option to skip flags for native optimizations 2016-03-24 20:16:17 +03:00
Tuomas Tynkkynen c58c1f3b50 vc: Broken on i686 
http://hydra.nixos.org/build/33122230/nixlog/1/raw =>

CMake Error at CMakeLists.txt:163 (message):
  Unsupported target architecture 'i686'.  No support_???.cpp file exists for
  this architecture.
 2016-03-24 02:21:46 +02:00
Domen Kožar 6648ef5d25 Merge pull request #13957 from ambrop72/opencsg-fix 
opencsg: Fix build related to missing libX11 linking the example.
 2016-03-23 12:58:07 +00:00
Domen Kožar d1c9f20db1 Merge pull request #14107 from nckx/drop-libav_9 
libav: drop unused version 9.
 2016-03-23 12:54:47 +00:00
Matthias C. M. Troffaes 719fceba10 wolfssl: 3.8.0 -> 3.9.0 2016-03-23 09:15:21 +00:00
Ryan Artecona bb63c6a4c4 gobjectIntrospection: fix darwin build 
Stop using obsolete `otool` package, preferring `cctools` (which
includes otool), on darwin.

Remove autoconf & automake from reqs, as they were unused.

Fixes #12670
 2016-03-22 21:40:15 -04:00
Eelco Dolstra 5759b447dc opensubdiv: 3.0.3 -> 3.0.4 2016-03-22 21:33:54 +01:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr d916f1663f libibverbs: added mlx4 and mthca userspace driver plugins 2016-03-22 16:26:33 +01:00
Lluís Batlle i Rossell bd58b895e0 Making ffmpeg friendly for arm. 2016-03-22 15:09:59 +01:00
Lluís Batlle i Rossell 56bd6be2cf Fixing vxl build with gcc 5. 2016-03-22 14:36:20 +01:00
joachifm 4f0324f766 Merge pull request #14116 from otwieracz/utox 
utox: 0.5.0 -> 0.7.0, libtoxcore: 20160131 -> 20160319
 2016-03-22 13:01:43 +00:00
Slawomir Gonet eddb7a55f8 utox: 0.5.0 -> 0.7.0, libtoxcore: 20160131 -> 20160319 2016-03-22 08:42:07 +01:00
Franz Pletz 1a9b272c09 nss: 3.22.2 -> 3.23 (security) 
Fixes CVE-2016-1950.

See: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.23_release_notes
 2016-03-21 21:27:59 +01:00
Tobias Geerinckx-Rice 9ba1afb94b libav: drop unused version 9. 2016-03-21 18:28:08 +01:00
Vladimír Čunát 1d11940aac Merge #14005: libav improvements 
It includes more than the PR itself.
 2016-03-21 09:59:18 +01:00
Vladimír Čunát 07a3d42023 libav: minor updates 11.4 -> 11.6 
The older branches seem unmaintained and better not used -
/cc maintainer of keyfinder @nckx.
 2016-03-21 09:57:09 +01:00
Vladimír Čunát 02b13f7bdb libav: fixup sandboxed builds after parent commit 2016-03-21 09:56:25 +01:00
Ryan Artecona 1662881740 libav: support Darwin & install docs/manpages 
Close #14005.
 2016-03-21 09:44:42 +01:00
Ryan Artecona f3f8da4a5f libav: support Darwin & install docs/manpages 2016-03-20 17:42:34 -04:00
Marius Bakke 54f6695928 libykneomgr: 0.1.7 -> 0.1.8 2016-03-20 18:39:30 +00:00
Lluís Batlle i Rossell 9b8b143c99 Missing path in prev commit 2016-03-20 00:47:12 +01:00
Lluís Batlle i Rossell e6e7de082d Fixing icu for ARM with a patch from openembedded. 
It failed with an "internal error".
 2016-03-20 00:42:12 +01:00
Franz Pletz e312a34775 libvirt: Add fpletz as maintainer 2016-03-19 16:33:49 +01:00
Franz Pletz ff0cfc160f libvirt: 1.3.0 -> 1.3.2 2016-03-19 16:32:52 +01:00
Pascal Wittmann dd30fcd30a sparsehash: 2.0.2 -> 2.0.3 2016-03-19 13:51:43 +01:00
Pascal Wittmann 9506f4de76 udunits: 2.1.14 -> 2.2.20 2016-03-19 12:08:58 +01:00
Pascal Wittmann 07601a08f2 unibilium: 1.1.2 -> 1.2.0 2016-03-19 12:01:22 +01:00
Pascal Wittmann 8d128f046d xylib: 1.3 -> 1.4 2016-03-19 11:56:01 +01:00
Joachim Fasting 8e359b2e21 bobcat: fix installation 
Another hotfix for eae059b0b6
(I kind of jumped the gun on this one ...)

The `build install` command takes a positional argument
indicating which components to install; without it, nothing
is installed and the build fails to create the store output.
 2016-03-18 18:22:27 +01:00
joachifm 1bc691b298 Merge pull request #14011 from bzizou/matheval 
libmatheval: init at 1.1.11
 2016-03-18 16:24:58 +00:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr 259f9226e5 libmatheval: init at 1.1.11 2016-03-18 17:06:36 +01:00
joachifm 8f0cd81708 Merge pull request #14014 from romildo/update.subtitleeditor 
subtitleeditor: 0.41.0 -> 0.52.1
 2016-03-18 15:00:14 +00:00
José Romildo Malaquias c0239360a4 gstreamermm 1.0: init at 1.4.3 2016-03-18 09:11:51 -03:00
Franz Pletz 57f4646fd1 Merge pull request #14002 from sheenobu/collectd_inherit 
libcollectdclient: make client derive from collectd package
 2016-03-18 10:44:00 +01:00
Joachim Fasting 3704901dc8 bobcat: patch all shebangs 
Hotfix for eae059b0b6

Not really a regression, but it turns out that the man page
target requires shebang patching as well.
 2016-03-18 04:32:56 +01:00
Sheena Artrip 0bffa2f1a9 libcollectdclient: make client derive from collectd package 
collectd: split version and name

libcollectdclient: make client derive from collectd package
 2016-03-17 23:26:09 -04:00
Joachim Fasting eae059b0b6 bobcat: 4.00.00 -> 4.01.04 
Appears to fix https://hydra.nixos.org/build/33157535/nixlog/1/raw
 2016-03-18 02:10:03 +01:00
Peter Simons 73f53ddf9c Merge pull request #11878 from lancelotsix/update_boost 
pkgs.boost: 1.59 -> 1.60
 2016-03-17 19:45:44 +01:00
Arseniy Seroka 7099507c00 Merge pull request #13967 from bzizou/openmpi 
openmpi: added infiniband support (ibverbs)
 2016-03-17 16:55:14 +04:00
Robin Gloster fde5087099 Merge pull request #13981 from sheenobu/libcollectd_client 
libcollectdclient: init at 5.5.0
 2016-03-17 12:33:38 +01:00
Domen Kožar 826eeec841 nghttp2: fix url 2016-03-17 10:56:24 +00:00
Andrew Kelley f86f957ae3 chromaprint: 1.2 -> 1.3.1 2016-03-17 10:58:15 +01:00
Sheena Artrip 6f4458d16f libcollectdclient: init at 5.5.0 2016-03-17 00:00:05 -04:00
Peter Simons 1c49f8fe33 gobject-introspection: mark broken on Darwin 
http://hydra.nixos.org/build/33311502
 2016-03-16 22:28:50 +01:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr 2f36475cff openmpi: added infiniband support (ibverbs) 2016-03-16 15:42:30 +01:00
Ambroz Bizjak 853d612c3f opencsg: Fix build related to missing libX11 linking the example. 2016-03-16 13:06:36 +01:00
Vladimír Čunát c643ccaa8c Merge #13950: move ncurses utilities to $out 2016-03-16 08:39:37 +01:00
Pascal Wittmann 33825a29f4 farbfeld: 1 -> 2 2016-03-15 18:17:04 +01:00
Joachim Fasting cd7242d09d kdevplatform: disable parallel build 
Hotfix for 1edb9b9558
Ref: https://github.com/NixOS/nixpkgs/pull/13843
 2016-03-15 11:40:42 +01:00
Graham Christensen 2be76d8b48 activemq: 5.8.0 -> 5.13.2 
It seems Activemq was "split" in to 5.8.0 and 5.12.1 only to keep from
trampling someone on 5.8.0. This is to the point of not upgrading the
default, but making a new activemq attribute specific for 512.

As far as I can tell, there is no good reason to stay providing 5.8.0,
so this is the proposal to delete it.

Note: There are over 1,000 fixes between 5.9.0 to 5.13.2.
 2016-03-14 20:56:07 -05:00
joachifm 71655b0b69 Merge pull request #13843 from ambrop72/kdevelop-473 
kdevelop: 4.7.1 -> 4.7.3
 2016-03-14 21:30:12 +00:00
Graham Christensen 2aae2af845 ilbc: extract-cfile.awk has fallen off the internet 
Close #13923.
 2016-03-14 21:41:41 +01:00
Graham Christensen c310cb9e46 graphite2: security update 1.2.4 -> 1.3.6 (close #13918) 
CVE-2016-1977 CVE-2016-2790 CVE-2016-2791 CVE-2016-2792
CVE-2016-2793 CVE-2016-2794 CVE-2016-2795 CVE-2016-2796
CVE-2016-2797 CVE-2016-2798 CVE-2016-2799 CVE-2016-2800
CVE-2016-2801 CVE-2016-2802

vcunat fixed the tarball name and redirected to github.
 2016-03-14 21:30:55 +01:00
Vladimír Čunát 530214321d tevent, ldb: security updates needed for samba 
I managed to find no news or changelog on these,
so it's rather a black box to me, but it's clear that (some) bumps
were required for samba.
 2016-03-14 19:46:39 +01:00
Tobias Geerinckx-Rice 2404cd4286 libpsl: list 2016-02-25 -> 2016-03-10 2016-03-14 19:18:43 +01:00
宋文武 93feb5d115 drop my maintainership (close #13881) 2016-03-13 18:39:01 +01:00
Thomas Tuegel d39b1db400 Merge pull request #13880 from acowley/juliamac 
julia: darwin compatibility
 2016-03-13 10:38:04 -05:00
Anthony Cowley 889d6d11a3 julia: darwin compatibility 
Along with PR #13879, these patches let julia build and run on
darwin. Using an llvm with shared library support is an idea adopted from
a @pikajude comment here https://github.com/NixOS/nixpkgs/issues/10864

The libgit2 change is mechanical to pull in iconv on darwin.

The frameworks are referenced by julia's build system.
 2016-03-13 04:18:16 -04:00
Anthony Cowley f3a6f3e2f3 suitesparse: build dylibs on darwin 
Makes the shared libraries usable on darwin so that, e.g., the Julia
compiler may be built.
 2016-03-13 04:13:26 -04:00
joachifm bd785b23a1 Merge pull request #13869 from acowley/suitemac 
suitesparse: darwin compatibility
 2016-03-13 03:26:50 +00:00
Anthony Cowley 9d1053dc6d suitesparse: darwin compatibility 
There is no librt on darwin, so it must be disabled.
 2016-03-12 21:17:15 -05:00
joachifm 423a65b0cd Merge pull request #13822 from acowley/ffmpeg3 
ffmpeg-full: 2.8.5 -> 3.0
 2016-03-12 23:20:28 +00:00
joachifm 2896934e78 Merge pull request #13866 from acowley/x265 
x265: 1.7 -> 1.9
 2016-03-12 22:04:33 +00:00
Anthony Cowley 6bc1aed873 x265: 1.7 -> 1.9 
Unblocks #13822
 2016-03-12 16:24:06 -05:00
zimbatm 7133a3730c Merge pull request #13851 from colemickens/update-libinput 
libinput: 1.2.0 -> 1.2.1
 2016-03-12 20:17:43 +00:00
Christoph Hrdinka e06570fe6b Merge pull request #13847 from devhell/mediainfo 
{lib}mediainfo{-gui}: 0.7.82 -> 0.7.83
 2016-03-12 18:28:27 +01:00
devhell 29a90dbc2b {lib}mediainfo{-gui}: 0.7.82 -> 0.7.83 
Built and tested locally.

From the changelog:

```
Version 0.7.83, 2016-02-29

+ HEVC: Maximum Content Light Level (MaxCLL) and Maximum Frame-Average
  Light Level (MaxFALL), metadata mandated by CEA-861.3 for HDR support
+ HEVC: Mastering display color primaries and luminance (based on SMPTE
  ST 2084), metadata mandated by CEA-861.3 for HDR support
+ HEVC: SMPTE ST 2048 and SMPTE ST 428-1 transfer characteristics
+ HEVC: Chroma subsampling location (indication of the location type
  described in the HEVC spec)
+ MPEG-TS: ATSC Modulation Mode (Analog, SCTE_mode_1 aka 64-QAM,
  SCTE_mode_2 aka 256-QAM, 8-VSB, 16-VSB)
+ #B981, MP4: support of buggy file having "hint" SubType
x HLS: better handling of media playlists having EXT-X-BYTERANGE
```

Additionally, some cleanup and package uses `autoreconfHook` now. Thanks
to @hrdinka for helpful pointers!
 2016-03-12 17:22:01 +00:00
Arseniy Seroka a25d2a7466 Merge pull request #13717 from zohl/banshee 
[WIP] Banshee
 2016-03-12 20:19:49 +03:00
zimbatm b776e0cd5f nghttp2: 1.7.1 -> 1.8.0 2016-03-12 16:18:52 +00:00
Ambroz Bizjak 1edb9b9558 kdevelop: 4.7.1 -> 4.7.3 2016-03-12 16:30:41 +01:00
devhell 7b32e5497c libzen: 0.4.32 -> 0.4.33 
Built and tested locally.

From the changelog:
```
Version 0.4.33, 2016-02-29

x File::Open(): using now FILE_APPEND_DATA on windows when append mode
  is requested
x File::Open(): accept file names with * and ? characters on non-Windows
  platforms
x Better MinGW and CygWin compatibility
x autogen.sh: Adding missing shebang
x Dir/Create: create the parents directory if not existing
```

Additionally, the package was cleaned up, now using `autoreconfHook` and
with some helpful pointers by @hrdinka.
 2016-03-12 13:09:26 +00:00
Cole Mickens e17ff07c0b libinput: 1.2.0 -> 1.2.1 2016-03-11 16:24:29 -08:00
Graham Christensen 8f6be38247 giflib: convert md5 to sha256 2016-03-11 15:54:55 -06:00
Graham Christensen 00078e317e libxkbdcommon: sha1 to sha256, also: upstream sha1 changed? 2016-03-11 15:54:54 -06:00
Anthony Cowley 2f6f3c7b55 ffmpeg-full: 2.8.5 -> 3.0 
Also changes the homepage URL to https.
 2016-03-11 15:14:52 -05:00
Thomas Tuegel 9e5b2d5e3d qt48: fix evaluation error on Darwin 2016-03-11 09:10:10 -06:00
Eelco Dolstra dd53c65dcc Merge remote-tracking branch 'origin/gcc-5' into staging 
Still some breakage but no blockers:

http://hydra.nixos.org/eval/1242130?filter=x86_64-linux&compare=1237852&full=#tabs-now-fail
 2016-03-11 16:02:38 +01:00
Eelco Dolstra d86633386f sqlite: 3.9.2 -> 3.11.1 2016-03-11 15:10:05 +01:00
Domen Kožar 603ea2652f nss: 3.22 -> 3.22.2 (CVE-2016-1950) 2016-03-11 12:18:18 +00:00
Eelco Dolstra 2af1cb3aa6 Merge remote-tracking branch 'origin/binutils-2.26' into staging 
This still breaks a few packages, but nothing really major:

  http://hydra.nixos.org/eval/1241850?filter=x86_64-linux&compare=1237919&full=#tabs-now-fail
 2016-03-11 11:58:49 +01:00
Luca Bruno dcfca100ec Merge pull request #12525 from knupfer/ngx_brotli 
add nginxModules.brotli
 2016-03-11 11:05:21 +01:00
Tobias Geerinckx-Rice cc53e62644 geoclue2: 2.4.1 -> 2.4.2 2016-03-10 23:37:11 +01:00
Arseniy Seroka 16bffdcb99 Merge pull request #10509 from markus1189/activemq-512 
Add 5.12.1 version of Apache ActiveMQ in addition to 5.8.0
 2016-03-10 16:08:11 +03:00
Vladimír Čunát d9da9ec634 libsigcxx: make *.pc force C++11 
This fixes compilation problems of some packages against *mm,
including gtkmm-2 itself.
 2016-03-10 11:49:24 +01:00
Vladimír Čunát d9f2e282be gtkmm3: update 3.16.0 -> 3.18.0 
Also remove urkud for maintainers; he's been inactive for years,
so let's not bother him anymore.
 2016-03-10 11:49:24 +01:00
Vladimír Čunát 4f90638d2f atkmm: update 2.22.7 -> 2.24.2 
Also add basic meta.
 2016-03-10 11:49:23 +01:00
Vladimír Čunát 6429c6595b pangomm: update 2.34.0 -> 2.38.1 2016-03-10 11:46:15 +01:00
Vladimír Čunát 241927ead3 cairomm: update 1.11.2 -> 1.12.0 2016-03-10 11:46:15 +01:00
Vladimír Čunát 214b59a249 glibmm: update 2.44.0 -> 2.46.3 
Also drop urkud from maintainers; he's been inactive for years,
so let's not bother him.
 2016-03-10 11:46:14 +01:00
Vladimír Čunát 26b67c2ef9 libsigc++: update 2.3.1 -> 2.6.2 
We were using a rather old development (!) release.
 2016-03-10 10:22:44 +01:00
michael bishop c561ee8480
sqlite: change hash from sha1 to sha256 2016-03-09 19:37:33 -04:00
Graham Christensen 6b4a70c672 libotr_3_2: remove, not updated since 2012, and unused. 2016-03-09 17:20:36 -06:00
Franz Pletz 728cf25e16 libotr: 4.1.0 -> 4.1.1 (CVE-2016-2851) 
https://www.x41-dsec.de/lab/advisories/x41-2016-001-libotr/
 2016-03-10 00:13:08 +01:00
Domen Kožar 64d5af4663 boringssl: 2014-08-20 -> 2016-03-08 2016-03-09 11:26:18 +00:00
Domen Kožar 74046cb09a Merge pull request #13604 from NixOS/update-libclc 
libclc: 2015-03-27 -> 0.2.0
 2016-03-09 11:12:12 +00:00
Thomas Tuegel da972b6cc4 ncurses: move runtime utilities to $out 
All the programs provided by ncurses were being installed to the $dev
output, but several of them are intended for runtime use, e.g. to
operate on the running terminal. These user-facing programs are moved to
the $bin output.

Several packages referred to "${ncurses}/bin" or "${ncurses.dev}/bin" at
runtime; these paths are also updated to refer to "${ncurses.bin}/bin".
 2016-03-08 11:35:24 -06:00
Thomas Tuegel 3ef7671cea ncurses: combine $lib and $out outputs 
The $lib output refers to the terminfo database in $out, which is about
10x larger than the ncurses shared library. Splitting these outputs
saves a small amount of space for any derivations that use the terminfo
database but not the ncurses library, but we do not have evidence that
any such exist.
 2016-03-08 11:35:24 -06:00
Peter Simons 35bae56722 Merge pull request #13754 from spacefrogg/boost-static 
boost: Fix compilation for static builds.
 2016-03-08 11:30:20 +01:00
Michael Raitza f7bf249b2b boost: Fix compilation for static builds. 
The 'runtime-link=' feature must not be set in addition to 'link='
for boost-1.55 when building only the statically linked libraries.
Fixes errors that targets were defined multiple times.
 2016-03-08 10:04:04 +00:00
Vladimír Čunát 09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Vladimír Čunát f306e67e15 kde5: move files around to simplify merge 
It is analogous to 98d8e1a160.
 2016-03-08 09:42:41 +01:00
Al Zohali 84cfc1bc72 libgpod: mono support 2016-03-07 23:21:01 +03:00
Al Zohali 04d2c5f118 gdata-sharp: init at 2.2.0.0 2016-03-07 23:21:01 +03:00
Al Zohali 6c9269670e mono-zeroconf: init at 0.9.0 2016-03-07 23:21:01 +03:00
Al Zohali a347e45c54 gtk-sharp-beans: init at 2.14.0 2016-03-07 23:21:01 +03:00
Al Zohali 50bd9b0193 gio-sharp:init at 0.3 2016-03-07 23:21:01 +03:00
Al Zohali a4a19c57ad taglib-sharp: init at 2.1.0.0 2016-03-07 23:21:01 +03:00
Al Zohali 3576a2d549 mono-addins: init at 1.2 2016-03-07 23:21:01 +03:00
Al Zohali d778ab0cb0 gtk-sharp-3_0: init at 2.99.3 2016-03-07 23:21:01 +03:00
Al Zohali ec0ffd9078 notify-sharp: init at 3.0.3 2016-03-07 23:21:01 +03:00
Al Zohali 1018e0497a dbus-sharp-glib-1_0: init at 0.5 2016-03-07 23:21:01 +03:00
Al Zohali 7254219b38 dbus-sharp-glib-2_0: init at 0.6 2016-03-07 23:21:01 +03:00
Al Zohali 826c716ea3 dbus-sharp-1_0: init at 0.7 2016-03-07 23:21:01 +03:00
Al Zohali d9a7918055 dbus-sharp-2_0: init at 0.8.1 2016-03-07 23:21:01 +03:00
Sergiu Ivanov be590f1d9d aspell-dict-ro: init at 3.3-2 2016-03-07 19:42:26 +01:00
Eelco Dolstra e9f1fa8bb0 librdf_redland: Fix dependency on libraptor2 
This broke soprano/nepomuk.

http://hydra.nixos.org/build/32556702
 2016-03-07 13:25:33 +01:00
Franz Pletz 661079abb7 Merge pull request #13728 from andrewrk/libsoundio 
libsoundio: 1.0.3 -> 1.1.0
 2016-03-07 12:42:42 +01:00
Matthias C. M. Troffaes 495985ace3 wolfssl: 3.7.0 -> 3.8.0 
changes by @globin: use autoreconfHook

closes #13731

Signed-off-by: Robin Gloster <mail@glob.in>
 2016-03-07 10:39:14 +00:00
Andrew Kelley 4f013e9159 libsoundio: 1.0.3 -> 1.1.0 2016-03-07 00:44:36 -07:00
Franz Pletz 5e20409229 libmatroska: 1.4.1 -> 1.4.4 (security) 
This fixes CVE-2015-8790 & CVE-2015-8791.
 2016-03-07 02:54:40 +01:00
Franz Pletz 68702d24bf libebml: 1.3.1 -> 1.3.3 (security) 
This release fixes CVE-2015-8790 & CVE-2015-8791.
 2016-03-07 02:54:07 +01:00
Tuomas Tynkkynen ad47355786 Merge remote-tracking branch 'upstream/master' into staging 2016-03-06 11:48:57 +02:00
Tobias Geerinckx-Rice b61e7c2610 libpsl: 0.12.0 -> 0.13.0 2016-03-06 01:09:12 +01:00
joachifm 932b47ff52 Merge pull request #12752 from simonvandel/hunspellWithDicts 
Hunspell: add wrapper to include dictionaries
 2016-03-05 13:26:43 +00:00
joachifm a917e3dcf6 Merge pull request #13615 from mbakke/libsodium-1.0.8 
libsodium: 1.0.6 -> 1.0.8
 2016-03-04 16:34:53 +00:00
Nikolay Amiantov c0e310f4eb libvdpau-va-gl: 0.3.4 -> 0.3.6 2016-03-04 14:42:37 +03:00
Nikolay Amiantov 750e6f0b63 vc: 1.1.0 -> 1.2.0 2016-03-04 14:42:36 +03:00
Nikolay Amiantov 0077abe128 cppzmq: 20151203 -> 2016-01-20 2016-03-04 14:42:36 +03:00
Jakub Skrzypnik 2ed2cdcf09 libconfig: 1.4.9 -> 1.5 2016-03-03 21:28:37 +01:00
joachifm 397a0db028 Merge pull request #12996 from kragniz/#12106 
clutter: add gtk3 as a build input
 2016-03-02 19:55:18 +00:00
joachifm 7250ef5fcb Merge pull request #13572 from agbell/master 
postgis 2.1.4 -> 2.2.1
 2016-03-02 19:40:50 +00:00
vbgl dfe69e2f4f Merge pull request #13580 from matthewbauer/openal-darwin 
openal darwin fixes
 2016-03-02 19:35:21 +01:00
Eelco Dolstra 47a04ac52c Mark some packages as broken due to GCC 5 2016-03-02 18:02:01 +01:00
Eelco Dolstra dd1f01ec11 gsl: Disable tests on i686-linux 
http://hydra.nixos.org/build/32624041
 2016-03-02 17:51:32 +01:00
Eelco Dolstra 4bb9117992 telepathy-qt: Fix build on gcc 5 
-Werror considered harmful.
 2016-03-02 17:40:08 +01:00
Eelco Dolstra 6bec7cb9fc libcli: Fix build on gcc 5 
http://hydra.nixos.org/build/32606953
 2016-03-02 17:34:14 +01:00
Eelco Dolstra a5b501a36e aterm: Mark as broken 
It segfaults when built with GCC 5. I could try to fix it, but it's
not clear if anybody still cares about this package. Disabling it
until somebody complains.

http://hydra.nixos.org/build/32612811
 2016-03-02 17:22:31 +01:00
Marius Bakke da4f05c589 libsodium: 1.0.6 -> 1.0.8 2016-03-02 15:11:26 +00:00
Thomas Tuegel 6a4c8b0a12 Merge pull request #13597 from ttuegel/kde-5 
Plasma 5.5.5
 2016-03-02 06:47:41 -06:00
Robin Gloster 995475944f qt_gstreamer1: add upstream patch to build with current gstreamer 2016-03-01 22:45:37 +00:00
aszlig 183ac3f2c4
Merge pull request #12558 (GI-shlibpaths) 
So far only .la files get correctly converted to absolute paths in the
GIR file. However if there are .so files which depend on a particular
library using GI, they still get only the basename of the .so file.

This improves on the existing absolute_shlib_path.patch not only
figuring out the absolute path of .so files but also falling back on the
absolute path of $out/lib (or $lib/lib with multiple outputs) of the
current build.

With this, we should no longer need to resort to setting LD_LIBRARY_PATH
for all programs that use GI libraries.

I'm merging this because after more than a month no issues came up so
far.
 2016-03-01 23:21:25 +01:00
Pascal Wittmann b1dd00f616 libclc: 2015-03-27 -> 0.2.0 
Fix build with newer LLVM version
 2016-03-01 22:12:29 +01:00
Thomas Tuegel 98d8e1a160 kde5: consolidate packages into desktops/kde-5 2016-03-01 10:36:00 -06:00
Eelco Dolstra e0d17fdf10 openssl: Use 1.0.2 by default 
Provided that not too much breaks, we should probably cherry-pick this
to 16.03, since the end of the 1.0.1 support window is a bit too close
to the expected lifetime of 16.0.3. @domenkozar
 2016-03-01 15:25:53 +01:00
Eelco Dolstra cdbd14a1a8 openssl: 1.0.1r -> 1.0.1s, 1.0.2f -> 1.0.2g 
CVE-2016-0800
 2016-03-01 15:18:57 +01:00
Matthew Bauer d085a649c2 openal: fix darwin builds 2016-02-29 21:20:04 -06:00
Pascal Wittmann b56c1982bd libfilezilla: 0.4.0 -> 0.4.0.1 2016-02-29 23:35:32 +01:00
Matthew Bauer f3336a122a openal: 1.16.0 -> 1.17.2 2016-02-29 12:46:34 -06:00
Vincent Laporte b1801168e3 pixman: remove legacy patches 2016-02-29 19:14:41 +01:00
zimbatm 69ce5cb656 use the sourceforge mirrors everywhere 
find pkgs -name "*.nix" -exec sed -r \
    "s|https?://downloads.sourceforge.net/|mirror://sourceforge/|g" -i {} \;
 2016-02-28 12:07:42 +00:00
Franz Pletz bc4dbca2b3 Merge pull request #13513 from grahamc/omnibus-cves 
Several CVEs
 2016-02-28 04:14:20 +01:00
Eelco Dolstra d5bb6a1f9c glibc: Enable separate debug symbols 
The importance of glibc makes it worthwhile to provide debug
symbols. However, this revealed an issue with separateDebugInfo: it
was indiscriminately adding --build-id to all ld invocations, while in
fact it should only do that for final links. Glibc also uses non-final
("relocatable") links, leading to subsequent failure to apply a build
ID ("Cannot create .note.gnu.build-id section, --build-id
ignored"). So now ld-wrapper.sh only passes --build-id for final
links.
 2016-02-28 02:57:37 +01:00
Eelco Dolstra 8726c6d506 webkitgtk: Disable Hydra build 
This package takes an excessive amount of time to build (e.g., right
now Hydra is showing eight concurrent builds of webkitgtk, some of
them running for more than 6 hours). This may also delay channel
updates.
 2016-02-27 22:29:24 +01:00
Graham Christensen 77134ea4a5 jasper: patch for CVE-2016-1867 2016-02-27 14:48:29 -06:00
Graham Christensen a1b69275af libbsd: 0.7.0 -> 0.8.2 for CVE-2016-2090 2016-02-27 14:32:56 -06:00
Graham Christensen 3e1b8935c0 mbedtls: 1.3.14 -> 1.3.16 for CVE-2015-8036 2016-02-27 14:23:56 -06:00
zimbatm 17348dc094 Remove all dots at end of descriptions 
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
 2016-02-27 17:30:29 +00:00
Franz Pletz ca2611650a nghttp2: 1.3.4 -> 1.7.1 (CVE-2016-1544) 
https://lwn.net/Vulnerabilities/675696/
 2016-02-27 17:53:22 +01:00
Franz Pletz 7dc5ad835a http-parser: 2.5.0 -> 2.6.1 (CVE-2016-2086, CVE-2016-2216) 
Fixes build of nodejs-0_10 and nodejs-4_x.
 2016-02-27 17:27:17 +01:00
Franz Pletz e5bd913ea5 pixman: 0.32.8 -> 0.34.0 (security release) 2016-02-27 17:06:24 +01:00
Franz Pletz c6b1f48e31 libgcrypt: 1.6.4 -> 1.6.5 (CVE-2015-7511) 
https://www.cs.tau.ac.il/~tromer/ecdh/
 2016-02-27 17:06:24 +01:00
Franz Pletz 571f5b74ed ffmpeg: 2.8.5 -> 2.8.6 (CVE-2016-2329) 2016-02-27 16:34:02 +01:00
Franz Pletz 6ae6016d15 libxmp: 4.3.8 -> 4.3.11 (security release) 
https://lwn.net/Alerts/676256/
 2016-02-27 16:31:35 +01:00
Vladimír Čunát 13afef0d8e webkitgtk: fix build with glibc-2.23 
... by a patch accepted upstream.
2.4 seems to build fine without patching.
 2016-02-27 11:07:56 +01:00
Adam Bell c267f5b711 Updating to postgis 2.2.1 2016-02-26 19:37:57 -05:00
zimbatm 35ab3d301f Merge remote-tracking branch 'upstream/staging' 2016-02-26 22:37:04 +00:00
Franz Pletz 082cd3edd3 Merge pull request #13473 from grahamc/libssh2-1.7.0 
libssh2: 1.6.0 -> 1.7.0
 2016-02-26 19:34:54 +01:00
vbgl d39595c54f Merge pull request #13404 from knedlsepp/fix-darwin-tcl-tk 
Fix darwin tcl tk
 2016-02-26 11:38:26 +01:00
Franz Pletz 0bbe8e1884 Merge pull request #13454 from grahamc/xerces 
xerces-c: 3.1.1 -> 3.1.3
 2016-02-26 11:25:25 +01:00
Franz Pletz d5a2c4cb05 libinput: Add libwacom dependency 
Fixes #13476 & #13147.
 2016-02-26 11:03:28 +01:00
Franz Pletz db2b0c8406 Merge pull request #13430 from nico202/yarp 
yarp (+ libace): init at 2.3.64
 2016-02-26 09:29:21 +01:00
Graham Christensen 737e808913 libssh2: 1.6.0 -> 1.7.0 
This release includes the following changes:
      o libssh2_session_set_last_error: Add function
      o mac: Add support for HMAC-SHA-256 and HMAC-SHA-512
      o WinCNG: support for SHA256/512 HMAC
      o kex: Added diffie-hellman-group-exchange-sha256 support
      o OS/400 crypto library QC3 support
    This release includes the following security advisory:
      o diffie_hellman_sha256: convert bytes to bits
        CVE-2016-0787: http://www.libssh2.org/adv_20160223.html
    This release includes the following bugfixes:
      o SFTP: Increase speed and datasize in SFTP read
      o openssl: make libssh2_sha1 return error code
      o openssl: fix memleak in _libssh2_dsa_sha1_verify()
      o cmake: include CMake files in the release tarballs
      o Fix builds with Visual Studio 2015
      o hostkey.c: Fix compiling error when OPENSSL_NO_MD5 is defined
      o GNUmakefile: add support for LIBSSH2_LDFLAG_EXTRAS
      o GNUmakefile: add -m64 CFLAGS when targeting mingw64
      o kex: free server host key before allocating it (again)
      o SCP: add libssh2_scp_recv2 to support large (> 2GB) files on windows
      o channel: Detect bad usage of libssh2_channel_process_startup
      o userauth: Fix off by one error when reading public key file
      o kex: removed dupe entry from libssh2_kex_methods
      o _libssh2_error: Support allocating the error message
      o hostkey: fix invalid memory access if libssh2_dsa_new fails
      o hostkey: align code path of ssh_rsa_init to ssh_dss_init
      o libssh2.pc.in: fix the output of pkg-config --libs
      o wincng: fixed possible memory leak in _libssh2_wincng_hash
      o wincng: fixed _libssh2_wincng_hash_final return value
      o add OpenSSL 1.1.0-pre2 compatibility
      o agent_disconnect_unix: unset the agent fd after closing it
      o sftp: stop reading when buffer is full
      o sftp: Send at least one read request before reading
      o sftp: Don't return EAGAIN if data was written to buffer
      o sftp: Check read packet file offset
      o configure: build "silent" if possible
      o openssl: add OpenSSL 1.1.0-pre3-dev compatibility
      o GNUmakefile: list system libs after user libs
 2016-02-25 22:09:21 -06:00
Tobias Geerinckx-Rice 1eb8139100 libpsl: 2016-02-16 -> 2016-02-25 2016-02-25 20:54:24 +01:00
Pascal Wittmann 8106d61c12 libfilezilla: 0.3.1 -> 0.4.0 2016-02-25 19:57:39 +01:00
Graham Christensen f91c979f8a xerces-c: 3.1.1 -> 3.1.3 2016-02-25 11:25:00 -06:00
Josef Knedl 5e1da18b6d tk: Fixes NixOS/nixpkgs#13377 (bad install_name) 
Patch is based on: https://trac.macports.org/changeset/100816
of bug report: https://trac.macports.org/ticket/37395
 2016-02-25 17:57:22 +01:00
Vladimír Čunát 93f6af1071 Merge branch 'master' into staging 2016-02-25 09:01:48 +01:00
Vladimír Čunát 30b7bd8d01 Merge branch 'glibc-2.22' into staging 
I'm running whole my working notebook on 2.22 without any problems.
I don't expect any significant issues.
 2016-02-25 08:42:59 +01:00
Jude Taylor b6ff8f9314 disable darwin-arch.patch on openssl >= 1.0.2 2016-02-24 13:33:16 -08:00
= a5ed58445f yarp (+ libace): init at 2.3.64 2016-02-24 22:08:29 +01:00
Vladimír Čunát 0ee46ddffb libssh: security update 0.7.2 -> 0.7.3 
It's supposed to fix CVE-2016-0739: weak secret with diffie-hellman.
 2016-02-24 15:02:19 +01:00
Eelco Dolstra ef86e9506d Untested fix for #13401 2016-02-24 14:01:20 +01:00
vbgl a15f7c018e Merge pull request #13129 from bzizou/gdal-netcdf 
gdal-netcdf: GDAL with netCDF format support
 2016-02-24 12:23:28 +01:00
Franz Pletz 775f902c07 Merge pull request #13147 from colemickens/update-libinput 
libinput: 1.1.6 -> 1.2.0
 2016-02-24 10:58:29 +01:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr c4644c8b43 gdal: 2.0.1 -> 2.0.2 + netCDF format support 
may be disabled by netcdfSupport=false
 2016-02-24 10:39:44 +01:00
zimbatm fa46b448d7 Merge pull request #13019 from tg-x/qtox 
qtox: 20151221 -> 1.2.4, libtoxcore-dev: 20160105 -> 20160131
 2016-02-23 22:52:09 +00:00
Ben Darwin c49c384e20 libminc: init at 2.3.00 2016-02-23 14:03:10 -05:00
Cole Mickens 719a065e01 libinput: 1.1.6 -> 1.2.0 2016-02-23 10:11:10 -08:00
Pascal Wittmann b1c8fb8685 Merge pull request #13390 from bzizou/libdap 
libdap: fixed pkg name (version missing)
 2016-02-23 15:57:22 +01:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr a60df02d02 libdap: fixed pkg name (version missing) 2016-02-23 15:29:57 +01:00
Arseniy Seroka a714281b79 Merge pull request #13389 from bzizou/nco 
nco: fixed the pkg name (version missing)
 2016-02-23 17:17:19 +03:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr fb8c4fafb9 nco: fixed the pkg name (version missing) 
Also fixed too long description
 2016-02-23 15:15:44 +01:00
zimbatm f05bc0444a gettext: 0.19.6 -> 0.19.7 
expat is replaced by a bundled version of libxml2
 2016-02-22 22:47:45 +00:00
zimbatm 05d4959251 gettext: expand all gettext.sh paths 2016-02-22 22:47:45 +00:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr 59a1dc4be2 libdap: init at 3.15.1 2016-02-22 23:15:44 +01:00
Tobias Geerinckx-Rice 2919200db3 libpsl: 2016-02-09 -> 2016-02-16 2016-02-22 19:42:27 +01:00
Josef Knedl a9e8c742fb proj: Add platforms.darwin and enable doCheck. 2016-02-22 19:05:17 +01:00
Pascal Wittmann 2d2efceecb Merge pull request #13367 from bzizou/nco 
nco: init at 4.5.5
 2016-02-22 16:26:23 +01:00