Commit graph

2598 commits

Author SHA1 Message Date
Robin Gloster
e904bb4871
nixbot: init at unstable-2016-10-09 2016-10-09 15:05:02 +02:00
zimbatm
0f6e3a3cde lolcat: simplify 2016-10-08 22:38:57 +01:00
zimbatm
a4506d9b7a fluentd: simplify 2016-10-08 22:38:57 +01:00
Profpatsch
bc8733aae6 geteltorito: switch to upstream dist (#19226)
Upstream has now a versioned release, so we switch over from the github
mirror.
2016-10-08 13:52:22 +02:00
Damien Cassou
225cc1c106
vdirsyncer: 0.11.3 -> 0.13.1
vdirsyncer > 0.13.0 does not support python 2 anymore.
https://github.com/pimutils/vdirsyncer/blob/master/CHANGELOG.rst#version-0130
2016-10-08 09:15:11 +02:00
Chris Darnell
4358c1660e xtitle: 0.2 -> 0.3 (#19351) 2016-10-08 07:11:41 +02:00
Graham Christensen
1dcfa0df6a Merge pull request #19336 from DamienCassou/umlet-14.2
umlet: 13.3 -> 14.2
2016-10-07 17:51:26 -04:00
Damien Cassou
79f6563000
umlet: 13.3 -> 14.2 2016-10-07 20:59:56 +02:00
Michael Weiss
8d17e63465 lf: init at 2016-10-02
Add the package "lf" (as in "list files") at version 2016-10-02
(nightly) under the category "tools/misc", add it to the top-level
package collection and set myself as the maintainer.

I have tested this package under NixOS and Gentoo+Nix.
2016-10-07 14:07:46 +02:00
Thomas Tuegel
2e255a2edd
Merge branch 'staging' 2016-10-06 09:51:02 -05:00
Robin Gloster
cd1ec18b42 thin-provisioning-tools: init at 0.6.3 (#19268) 2016-10-05 20:28:28 +02:00
Vladimír Čunát
07d12fbef1 fontforge: get rid of output hash depending on git
... to avoid git changes being mass rebuilds.
Thanks to Mic92 for the solution idea.
See discussion under: https://github.com/NixOS/nixpkgs/pull/19248
2016-10-05 19:04:03 +02:00
Michael Raskin
8de1da7ccb mc: 4.8.17 -> 4.8.18 2016-10-04 10:04:33 +02:00
Profpatsch
c535924f5f geteltorito: init at 0.6 (#18614) 2016-10-04 04:07:56 +02:00
Alexander Ried
e7ded267bd xserver: replace XKB_BINDIR with compile time option
---

Using the configure option relieves us of the patch and passing the path
via the env var in many places. Also the env var may not be inherited
when components like gdm spawn new sessions.
2016-10-03 15:03:02 +02:00
Jörg Thalheim
53e6c610e9
logstash: wrap around logstash-plugin
fixes #19096
2016-10-02 09:33:16 +02:00
Tuomas Tynkkynen
f5dd3a703d treewide: Fix more lib.optional misuses 2016-10-02 00:44:10 +03:00
Jörg Thalheim
5435f94371
logstash: 2.3.4 -> 2.4.0 2016-10-01 23:18:25 +02:00
Chris Van Vranken
d2590d9d9e
logstash: wrapProgram to provide jre at runtime 2016-10-01 23:18:24 +02:00
Jörg Thalheim
46693bd6e8 Merge pull request #18043 from mogorman/kalibrate-hackrf
kalibrate-hackrf: init at 2016-08-27
2016-10-01 17:44:18 +02:00
Stefan Götz
d49b5cd452 youtube-dl: 2016-09-19 -> 2016-09-27 2016-10-01 12:46:10 +02:00
Jörg Thalheim
e499d59bcb Merge pull request #19109 from matthiasbeyer/update-tmux
tmux: 2.2 -> 2.3
2016-09-30 23:02:25 +02:00
Matthias Beyer
65ec5b1dc4 tmux: 2.2 -> 2.3 2016-09-30 17:37:14 +02:00
Nick Novitski
7650280e8b fzy: 0.4 -> 0.7 2016-09-29 18:31:40 +02:00
Frederik Rietdijk
33b3bd6b36 Merge pull request #18963 from rycee/package/xdxf2slob
Add xdxf2slob tool and dependencies
2016-09-29 09:08:53 +02:00
Robert Helgesson
e8817a2d20
bash-completion: change attribute name
This changes the attribute name of bash-completion from `bashCompletion`
to `bash-completion`. Keeps `bashCompletion` as an alias for the new
name.
2016-09-28 17:46:29 +02:00
Robert Helgesson
d945046be9
xdxf2slob: init at 2015-06-30 2016-09-28 15:58:59 +02:00
Alexey Shmalko
4dd6d9748c Merge pull request #18774 from cstrahan/xsel-update
xsel: 1.2.0 -> git-2016-09-02
2016-09-28 00:42:05 +03:00
Franz Pletz
a6d4ea4c2c
treewide: remove executable flags from .nix files 2016-09-27 22:15:00 +02:00
Frederik Rietdijk
3ba16c8234 Do not use top-level buildPythonPackage or buildPythonApplication
but instead use the one in pythonPackages.
2016-09-26 11:10:51 +02:00
Frederik Rietdijk
5220ee8db7 apt-offline: pass in pythonPackages 2016-09-26 11:10:50 +02:00
Robert Helgesson
1e12738dc4
svtplay-dl: 1.4 -> 1.5 2016-09-26 01:01:49 +02:00
Pascal Bach
888551887b ipxe: 20141124 -> 20160831 (#18938)
HTTPS support is enabled
2016-09-25 04:35:46 +02:00
Daiderd Jordan
f62fef5fcb Merge pull request #18714 from RamKromberg/init/2mdoc
init: docbook2mdoc, texi2mdoc & pod2mdoc
2016-09-23 00:42:06 +02:00
Daiderd Jordan
992b59c9a1 Merge pull request #18605 from LnL7/darwin-fzf
fzf: fix cycle in bin output
2016-09-23 00:29:40 +02:00
Luca Bruno
19dc2ff732 Merge pull request #18824 from aske/xflux-gui
xflux-gui: 2016-08-08 -> 2016-09-21, fix icon display
2016-09-22 21:45:31 +01:00
zimbatm
aec4a9fee7 fzf: 0.13.5 -> 0.15.1 2016-09-22 20:06:29 +01:00
Kirill Boltaev
c0a2fd0ecb xflux-gui: 2016-08-08 -> 2016-09-21, fix icon display 2016-09-21 23:20:48 +03:00
Charles Strahan
4a4fd2747c
xsel: 1.2.0 -> git-2016-09-02
The last xsel release was in 2008. Since then, a number of bugs have
been fixed. For example, pasting a large chunk of text (>4000 chars)
into chrome would cause the current tab to hang indefinitely.

A couple examples in the wild:

https://github.com/kfish/xsel/issues/14
https://github.com/kfish/xsel/issues/13
https://github.com/kfish/xsel/pull/16
https://bugs.chromium.org/p/chromium/issues/detail?id=515401
https://github.com/electron/electron/issues/3116
https://github.com/neovim/neovim/issues/4719
2016-09-21 14:16:59 -04:00
Tuomas Tynkkynen
0e226720f5 yle-dl: 2.9.1 -> 2.11
Also remove a hack that has been fixed by someone else in the meantime.
2016-09-21 19:39:59 +03:00
Moritz Ulrich
febb35bd03 rustRegistry: 2016-08-23 -> 2016-09-20 2016-09-20 11:10:37 +02:00
José Romildo Malaquias
c59d3cd849 xclip: 0.12-svn-20140209 -> 0.13 2016-09-20 10:17:29 +02:00
Stefan Goetz
3a534e8609 youtube-dl: 2016.07.16 -> 2016.09.19 (#18723)
* youtube-dl: 2016.07.16 -> 2016.09.18

* youtube-dl: 2016.09.18 -> 2016.09.19
2016-09-19 21:43:53 +02:00
Tuomas Tynkkynen
5a6d6d4451 diffoscope: Use bin outputs of dependencies
All of the dependencies listed here are used via command-line tools. So
use getBin to avoid unnecessarily depending on development headers.
2016-09-19 16:09:34 +03:00
Alexey Shmalko
930c682c53 Merge pull request #18752 from rnhmjoj/bdf2psf
bdf2psf: 1.147 -> 1.148
2016-09-19 09:21:34 +03:00
rnhmjoj
363976941b
bdf2psf: 1.147 -> 1.148 2016-09-19 01:08:22 +02:00
Robin Gloster
55de97e020
byobu: 5.98 -> 5.112 2016-09-18 23:48:13 +02:00
Ram Kromberg
f1c9f024d5 pod2mdoc: init at 0.0.10 2016-09-18 03:23:06 +03:00
Ram Kromberg
7176340bdc texi2mdoc: init at 0.1.2 2016-09-18 03:22:56 +03:00
Ram Kromberg
d7e43b0d27 docbook2mdoc: init at 0.0.9 2016-09-18 03:22:42 +03:00
Robert Helgesson
32352638ec
svtplay-dl: 1.3 -> 1.4 2016-09-17 22:59:31 +02:00
Joachim F
1868783a90 Merge pull request #18619 from RamKromberg/init/mandoc
Init mandoc at 1.13.4 & replace groff with it in libedit and bsdbuild
2016-09-17 16:15:35 +02:00
Daiderd Jordan
0eddd42306
fzf: fix cycle in bin output 2016-09-16 23:06:50 +02:00
Tristan Helmich
c187f2f903 graylog: 2.1.0 -> 2.1.1 (#18663) 2016-09-16 16:42:44 +02:00
Kamil Chmielewski
914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
2016-09-16 00:04:55 +01:00
Ram Kromberg
c528892280 mandoc: init at 1.13.4 2016-09-15 20:44:43 +03:00
Domen Kožar
335cde2525 Merge pull request #18521 from RamKromberg/fix/man-db
mandb: fix apropos
2016-09-13 21:44:37 +02:00
Nikolay Amiantov
4748709926 Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs 2016-09-13 12:51:34 +03:00
Domen Kožar
2ff10415bc fix eval 2016-09-13 10:55:08 +02:00
Domen Kožar
26247ec718 xburst-tools: doesn't build on 32bit linux
(cherry picked from commit 635b48d373bdf98324d696419c53a81512038bb4)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-13 10:37:53 +02:00
Jascha Geerds
deb59785b0
tmuxp: Add pytest-rerunfailures to dependencies
(cherry picked from commit 6fc67944bf8a9841b649c8d36f852ce65bbae0e1)
(cherry picked from commit f0d1ac606232a02771343f6ad84d4c769ae2ad54)
2016-09-13 09:23:24 +02:00
Kirill Boltaev
ac65abad0c xflux-gui: 1.1.1 -> 2016-08-08 (#18489)
Also make it work with new python changes.
2016-09-13 07:10:43 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Jesse Haber-Kucharsky
99e06fe771 opam, aspcud: init packages for external solver (#16938)
The opam package manager relies on external solvers to determine package
management decisions it makes related to upgrades, new installations,
etc.

While, strictly speaking, an external solver is optional, aspcud is
highly recommended in documentation. Furthermore, even having a
relatively small number of packages installed quickly causes the limits
of the interal solver to be reached (before it times out).

Aspcud itself depends on two programs from the same suite: gringo, and
clasp.

On Darwin, Boost 1.55 (and thus Gringo) do not build, so we only support
Aspcud on non-Darwin platforms.
2016-09-12 10:44:50 +02:00
Joachim F
cafd4a7668 Merge pull request #18373 from tavyc/mc
mc: Enable support for SFTP and SMB.
2016-09-12 01:49:00 +02:00
Ram Kromberg
ce4f1f8283 mandb: fix apropos 2016-09-12 02:12:44 +03:00
Robert Helgesson
f261f5fe34
svtplay-dl: 1.1 -> 1.3 2016-09-09 22:59:34 +02:00
Tuomas Tynkkynen
290db94f04 Merge remote-tracking branch 'upstream/master' into staging 2016-09-09 02:40:47 +03:00
Joachim F
81678ab2ee Merge pull request #18405 from groxxda/antimicro
antimicro: 2.18.2 -> 2.22, use new official repository
2016-09-09 01:31:30 +02:00
Alexander Ried
42557e0514 antimicro: 2.21 -> 2.22, use new official repository 2016-09-08 23:35:15 +02:00
Bjørn Forsman
daf068c33b plantuml: 8037 -> 8047 2016-09-08 23:09:23 +02:00
Jascha Geerds
4bef63d227 tmuxp: Add dependency to pytest 2016-09-08 13:48:45 +02:00
Manav Rathi
440d721915 txt2man: mention runtime dependencies on gawk and coreutils
The commit message in 1a2b47463b is
incorrect -- the package seemed to work because only the help message
was invoked:

    result/bin/txt2man -h

To guard against such trivial successes, this commit introduces a
test.
2016-09-08 13:01:55 +02:00
Manav Rathi
1a2b47463b txt2man: enable darwin platform
Tested on Mac OS X 10.10, Nix 1.11.4 with:

    nix-build -A txt2man
    result/txt2man
2016-09-08 12:57:25 +05:30
Octavian Cerna
d93987b4a7 mc: Enable support for SFTP and SMB. 2016-09-06 23:29:03 +03:00
Michael Raskin
bcd3dcfc2b bcunit: init at 3.0 2016-09-06 18:19:17 +02:00
Michael Raskin
b30ead6e54 cunit: 2.1-2 -> 2.1-3 2016-09-06 18:19:17 +02:00
Vladimír Čunát
b4f9618b31 Merge #18278: fontconfig: fix dependencies on OSX 2016-09-06 08:32:00 +02:00
Ram Kromberg
0b469a6725 man-db: set troff command correctly (#18333)
Signed-off-by: Ram Kromberg <ramkromberg@mail.com>
2016-09-06 04:22:06 +02:00
Chris Martin
e8b1555524 yubico-piv-tool: add description fields (#18322) 2016-09-05 23:33:46 +02:00
Eelco Dolstra
78178d5854 systemd: Separate lib output
This moves libsystemd.so and libudev.so into systemd.lib, and gets rid
of libudev (which just contained a copy of libudev.so and the udev
headers). It thus reduces the closure size of all packages that
(indirectly) depend on libsystemd, of which there are quite a few (for
instance, PulseAudio and dbus). For example, it reduces the closure of
Blender from 430.8 to 400.8 MiB.
2016-09-05 19:17:14 +02:00
Dmitry Kalinkin
1d4ed38751 fontforge: prevent configure from picking up xquartz installation 2016-09-04 16:33:27 -04:00
Jan Malakhovski
8acd3960cf xapian-omega: move into xapian directory 2016-09-04 14:24:31 +00:00
Jan Malakhovski
8f6664b744 xapian-omega: pin to xapian library version 2016-09-04 14:18:58 +00:00
Dmitry Kalinkin
810787238d fontforge: enable Carbon which is required on OSX 2016-09-03 23:38:23 -04:00
Jan Malakhovski
6cd407de28 xapian-omega: 1.2.21 -> 1.4.0 2016-09-03 13:49:59 +00:00
Gabriel Ebner
71abe65818 Merge pull request #18232 from mimadrid/update/fzf-0.13.5
fzf: 0.13.3 -> 0.13.5
2016-09-03 07:36:43 +02:00
mimadrid
f4d13a44c0
fzf: 0.13.3 -> 0.13.5 2016-09-02 23:23:35 +02:00
Eike Kettner
498d803cce recutils: 1.5 -> 1.7 2016-09-02 22:01:06 +02:00
Tristan Helmich
2e9aa13773 graylog: 2.0.3 -> 2.1.0 (#18200) 2016-09-02 13:53:17 +02:00
Robert Helgesson
ca472594fe
cpulimit: 2.2 -> 2.3 2016-09-02 08:06:59 +02:00
Tuomas Tynkkynen
bb18d73323 xfstests: 2016-08-06 -> 2016-08-26
Fixes build.
2016-09-01 21:03:27 +03:00
Tuomas Tynkkynen
85d7d9d254 xfstests: Autodetect what to link in the wrapper 2016-09-01 21:03:27 +03:00
Tuomas Tynkkynen
3364230d56 Disable bunch of non-compiling packages on Darwin
These ones have a "Last successful build" timestamp in the 2014s or
2015s. Presumably no one will notice if we now stop building them.

softether_4_18              2015-09-20  http://hydra.nixos.org/build/39418483
lensfun                     2014-09-30  http://hydra.nixos.org/build/39394104
net_snmp                    2015-09-20  http://hydra.nixos.org/build/39410553
djview                      2015-08-11  http://hydra.nixos.org/build/39413233
libmusicbrainz2             2015-09-20  http://hydra.nixos.org/build/39410106
fox_1_6                     2014-05-07  http://hydra.nixos.org/build/39410858
libofx                      2015-09-24  http://hydra.nixos.org/build/39423507
yacas                       2014-09-30  http://hydra.nixos.org/build/39393150
iomelt                      2014-09-30  http://hydra.nixos.org/build/39408486
softether                   2015-09-20  http://hydra.nixos.org/build/39425800
mp4v2                       2014-09-30  http://hydra.nixos.org/build/39421899
virtuoso7                   2014-09-21  http://hydra.nixos.org/build/39415206
man_db                      2015-04-23  http://hydra.nixos.org/build/39404236
libdiscid                   2014-09-30  http://hydra.nixos.org/build/39412202
zabbix22.agent              2014-09-21  http://hydra.nixos.org/build/39412149
vidalia                     2015-08-06  http://hydra.nixos.org/build/39411500
libmtp                      2015-09-20  http://hydra.nixos.org/build/39419199
wxGTK29                     2015-09-20  http://hydra.nixos.org/build/39415296
ncmpcpp                     2015-11-06  http://hydra.nixos.org/build/39404455
libtorrent                  2014-09-21  http://hydra.nixos.org/build/39394646
shishi                      2014-03-21  http://hydra.nixos.org/build/39418874
ocaml_3_12_1                2014-09-30  http://hydra.nixos.org/build/39392996
djview4                     2015-08-11  http://hydra.nixos.org/build/39427799
vimNox                      2014-05-23  http://hydra.nixos.org/build/39397012
ttfautohint                 2015-08-06  http://hydra.nixos.org/build/39398330
libraw                      2015-09-24  http://hydra.nixos.org/build/39402271
wxGTK30                     2015-09-20  http://hydra.nixos.org/build/39401871
sbcl_1_2_5                  2015-09-20  http://hydra.nixos.org/build/39426091
prover9                     2014-09-30  http://hydra.nixos.org/build/39406476
rcs                         2015-08-25  http://hydra.nixos.org/build/39392037
gpac                        2015-09-24  http://hydra.nixos.org/build/39399470
virtuoso6                   2014-09-30  http://hydra.nixos.org/build/39398651
xlslib                      2015-09-24  http://hydra.nixos.org/build/39410387
ucommon                     2015-03-27  http://hydra.nixos.org/build/39414040
commoncpp2                  2014-09-30  http://hydra.nixos.org/build/39420117
virtuoso                    2014-09-21  http://hydra.nixos.org/build/39399978
miniHttpd                   2014-09-30  http://hydra.nixos.org/build/39392925
mpack                       2014-09-26  http://hydra.nixos.org/build/39399535
nbd                         2014-09-26  http://hydra.nixos.org/build/39401367
newsbeuter-dev              2014-07-29  http://hydra.nixos.org/build/39406259
gimp_2_8                    2015-09-20  http://hydra.nixos.org/build/39436271
gimp                        2015-09-20  http://hydra.nixos.org/build/39435976
zabbix20.agent              2014-09-30  http://hydra.nixos.org/build/39393242
gst_all_1.gst-plugins-good  2015-09-20  http://hydra.nixos.org/build/39408506
ocaml_4_00_1                2014-09-30  http://hydra.nixos.org/build/39399526
inadyn                      2014-09-30  http://hydra.nixos.org/build/39426389
gst_all_1.gst-plugins-bad   2015-09-20  http://hydra.nixos.org/build/39392970
zabbix.agent                2014-09-30  http://hydra.nixos.org/build/39421412
cmake-2_8                   2015-09-24  http://hydra.nixos.org/build/39399443
liblastfm                   2015-08-06  http://hydra.nixos.org/build/39421812
newsbeuter                  2014-07-29  http://hydra.nixos.org/build/39396605
sdcv                        2014-09-26  http://hydra.nixos.org/build/39412928
2016-09-01 20:39:33 +03:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Profpatsch
e1e96a8210 youtube-dl: wrap with atomicparsley (#18066)
Otherwise --embed-thumbnail will crash youtube-dl while running.
Rewrite the module arguments to be semantic and not fail with null
pointer errors.
2016-08-30 14:36:16 +02:00
Tuomas Tynkkynen
d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
Tuomas Tynkkynen
c3bcb4e1ce treewide: Use explicit 'dev' references to glibc 2016-08-30 03:11:09 +03:00
Tuomas Tynkkynen
048a30e4e4 treewide: Fix dev references to libxml2 2016-08-30 03:02:32 +03:00
Vladimír Čunát
3f80ecfc79 fontforge: build the non-gui version without fontconfig
(in build-time closure)
2016-08-29 22:27:34 +02:00
Matthew O'Gorman
145bbbe17b
kalibrate-hackrf: init at 2016-08-27 2016-08-29 01:17:29 -04:00
Robin Gloster
e17bc25943
Merge remote-tracking branch 'upstream/master' into staging 2016-08-29 00:24:47 +00:00
Frederik Rietdijk
9d25dc12d9 Revert "hdf5: 1.8.16 -> 1.10.0-patch1"
This reverts commit 1c1a03f0d3.

hdf5 1.10 is not yet supported by all tools/libraries (e.g pytables, a dependency of pandas, requires hdf5 1.8).
2016-08-28 19:28:31 +02:00
obadz
57ddc155fc Merge branch 'master' into staging
Conflicts:
	pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
David Guibert
1c1a03f0d3 hdf5: 1.8.16 -> 1.10.0-patch1 2016-08-28 11:42:21 +02:00
Graham Christensen
a29eb6bfe7 Merge pull request #18024 from cransom/blink1tool
blink1-tool: init at 1.98
2016-08-27 21:43:21 -04:00
obadz
3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Robin Gloster
d80ad66701
svtplay-dl: fix path to test runner 2016-08-27 21:55:37 +00:00
Joachim F
c82d9e9fae Merge pull request #17884 from garrison/vmtouch-1.1.0
vmtouch: 1.0.2 -> 1.1.0
2016-08-27 21:38:48 +02:00
Casey Ransom
59b32b92e0 blink1-tool: init at 1.98
The command line tool for the blink(1) notification light.
2016-08-26 19:36:14 -04:00
Bjørn Forsman
90de10b3ee system-config-printer: fix "Print Test Page"
Wrap s-c-p with CUPS_DATADIR=${cups-filters}/share/cups so that it finds
the "testprint" file needed for "Print Test Page" functionality.

Without this change, s-c-p tries to open /usr/share/cups/data/testprint
(fails).
2016-08-26 21:11:36 +02:00
Moritz Ulrich
78305bc5a1 Merge pull request #17944 from steveeJ/racerd-bump
rust: bump registry and racerd
2016-08-26 00:03:34 +02:00
Bjørn Forsman
8f6a8f0757 system-config-printer: fix expansion of $(out) in .service file
Allows the configure-printer@.service to find the udev-configure-printer
program (correct ExecStart path).
2016-08-25 17:37:50 +02:00
Robin Gloster
ad10bf6309
yad: 0.25.1 -> 0.37.0 and fixup icons 2016-08-25 00:00:48 +00:00
Stefan Junker
117a6d10bb exa: fix depshash 2016-08-25 00:33:15 +02:00
Jaka Hudoklin
dcebe6f8cc Merge pull request #17712 from mbrock/unclutter-xfixes
unclutter-xfixes: init at 1.2
2016-08-24 23:46:08 +02:00
Robin Gloster
4370f487fa ddccontrol: use autoreconfHook and fix for newer automake 2016-08-24 21:06:43 +00:00
Franz Pletz
15a1c8a6a8 sam-ba: disable build for i686-linux 2016-08-24 21:31:02 +02:00
Franz Pletz
06a5aaacab ttyrec: fix build 2016-08-24 21:31:02 +02:00
Franz Pletz
e74edb35a9 mstflint: 3.7.0-1.18 -> 4.4.0-1.12 2016-08-24 21:31:02 +02:00
Robin Gloster
b59df0f871 rpm: remove hack
elfutils now adds a eu- prefix to avoid collisions and has now therefore
been added to rpm as propagatedBuildInput
2016-08-24 19:26:55 +00:00
obadz
78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles
3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
Mikael Brockman
ffb3f0396c unclutter-xfixes: init at 1.2 2016-08-24 11:24:00 +03:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
f064bfe803 treewide: Use more makeLibraryPath 2016-08-23 02:56:12 +03:00
Tuomas Tynkkynen
74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Jim Garrison
8cacdaec4b vmtouch: 1.0.2 -> 1.1.0 2016-08-21 02:20:12 -04:00
Frederik Rietdijk
8c1a1a11bf asciinema: 20160520 -> 1.3.0
See https://github.com/NixOS/nixpkgs/pull/17807
2016-08-19 12:32:22 +02:00
Frederik Rietdijk
5a501bd828 Remove top-level dbus_python and pythonDBus.
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
2016-08-16 22:52:37 +02:00
Matthew Bauer
bb245a5b1e unclutter: fix darwin build 2016-08-16 19:25:46 +00:00
Matthew Bauer
94ad63a1aa sl: fix darwin build 2016-08-16 19:25:45 +00:00
Matthew Bauer
07ca8027d9 fontforge-gtk: fix darwin build 2016-08-16 19:25:41 +00:00
Matthew Bauer
f8f4da3561 dumbtorrent: fix darwin build 2016-08-16 19:25:41 +00:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Nikolay Amiantov
bdc700c23a grub4dos: 0.4.6a-2016-04-26 -> 0.4.6a-2016-08-06 2016-08-14 22:37:10 +03:00
Frederik Rietdijk
e4b47de694 Remove top-level pycrypto
See #11567.
2016-08-14 14:28:26 +02:00
Frederik Rietdijk
eb3e23c49e Remove top-level setuptools
See #11567.
2016-08-14 13:07:26 +02:00
Franz Pletz
bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
zimbatm
c2302f2f45 Merge pull request #17677 from kamilchm/no-go-libs-json
buildGoPackage: remove Go deps file `libs.json`
2016-08-12 18:13:29 +01:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Kamil Chmielewski
da3ddd48e4 buildGoPackage: remove Go deps file libs.json
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046

    > Because of the content-addressable store, if two programs have the
    > same dependency it will already result in the same derivation in
    > the
    > store. Git also has compression in the pack files so it won't make
    > much difference to duplicate the dependencies on disk. And finally
    > most users will just use the binary builds so it won't make any
    > differences to them.

This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
2016-08-11 23:07:09 +02:00
Michael Raskin
d9e64c830c ised: 2.7.0 -> 2.7.1 2016-08-11 17:57:35 +02:00
Frederik Rietdijk
05a81335cf Merge pull request #17658 from siddharthist/fasd/update
fasd: 2015-03-29 -> 2016-08-11
2016-08-11 09:16:53 +02:00
Langston Barrett
76160b73ec fasd: 2015-03-29 -> 2016-08-11
change "git" to "unstable" (recommended by @FRidh)
2016-08-11 07:14:35 +00:00
Tuomas Tynkkynen
ab8b78f6a3 xfstests: 2016-01-11 -> 2016-08-06 2016-08-11 00:50:16 +03:00
Tuomas Tynkkynen
0da53ba08c xfstests: Remove 'su' from PATH
This needs to be coming from the setuid wrapper to work correctly.
2016-08-11 00:50:16 +03:00
Thomas Tuegel
e642741124 Merge pull request #17468 from peterhoeg/kronometer
kronometer: init at 2.1.0
2016-08-08 11:15:32 -05:00
Peter Hoeg
1df8c62dcf kronometer: init at 2.1.0 2016-08-08 16:59:19 +08:00
arconix
39b48ed2ef cpuminer-multi: disable on 686-linux (#17558)
upstream bug lucasjones/cpuminer-multi#27
2016-08-07 09:22:47 +02:00
Robin Gloster
78fc5dde28 mmv: disable fortify hardening 2016-08-04 07:48:24 +00:00
Robin Gloster
a2ce15318b fondu: disable fortify hardening 2016-08-04 07:48:23 +00:00
Tobias Geerinckx-Rice
3b0364cf36
snapper: 0.2.8 -> 0.3.3 2016-08-04 00:25:20 +02:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Kranium Gikos Mendoza
f5b0a5ce7a cpuminer: 2.4.4 -> 2.4.5 2016-08-03 15:48:02 +08:00
Kranium Gikos Mendoza
363381f3c2 cpuminer: fix darwin build 2016-08-03 15:47:57 +08:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
59ce911810 treewide: Some EOF-whitespace fixes 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
b96fe03484 treewide: Fix meta.platforms related typos 2016-08-02 21:17:44 +03:00
Robin Gloster
1be4907ca2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-02 13:46:36 +00:00
Jascha Geerds
9cc42ade37 tmuxp: init at 1.2.0 2016-08-01 16:02:50 +02:00
Damien Cassou
292f2f41e9 vdirsyncer: 0.11.2 -> 0.11.3 2016-08-01 12:40:33 +02:00
Robin Gloster
022c888a5f Merge pull request #17403 from womfoo/bump/cpuminer-multi-20160316
cpuminer-multi: 20140723 -> 20160316, limit builds to linux
2016-07-31 23:24:14 +02:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Kranium Gikos Mendoza
8db2b2e2cd cpuminer-multi: 20140723 -> 20160316 2016-07-31 23:10:41 +08:00
Rok Garbas
14e8071921 Merge pull request #17305 from hiberno/update-elk-stack
Update elk stack
2016-07-27 18:42:08 +02:00
Christian Lask
6d68a1fbf3 logstash: 1.5.3 -> 2.3.4
Note: the option to configure the watchdog timeout seems to be gone
in the 2.3 series of Logstash. It complains about an unknown option
and it is not in the source anymore. I am thus removing this
configuration option to adjust the service to these changes, too.
2016-07-27 17:45:38 +02:00
Robin Gloster
80b50dda07 Merge pull request #17281 from kevincox/rust-2016-07-26
rust-packages: 2016-07-13 -> 2016-07-26
2016-07-27 12:35:21 +02:00
rnhmjoj
7976c4e036
bdf2psf: 1.146 -> 1.147 2016-07-27 03:57:46 +02:00
Kevin Cox
1e74806403 exa: Update dependencies. 2016-07-26 14:57:50 -04:00
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
mimadrid
0e531def9e
parallel: 20160622 -> 20160722 2016-07-25 12:51:40 +02:00
Jun Hao
5535d94394 tmux: remove bin output to avoid cycle reference on OSX. fix #17092 2016-07-21 19:21:35 +08:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Rok Garbas
cd25b04dbb Merge pull request #16600 from artuuge/cpp_ethereum
cpp_ethereum: init at 1.2.9
2016-07-21 01:39:04 +02:00
Joachim F
33932304e1 Merge pull request #17093 from Ralith/qt5ct
qt5ct: init at 0.24
2016-07-20 09:08:27 +02:00
Benjamin Saunders
fcfec7507b qt5ct: init at 0.24 2016-07-19 21:49:20 -07:00
Frederik Rietdijk
46378eb128 hdf5: propagate optional zlib dependency 2016-07-19 14:12:13 +02:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Stephen Whitmore
d8516b0fe3 youtube-dl: 2016.07.09.2 -> 2016.07.17 2016-07-18 09:50:51 -07:00
Graham Christensen
32744b72e5 disper: repair missing libXrandr and libX11 dependencies 2016-07-18 15:10:37 +02:00
Miguel Madrid
dc05af3284 fzf: 0.13.2 -> 0.13.3 (#17013) 2016-07-18 06:36:35 +02:00
Franz Pletz
08c65bc68b gti: Fix build on darwin 2016-07-17 17:15:24 +02:00
mimadrid
018f4eb164
ethtool: 4.5 -> 4.6 2016-07-16 15:04:31 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Frederik Rietdijk
2e986016d0 Merge pull request #16946 from phanimahesh/fix-16198
Fix typo: s/propogate/propagate/
2016-07-15 15:00:01 +02:00
Vladimír Čunát
1b5ac05845 Merge branch 'staging'
Includes security fixes in gd and libarchive.
2016-07-14 15:51:28 +02:00
J Phani Mahesh
79312dc614 xflux-gui: propogatedBuildInputs -> propagatedBuildInputs 2016-07-14 15:53:09 +05:30
Gabriel Ebner
70e2438530 Merge pull request #16913 from womfoo/init/mc-4.8.17
mc: 4.8.16 -> 4.8.17
2016-07-13 13:44:13 +02:00
Kranium Gikos Mendoza
12effae5b6 mc: 4.8.16 -> 4.8.17 2016-07-13 18:52:31 +08:00
Vladimír Čunát
40785f0dac Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1282763
2016-07-12 22:00:10 +02:00
joachifm
7135dfd541 Merge pull request #16836 from brainrape/update-youtube-dl
youtube-dl: 2016.07.03.1 -> 2016.07.09.2
2016-07-12 16:21:26 +02:00
Scott Stevenson
8c81c234d3 rcm: 1.2.3 -> 1.3.0 (#16847) 2016-07-11 18:11:31 +02:00
Márton Boros
129c17b222 youtube-dl: 2016.07.03.1 -> 2016.07.09.2 2016-07-10 12:58:10 +02:00
Robert Helgesson
18a91ddfb6 cloc: 1.68 -> 1.70 2016-07-09 22:51:12 +02:00
Robert Helgesson
8a82798f97 autorandr: avoid use of xxd
Use the Python fallback instead of bringing in a dependency on Vim.
2016-07-09 22:40:34 +02:00
Graham Christensen
7bd2052436 autorandr: 4f5e2401ef -> 20150127
wertarbyte has allowed his project to languish, and phillipberdt
has taken it over and is merging pull requests
2016-07-09 22:19:32 +02:00
Alexey Shmalko
a5ee403f5b alarm-clock-applet: use default method for propagating gstreamer (#16786) 2016-07-09 18:36:04 +02:00
Daiderd Jordan
b7c134358d coreutils: use symlinks instead of shell wrapper 2016-07-09 16:47:54 +02:00
Tuomas Tynkkynen
9e6aac9cb0 bandwidth: 1.2.0 -> 1.3.1 2016-07-08 03:27:07 +03:00
Tuomas Tynkkynen
daddf89e4f Merge pull request #16709 from vrthra/bdf2psf
bdf2psf: 1.137 -> 1.146
2016-07-05 03:23:52 +03:00
Lancelot SIX
3e1f746e28 Merge pull request #16694 from mimadrid/update/youtube_dl-2016.07.03.1
youtube-dl: 2016.06.27 -> 2016.07.03.1

`mps-youtube` is the only package that fails in `nox-review`, but this wat true before this merge. I have tested the updated result of `youtube-dl`. All fine for me.
2016-07-04 22:07:44 +02:00
Rahul Gopinath
9f0330d94b bdf2psf: 1.137 -> 1.146 2016-07-04 10:37:57 -07:00
zimbatm
cec48bfa74 direnv: fix path to bash 2016-07-04 12:46:32 +01:00
mimadrid
aaa023c858
youtube-dl: 2016.06.27 -> 2016.07.03.1 2016-07-04 11:41:15 +02:00
Tobias Geerinckx-Rice
99c89f867d
debian-devscripts: 2.16.5 -> 2.16.6 2016-07-04 10:52:51 +02:00
Joachim Fasting
29ae5a10fb Merge pull request #16669 from rasendubi/alarm-clock-applet
alarm-clock-applet: fix finding gstreamer plugins and gconf at runtime
2016-07-03 23:18:25 +02:00
zimbatm
8346e72a22 direnv: 2.8.0 -> 2.9.0 2016-07-03 16:56:18 +01:00
Alexey Shmalko
2d992c2afa
alarm-clock-applet: fix finding gstreamer plugins and gconf at runtime 2016-07-03 00:21:03 +03:00
Joachim Fasting
24b3fa1ae6 Merge pull request #16560 from vrthra/dvtm-customize
dvtm: allow user configuration
2016-07-02 14:10:26 +02:00
Joachim Fasting
648ae736f0 Merge pull request #16593 from womfoo/init/pick-1.4.0
pick: init at 1.4.0
2016-07-02 14:05:56 +02:00
artuuge
83fd63995a cpp_ethereum: init at 1.2.9
jsoncpp: 1.6.5 -> 1.7.2
libjson_rpc_cpp: 0.2.1 -> 0.6.0
argtable: init at 3.0.1
libcpuid: init at 0.2.2
2016-07-01 19:14:00 +02:00
Alexey Shmalko
9ba48ecb38
alarm-clock-applet: init at 0.3.4
There were a couple of issue before the application run normally.

The first one is GConf error:
https://nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications

The second one is absence of gst plugins:
https://github.com/NixOS/nixpkgs/issues/10559
2016-07-01 03:06:50 +03:00
Kranium Gikos Mendoza
ff06326d78 pick: init at 1.4.0 2016-06-30 20:01:43 +08:00
Vladimír Čunát
3afa246038 Merge branch 'staging'
This includes a security update of expat.
2016-06-29 07:47:04 +02:00
Joachim Fasting
ec70f24ce4 Merge pull request #16572 from mimadrid/update/youtube_dl-2016.06.27
youtube-dl: 2016.06.19.1 -> 2016.06.27
2016-06-28 19:46:47 +02:00
Rahul Gopinath
d60a41053e dvtm: allow user configuration 2016-06-28 10:01:57 -07:00
Bjørn Forsman
1f4853f7a9 system-config-printer: update hash to really upgrade to 1.5.7
Commit 03353ce6ff ("system-config-printer: 1.3.12 -> 1 5.7")
forgot to update the hash. So since that commit we actually continued to
use the old version (1.3.12) because of the NixOS tarball cache...

The new version prints some warnings on startup:

  /nix/store/HASH-system-config-printer-1.5.7/share/system-config-printer/system-config-printer.py:32: \
    PyGIWarning: Polkit was imported without specifying a version first. \
    Use gi.require_version('Polkit', '1.0') before import to ensure that the right version gets loaded.
  from gi.repository import Polkit

...and similar errors for GdkPixbuf, Gdk, Gtk and Notify. These warnings
are already fixed upstream and will be part of the next release.

Implementation details:
* The new version needs python3.
* Remove unneeded, and python3 incompatible, 'notify' dependency.
  system-config-printer > 1.3.12 replaced it with GOBject introspection
  bindings to libnotify (from gi.repository import Notify).
* Add gtk3, gdk_pixbuf, pango, atk, libnotify as needed (for gobject
  introspection).
* A new --with-udevdir configure option is used to prevent the
  installer from trying to install stuff to "/rules.d" (yes, the root).
* Get pycups from the passed pythonPackages set (fixes loading of
  python cups module).
* Use pygobject3 instead of pygobject, as needed.
* Use dbus from the passed pythonPackages attrset instead of
  pythonDBus, so we get a python3 compatible module that loads
  successfully.
* Python requests2 modules is required.
2016-06-28 14:23:49 +02:00
mimadrid
654b978fa3
youtube-dl: 2016.06.19.1 -> 2016.06.27 2016-06-28 13:10:43 +02:00
Vladimír Čunát
f4792cdc0c make-bootstrap-tools*: fixup after #16406
Our coreutils now uses single-binary-build mode where, by default,
simple shebang scripts are used for all the binaries. That doesn't work
e.g. with the Linux unpacker which only handles standard binaries and
symlinks. Let's use the symlinked mode instead for boostrapping.
This does NOT change any stdenv hashes.

I only tested the case most important to me:
$ nix-build pkgs/top-level/release.nix -A stdenvBootstrapTools.x86_64-linux.test
2016-06-28 09:54:22 +02:00
mimadrid
5bf585806e
fzf: 0.12.3 -> 0.13.2 2016-06-26 15:53:30 +02:00
Joachim Fasting
47dbe49823 Merge pull request #16511 from tokudan/master
mbuffer: Disable build on Mac OS X and 20151002 -> 20160613
2016-06-26 13:23:59 +02:00
Pascal Wittmann
b083994fae Merge pull request #16509 from womfoo/xdo
xdo: 0.5 -> 0.5.3
2016-06-26 10:46:27 +02:00
Daniel Frank
da37dc4af4 mbuffer: disable darwin (its not supported) 2016-06-26 09:38:35 +02:00
Daniel Frank
a793315ccd mbuffer: update to version 20160613 2016-06-26 09:37:56 +02:00
Kranium Gikos Mendoza
cb257bf097 xdo: 0.5 -> 0.5.3 2016-06-26 14:03:28 +08:00
Pascal Wittmann
9ef6dceca9 Merge pull request #16494 from k0ral/binwalk
binwalk: 2.0.1 -> 2.1.1
2016-06-25 16:21:15 +02:00
koral
3632211cf9 binwalk: 2.0.1 -> 2.1.1 2016-06-25 13:28:10 +02:00
Joachim Fasting
4c5e9f933d Merge pull request #16445 from vrthra/datamash
datamash: 1.0.7 -> 1.1.0
2016-06-23 23:35:45 +02:00
zimbatm
e15b33639f Merge pull request #16386 from peterhoeg/togglesg
togglesg-download: 2016-02-08 -> 2016-05-31
2016-06-23 16:56:33 +01:00
Pascal Wittmann
d1a4873ae4 Merge pull request #16447 from vrthra/parallel
parallel: 20160422 -> 20160622
2016-06-23 17:41:07 +02:00
Rahul Gopinath
b27ebfa4a7 datamash: 1.0.7 -> 1.1.0 2016-06-23 07:45:59 -07:00
Frederik Rietdijk
41ca3ba4a9 Merge pull request #16425 from mbakke/yubikey-neo-manager
yubikey-neo-manager: init at 1.4.0
2016-06-23 15:39:25 +02:00
Marius Bakke
8b5675da37 yubikey-neo-manager: init at 1.4.0 2016-06-23 13:48:10 +01:00
Vladimír Čunát
3c89351fcc Merge #16406: coreutils: use single-binary build 2016-06-23 12:12:52 +02:00
Vladimír Čunát
6b27ceb006 Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e.
2016-06-23 12:09:03 +02:00
Rahul Gopinath
6b25cba125 parallel: 20160422 -> 20160622 2016-06-23 00:51:20 -07:00
Rahul Gopinath
0dbbe57de3 units: 2.12 -> 2.13 2016-06-23 00:03:59 -07:00
Wout Mertens
c26bbf0b87 coreutils: single binary build 2016-06-21 22:14:10 +02:00
Tristan Helmich
571c134613 graylog: 2.0.2 -> 2.0.3 2016-06-21 17:32:33 +02:00
Bjørn Forsman
6536804848 autorevision: init at 1.14
A shell script for extracting revision information useful in
release/build scripting from repositories.
2016-06-21 15:23:34 +02:00
wrb
22a7f3a849 youtube-dl: 2016.05.21.2 -> 2016.06.19.1 (#16338) 2016-06-21 13:12:36 +02:00
Peter Hoeg
31a88b4664 togglesg-download: 2016-02-08 -> 2016-05-31 2016-06-21 15:33:38 +08:00
Rahul Gopinath
64260e70f2 screen: 4.3.1 -> 4.4.0
Removed the patches which were specific to 4.3, and redundant configure flags
The darwin specific utmp patch seems to have been accepted too, with
`u->ut_time = now` the default.
2016-06-20 15:24:32 -07:00
Gabriel Ebner
14c038dd03 file: 5.25 -> 5.28 2016-06-20 18:23:39 +02:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

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

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Ruben Astudillo
4f985377ac hakuneko: 1.3.12 -> 1.4.1 2016-06-19 20:09:27 -04:00
Gabriel Ebner
8f91feb848 vdirsyncer: 0.11.0 -> 0.11.2 2016-06-19 16:49:14 +02:00