Commit graph

19625 commits

Author SHA1 Message Date
Robin Gloster dec77a45fa
xastir: fix build 2017-08-11 11:40:36 +02:00
Herwig Hochleitner e8f1ddcbd1 chromium: 60.0.3112.78 -> 60.0.3112.90 2017-08-11 11:17:14 +02:00
Herwig Hochleitner bb397093b5 chromium: add build flags and system libs
This is lifted from the Arch build recipe:
https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/chromium

using system libjpeg still doesn't work for some reason, otherwise the
build runs fine
2017-08-11 11:17:14 +02:00
Herwig Hochleitner 8dc869e340 chromium: 59.0.3071.115 -> 60.0.3112.78
get rid of outdated version branches and patches
take a patch from gentoo, to fix gn bootstrapping
2017-08-11 11:17:14 +02:00
Peter Hoeg 18112eea52 dropbox: 31.4.25 -> 32.4.23 2017-08-11 16:05:49 +08:00
Lancelot SIX 7c9cadfb6c Merge pull request #28087 from romildo/upd.mkvtoolnix
mkvtoolnix: 13.0.0 -> 14.0.0
2017-08-11 09:17:26 +02:00
Tim Steinbach f0719b5a0b
mercurial: 4.1.1 -> 4.3.1 2017-08-10 20:54:28 -04:00
Silvan Mosberger 4a0efc9c4f
git: 2.14.0 -> 2.14.1
The new version contains a security fix for CVE-2017-1000117

More information regarding this update can be found here:
http://marc.info/?l=git&m=150238802328673&w=2
2017-08-11 02:17:35 +02:00
Lukas Werling 11861b7c97 pcmanfm: build with gtk3 2017-08-10 21:37:03 +02:00
Jörg Thalheim a0ffab2a62 Merge pull request #28040 from taku0/firefox-bin-55.0
firefox: 54.0.1 -> 55.0
2017-08-10 20:16:11 +01:00
Franz Pletz abd837fe3d
subversion19: 1.9.5 -> 1.9.6 for CVE-2017-9800
See https://subversion.apache.org/security/CVE-2017-9800-advisory.txt
2017-08-10 20:57:39 +02:00
Franz Pletz 0f5cbe43da
subversion18: 1.8.17 -> 1.8.18 for CVE-2017-9800
See https://subversion.apache.org/security/CVE-2017-9800-advisory.txt
2017-08-10 20:57:39 +02:00
Tim Steinbach 55fcd5caed Merge pull request #28078 from lsix/update_docker_machine
docker-machine: 0.12.0 -> 0.12.2
2017-08-10 14:49:36 -04:00
Tim Steinbach debbd82194 Merge pull request #28071 from karolchmist/idea-ultimate-2017.1.2
idea-ultimate: 2017.1.5 -> 2017.2.1
2017-08-10 14:49:14 -04:00
Tim Steinbach 3971bd892d Merge pull request #28110 from abnerlee/patch-2
correct the sha265 of typora after package update
2017-08-10 14:48:16 -04:00
Tim Steinbach 1d6ec295d1 Merge pull request #28051 from taku0/flashplayer-26.0.0.151
flashplayer: 26.0.0.137 -> 26.0.0.151 [Critical security fixes]
2017-08-10 14:42:58 -04:00
Tim Steinbach 9dafe594be Merge pull request #28074 from NeQuissimus/atom_1_19_0
atom: 1.18.0 -> 1.19.0
2017-08-10 13:31:04 -04:00
Robin Gloster 700f7614cd Partly revert "python.buildEnv: only wrap executables"
This partly reverts commit 4495bfe138.

The xen changes should not have been commited.

(cherry picked from commit 206a4c9aba)
2017-08-10 19:28:07 +02:00
Frederik Rietdijk 9f73f22c64 Merge commit 'b1f5305abd7b1b3d7ed180d9d00301da6e323e41' into HEAD 2017-08-10 19:26:16 +02:00
AbnerLee 8d70d4066f correct the sha265 of typora after package update
The deb is updated just now without increase the version number..
2017-08-11 00:47:08 +08:00
Jens Binkert 6bcbf585ec Typora: 0.9.29 -> 0.9.31 2017-08-10 16:02:03 +02:00
Robin Gloster c3e8d491ff
clerk: fix wrapProgram call 2017-08-10 15:49:56 +02:00
Robin Gloster f60fffe697
sawfish: fix wrapProgram call 2017-08-10 15:15:22 +02:00
Robin Gloster 206a4c9aba
Partly revert "python.buildEnv: only wrap executables"
This partly reverts commit 4495bfe138.

The xen changes should not have been commited.
2017-08-10 12:55:46 +02:00
Frederik Rietdijk b0c30f436e Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-10 10:41:23 +02:00
Robin Gloster ffd46e9bce
gnuradio: fix makeWrapper calls 2017-08-10 03:36:32 +02:00
Robin Gloster 5f6fe64823
audio-recorder: fix makeWrapper call 2017-08-10 03:36:32 +02:00
Robin Gloster b4d2b841d9
libreoffice: remove obsolete file from wrapping 2017-08-10 01:28:37 +02:00
Michael Alan Dorman b43888b973 melpa-packages: 2017-08-09
Removals:
 - aurora-config-mode: removed from melpa
2017-08-09 17:16:43 -04:00
Michael Alan Dorman d887748507 melpa-stable-packages: 2017-08-09
Removals:
 - aurora-config-mode: removed from melpa
 - fuel: repo moved, lost tags for stable version
2017-08-09 17:16:43 -04:00
Michael Alan Dorman 05bee41510 org-packages: 2017-08-09 2017-08-09 17:16:43 -04:00
Michael Alan Dorman bdcb21c466 elpa-packages: 2017-08-09 2017-08-09 17:16:43 -04:00
romildo da93220fff mkvtoolnix: 13.0.0 -> 14.0.0 2017-08-09 17:11:01 -03:00
Michael Weiss 6225f1bf66 android-studio-preview: 3.0.0.8 -> 3.0.0.9
"Android Studio 3.0 Canary 9" -> "Android Studio 3.0 Beta 1"
2017-08-09 21:32:43 +02:00
Simon Lackerbauer 30d76b8ccd seafile-client: 5.0.7 -> 6.1.0
bump to qt5
2017-08-09 19:53:05 +02:00
Lancelot SIX fa02817cda
docker-machine: 0.12.0 -> 0.12.2 2017-08-09 17:59:47 +02:00
Dan Peebles ed55bdb501 lkl: 2017-06-27 -> 2017-08-09
Just bumping the package version to pick up a bugfix.

Fixes #28055
2017-08-09 14:23:27 +00:00
Tim Steinbach bd27239c06
atom: 1.18.0 -> 1.19.0 2017-08-09 09:13:28 -04:00
Robin Gloster 4495bfe138
python.buildEnv: only wrap executables 2017-08-09 15:07:03 +02:00
Karol Chmist e8020e272d idea-ultimate: 2017.1.5 -> 2017.2.1 2017-08-09 13:48:35 +02:00
Lancelot SIX 38f3153caa
motu-client: 1.0.8 -> 1.4.0 2017-08-09 10:08:14 +02:00
Lancelot SIX 90282d95bd Merge pull request #27832 from lsix/update_wireshark
wireshark: 2.2.7 -> 2.4.0
2017-08-09 09:59:44 +02:00
Joe Hermaszewski 531a5b1afe git-fame: init at 2.5.2 2017-08-09 07:32:21 +01:00
Cray Elliott 3bda92175a discord: minor clean up, add self to maintainers 2017-08-08 22:29:45 -07:00
Cray Elliott 6616b9a225 discord: 0.0.1 -> 0.0.2 2017-08-08 20:36:17 -07:00
Joachim Fasting 1b77c29507
tor-browser-bundle-bin: 7.0.3 -> 7.0.4
- Update Firefox to 52.3.0esr
- Update Tor to 0.3.0.10
2017-08-08 22:12:03 +02:00
Robert Hensing 57506bbb28 xen-4.8: update changed patch hash 2017-08-08 17:40:50 +00:00
Vincent Laporte 82a4c5e38b ImageMagick: fix Magick-config 2017-08-08 17:07:54 +02:00
taku0 668007f034 flashplayer: 26.0.0.137 -> 26.0.0.151 2017-08-08 21:35:32 +09:00
davidak 3270aa896b replace "Mac OS X" and "OS X" with "macOS"
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
Bas van Dijk ca64eaadf8 postage: init at 3.2.17 & add NixOS module 2017-08-07 20:35:23 +02:00
Nick Hu 5261c449d8 urxvt_autocomplete_all_the_things: init at 1.6.0 2017-08-07 15:30:13 +01:00
taku0 5021ed9dd2 firefox-esr: 52.2.1esr -> 52.3.0esr 2017-08-07 21:15:39 +09:00
taku0 39e6dfe2f6 firefox: 54.0.1 -> 55.0 2017-08-07 21:14:31 +09:00
taku0 311a7ca329 firefox-bin: 54.0.1 -> 55.0 2017-08-07 21:12:44 +09:00
Frederik Rietdijk e6808e30ae Merge pull request #27931 from gnidorah/kde
Fix some KDE applications
2017-08-07 13:15:36 +02:00
zimbatm 19c64b57d5 minikube: 0.20.0 -> 0.21.0 2017-08-06 20:24:26 +01:00
Robin Gloster f14c27d178
cmus: fix build
fixes #27966
2017-08-06 20:34:14 +02:00
Michael Weiss 953b232385 gns3-server: init at 2.0.3 2017-08-06 17:40:53 +02:00
Tim Steinbach 747cbbad71 Merge pull request #27969 from NeQuissimus/atom_paxmark
atom: Add paxmark
2017-08-06 10:03:32 -04:00
gnidorah 771c80d216 gwenview, k3b, konsole: propagate kinit 2017-08-06 12:55:02 +03:00
Michael Weiss acb9ca3006 gns3-gui: init at 2.0.3 2017-08-06 01:55:49 +02:00
Tim Steinbach 731a08730f
atom: Add paxmark 2017-08-05 14:36:00 -04:00
Tim Steinbach 46f586fb25 Merge pull request #27891 from jraygauthier/jrg/clementine_from_123_to_131
clementine: 1.2.3 -> 1.3.1
2017-08-05 10:32:27 -04:00
Tim Steinbach 177e06237d Merge pull request #27945 from yegortimoshenko/patch-1
bitwig-studio: 2.0 -> 2.1.3, fix desktop file
2017-08-05 09:58:49 -04:00
Roman Volosatovs 5a9109fffa
mopidy-iris: 3.0.5 -> 3.1.3 2017-08-05 14:36:21 +02:00
Mathias Schreck e19a7068ba git-lfs: 2.0.2 -> 2.2.1 2017-08-05 14:22:18 +02:00
Jan Tojnar c9d419a22b gnome: Further fixes for Using the 'memory' GSettings backend issue 2017-08-05 12:21:00 +02:00
Vincent Laporte eb7312ca7d maxima: 5.39.0 -> 5.40.0 2017-08-05 10:48:50 +02:00
Tim Steinbach d3203c7876 Merge pull request #27938 from NeQuissimus/rkt_1_28_1
rkt: 1.28.0 -> 1.28.1
2017-08-04 22:18:56 -04:00
Thomas Tuegel acf05ea777
dropbox: 31.4.24 -> 31.4.25 2017-08-04 19:54:13 -05:00
Tim Steinbach 9d70950bfa Merge pull request #27948 from mimadrid/update/git-2.14.0
git: 2.13.4 -> 2.14.0
2017-08-04 18:37:50 -04:00
John Wiegley 6ff50dc164 Merge pull request #27918 from Zimmi48/coq-update
Coq update
2017-08-04 15:29:18 -07:00
mimadrid dc74b1a86d
git: 2.13.4 -> 2.14.0 2017-08-04 23:58:45 +02:00
Benno Fünfstück 268374cafe docker: update runc commit
This updates to the new runc as was also done upstream:

f3ef17e47d

In particular, it fixes an issue where output of interactive docker containers
would not reset correctly to the beginning of a line.
2017-08-04 23:04:08 +02:00
Yegor Timoshenko 0d631365bb bitwig-studio: 2.0 -> 2.1.3, fix desktop file 2017-08-04 18:18:02 +00:00
Théo Zimmermann 057ffcf0dd coq: adding myself to the maintainers 2017-08-04 19:52:55 +02:00
Théo Zimmermann b25d65e051 coq: use camlp5_strict
The versions of Coq available through this expression do not actually
require camlp5_transitional. We drop this dependency to see if, in the
future, the package camlp5_transitional can be removed from nixpkgs.
2017-08-04 19:52:54 +02:00
Théo Zimmermann c0dca2fb00 coq: 8.6 -> 8.6.1 2017-08-04 19:52:51 +02:00
Tim Steinbach 92461b8f9c
rkt: 1.28.0 -> 1.28.1 2017-08-04 12:06:00 -04:00
Michael Raskin 190493cd91 Merge pull request #27932 from romildo/upd.jwm
jwm: 1600 -> 1621
2017-08-04 15:30:25 +02:00
Tim Steinbach 67b3d49abb Merge pull request #27929 from jdanekrh/jd_idea-community
idea-community: 2017.2.0 -> 2017.2.1
2017-08-04 09:02:57 -04:00
Tim Steinbach c6fc73b5bc Merge pull request #26842 from lluchs/vivaldi-ffmpeg-codecs
vivaldi: add support for proprietary codecs
2017-08-04 09:00:59 -04:00
romildo 0b2be5ad90 jwm: 1600 -> 1621 2017-08-04 09:38:26 -03:00
gnidorah ce78756ad8 gwenview, spectacle: propagate libkipi 2017-08-04 15:02:36 +03:00
gnidorah 5fc9a604b4 k3b: remove unused wrapper file 2017-08-04 15:02:18 +03:00
zimbatm e0a848fb16 terraform_0_10_0: tune build 2017-08-04 11:50:44 +01:00
Jiri Danek 305b3fed04 idea-community: 2017.2.0 -> 2017.2.1 2017-08-04 10:38:59 +02:00
Franz Pletz 07106fb508
mpv: bump waf version to 1.9.8
The bootstrap.py file from mpv downloads this exact version.
2017-08-04 04:09:19 +02:00
Robin Gloster 82d4963ab5
umurmur: 0.2.16a -> 0.2.17
fixes build with openssl 1.1.0
2017-08-04 04:07:39 +02:00
Robin Gloster c1ca5acf19
retroshare: 0.5.5c -> 0.6.2 2017-08-04 04:05:46 +02:00
Franz Pletz b794459727
ldcpp: remove, old and abandoned
Latest release from 2011 and needs patching to build with openssl 1.1.
2017-08-04 04:05:41 +02:00
Silvan Mosberger 99be19c3c6 bashSnippets: 1.12.0 -> 1.17.3 2017-08-04 04:05:30 +02:00
Jamey Sharp de761128da zoom-us: 2.0.91373.0502 -> 2.0.98253.0707 2017-08-04 03:34:53 +02:00
Jamey Sharp 3b289ec996 zoom-us: use makeWrapper instead of wrapProgram
Since the program to be wrapped is already in a different path than
$out/bin, we don't need the complicated dance that wrapProgram uses to
put the wrapper in the same location as the original program. Just tell
makeWrapper to put the wrapper in the final desired output location
instead.
2017-08-04 03:34:53 +02:00
Jamey Sharp 57f9bfbd48 zoom-us: only support known platforms
This package does not work on arbitrary Linux systems, only on platforms
for which upstream has provided prebuilt binaries. Fortunately, we have
a list of the platforms we know how to get binaries for: it's exactly
the ones in the `srcs` set.
2017-08-04 03:34:53 +02:00
Jamey Sharp 2062c9355a zoom-us: update homepage
zoom.us uses HTTPS now.
2017-08-04 03:34:53 +02:00
Robin Gloster b515286714
eiskaltdcpp: 2.2.9 -> 2.2.10, add upstream openssl patches 2017-08-04 02:39:22 +02:00
Robin Gloster b703df2d4c
epic5: add patch for openssl 1.1 2017-08-04 02:35:37 +02:00
Robin Gloster c7e74ff726
bip: add upstream patch to build with openssl 1.1 2017-08-04 02:33:05 +02:00
Robin Gloster 3f7d95982b
gale: remove
unmaintained and doesn't build with openssl 1.1
2017-08-04 02:31:06 +02:00
Robin Gloster 17cef2c5f3
vanitygen: remove
unmaintained and doesn't build with openssl 1.1
2017-08-04 02:29:51 +02:00
Robin Gloster 3d90c689cf
synergy: add patch to build with openssl 1.1 2017-08-04 02:26:24 +02:00
Robin Gloster d0aca4cba1
qlcplus: needs libftdi1 2017-08-04 02:25:25 +02:00
Robin Gloster 011a46eba6
qlcplus: init at 4.11.0 2017-08-04 02:25:17 +02:00
Robin Gloster be28c4cc48
hackrf: fix udev rule detection impurity 2017-08-04 02:21:48 +02:00
Robin Gloster 500791cd33
hackrf: 2015.07.2 -> 2017.02.1 2017-08-04 02:21:39 +02:00
Robin Gloster 5b3e403eca
ola: init at 0.10.4 2017-08-04 02:06:01 +02:00
Cillian de Róiste 2244b1815d shotcut: fix homepage 2017-08-03 23:03:04 +02:00
Cillian de Róiste feb7d844f8 processing: fix homepage 2017-08-03 23:03:04 +02:00
Cillian de Róiste 52ebfd6bc6 mixxx: fix homepage 2017-08-03 23:03:03 +02:00
Cillian de Róiste 7c17925aae key-mon: fix download and homepage URLs 2017-08-03 23:03:03 +02:00
Cillian de Róiste 4b960e2ce2 drumgizmo: fix homepage 2017-08-03 23:03:03 +02:00
Cillian de Róiste 8fb5217cf7 blender metadata: fix homepage 2017-08-03 23:03:03 +02:00
Cillian de Róiste 475c303e91 a2jmidid: fix download URL
gna.org is dead, so the homepage is also now longer valid. According to
openhub repo.or.cz seems to be the most relevant repo currently.
2017-08-03 23:03:03 +02:00
zimbatm a1c953dfc7 terraform: 0.9.11 -> 0.10.0 2017-08-03 11:06:23 +01:00
mimadrid 09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
Raymond Gauthier 0322f66307 clementine: 1.2.3 -> 1.3.1 2017-08-02 23:40:46 -04:00
Peter Hoeg cd4d0c72a8 dropbox: 30.4.22 -> 31.4.24 2017-08-03 10:55:23 +08:00
Nikolay Amiantov f64fb1cc0a mupdf: remove third-party libjpeg 2017-08-03 02:59:08 +03:00
Michael Weiss 87b215d5f7 android-studio-preview: 3.0.0.7 -> 3.0.0.8
This also contains some refactoring.
2017-08-02 02:12:11 +02:00
Tim Steinbach ae73a1704a
git: 2.13.3 -> 2.13.4 2017-08-01 18:41:14 -04:00
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Frederik Rietdijk 3b06b8edb7 Merge pull request #27843 from mimadrid/update/filezilla-3.27.0.1
filezilla: 3.25.2 -> 3.27.0.1
2017-08-01 21:56:41 +02:00
Frederik Rietdijk 1344aff5a0 Merge pull request #27847 from mimadrid/update/gitflow-1.11.0
gitflow: 1.10.2 -> 1.11.0
2017-08-01 21:56:13 +02:00
Frederik Rietdijk 3ed7975b65 Merge pull request #27844 from mimadrid/update/igv-2.3.98
igv: 2.3.89 -> 2.3.98
2017-08-01 21:52:33 +02:00
Frederik Rietdijk cb04c2ae0e Merge pull request #27845 from mimadrid/update/git-cola-2.11
git-cola: 2.10 -> 2.11
2017-08-01 21:52:09 +02:00
Frederik Rietdijk 3eaa599699 Merge pull request #27846 from mimadrid/update/git-hub-0.11.1
git-hub: 0.11.0 -> 0.11.1
2017-08-01 21:51:56 +02:00
Frederik Rietdijk d1af3b33aa Merge pull request #27006 from Infinisil/scyther
scyther: init at 1.1.3
2017-08-01 21:48:47 +02:00
Joachim F 7be40dd899 Merge pull request #27836 from mdorman/emacs-updates
Semi-automated Emacs package updates
2017-08-01 20:39:45 +01:00
mimadrid d942615651
gitflow: 1.10.2 -> 1.11.0 2017-08-01 20:51:16 +02:00
mimadrid 5234545da8
git-hub: 0.11.0 -> 0.11.1 2017-08-01 20:49:48 +02:00
mimadrid bc563c5973
git-cola: 2.10 -> 2.11 2017-08-01 20:48:21 +02:00
mimadrid 20fb18bdbc
igv: 2.3.89 -> 2.3.98 2017-08-01 20:46:31 +02:00
mimadrid 23aed92e42
filezilla: 3.25.2 -> 3.27.0.1 2017-08-01 20:42:32 +02:00
Peter Hoeg 161f0d3348 cantata: 2.0.1 -> 2.1.0 2017-08-02 01:13:24 +08:00
Daiderd Jordan 14314056fc Merge pull request #27839 from LnL7/darwin-nano
nano: remove darwin patch
2017-08-01 18:48:09 +02:00
John Wiegley ea8798acc6
coq2html: New expression 2017-08-01 09:30:20 -07:00
Daiderd Jordan ac56b8db4a
nano: remove darwin patch 2017-08-01 18:28:52 +02:00
Michael Alan Dorman 4a84b487fd melpa-packages: 2017-08-01
Removals:
 - anything-project: removed from melpa
 - chinese-pyim-basedict: renamed to pyim-basedict
 - chinese-pyim-greatdict: renamed to pyim-greatdict
 - elscreen-persist: removed from melpa
 - mic-paren: repository no longer exists
 - mpg123: removed from melpa
 - mwe-log-commands: repository no longer exists
 - revive: removed from melpa
 - sql-mssql: removed from melpa
2017-08-01 11:24:39 -04:00
Michael Alan Dorman 8be846ef7e melpa-stable-packages: 2017-08-01
Removals:
 - chinese-pyim-basedict: renamed to pyim-basedict
 - chinese-pyim-greatdict: renamed to pyim-greatdict
 - elscreen-persist: removed from melpa-stable
 - mic-paren: repository no longer exists
2017-08-01 11:24:39 -04:00
Michael Alan Dorman 4ea23a09d9 org-packages: 2017-08-01 2017-08-01 11:24:39 -04:00
Michael Alan Dorman 46c97397b7 elpa-packages: 2017-08-01 2017-08-01 11:24:39 -04:00
Tim Steinbach 92a40d2271 Merge pull request #27818 from NeQuissimus/alacritty_xclip
alacritty: Don't use xclip from PATH
2017-08-01 09:24:52 -04:00
Tim Steinbach d06bd380e9
alacritty: Remove xclip with buildInput 2017-08-01 08:42:54 -04:00
Lancelot SIX 90d8608323
wireshark: 2.2.7 -> 2.4.0
Fixes the following CVEs:

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11409
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11406
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11407
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11408
2017-08-01 13:35:10 +02:00
Robin Gloster f732d81641
albert: 0.11.3 -> 0.12.0 2017-08-01 12:34:12 +02:00
Robin Gloster 63b6179f52
alpine: 2.00 -> 2.21 2017-08-01 12:34:12 +02:00
Robin Gloster 657bec468c
abook: 0.6.0pre2 -> 0.6.1 2017-08-01 10:35:01 +02:00
Frederik Rietdijk 903d9daf0f Merge pull request #27816 from mimadrid/update/calc-2.12.6.1
calc: 2.12.5.3 -> 2.12.6.1
2017-08-01 09:19:29 +02:00