mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Code Issues Wiki Activity
107409 commits 233 branches 124 tags 7 GiB
Commit graph

29398 commits

Author SHA1 Message Date
zraexy d900478e3c broadcom-bt-firmware: init at 12.0.1.1011 
broadcom-bt-firmware: init at 12.0.1.1011
 2017-05-03 12:51:32 -08:00
zraexy 7845163d6a bt-fw-converter: init at 2017-02-19 2017-05-03 12:51:24 -08:00
Stefan Lau 03c519b2e2 rustRegistry: 2017-04-13 -> 2017-05-03 2017-05-03 21:35:23 +02:00
Rahul Gopinath 5762985302 csvkit: refactor 2017-05-03 11:58:29 -07:00
Rahul Gopinath 14d951c46f python-slugify: refactor 2017-05-03 11:58:29 -07:00
Rahul Gopinath 0ef0a4ab5e pytimeparse: refactor 2017-05-03 11:58:29 -07:00
Rahul Gopinath 2b56afea4d dbfread: refactor 2017-05-03 11:58:29 -07:00
Rahul Gopinath b94706926b dbf: refactor 2017-05-03 11:58:29 -07:00
Rahul Gopinath e13b240359 agate-sql: refactor 2017-05-03 11:58:29 -07:00
Rahul Gopinath 4365d634c8 agate-excel: refactor 2017-05-03 11:58:29 -07:00
Rahul Gopinath 90daf2de27 agate-dbf: refactor 2017-05-03 11:58:29 -07:00
Rahul Gopinath 4036bc91da agate: refactor 2017-05-03 11:58:29 -07:00
Rahul Gopinath d76e68423f openpyxl: remove 2_2_0_b1 2017-05-03 11:58:29 -07:00
Rahul Gopinath 5d1c598655 dateutil: remove 2_2 2017-05-03 11:58:29 -07:00
Rahul Gopinath 9b5b713d8f csvkit: 0.9.1 -> 1.0.2 2017-05-03 11:58:28 -07:00
Rahul Gopinath 918773356d dbfread: Enable python3 2017-05-03 11:58:28 -07:00
Rahul Gopinath 6040adc674 python-slugify: Init at 1.2.4 2017-05-03 11:58:28 -07:00
Rahul Gopinath fddbb6b1ee dbf: 0.94.003 -> 0.96.8 2017-05-03 11:58:28 -07:00
Rahul Gopinath 36acb4ec3e agate-sql: Init at 0.5.2 2017-05-03 11:58:28 -07:00
Rahul Gopinath fcd954181c agate-excel: 0.1.0 -> 0.2.1 2017-05-03 11:58:28 -07:00
Rahul Gopinath 390f67924f agate-dbf: 0.1.0 -> 0.2.0 2017-05-03 11:58:28 -07:00
Rahul Gopinath 92d18827d4 agate: 1.2.2 -> 1.6.0 2017-05-03 11:58:28 -07:00
Nikolay Amiantov 61e5763694 sqlitebrowser: wrap Qt application 2017-05-03 18:00:22 +03:00
Domen Kožar eacb230a56
hlint: add as statically linked haskell binary 2017-05-03 14:02:56 +02:00
Frederik Rietdijk 664ff4069c pythonPackages.magic-wormhole: fix build 
- fixes build
- use buildPythonPackage and pass in individual packages

As mentioned in https://github.com/NixOS/nixpkgs/pull/20722 this
packages is both an application and a library.

If a package is both then we use buildPythonPackage and put it in
python-packages.nix. That way we can guarantee we use the correct
version of dependencies when using it as a library. Unfortunately, it
does mean the name of the package is prefixed with `pythonX.X-`.
 2017-05-03 09:52:53 +02:00
Frederik Rietdijk 52b1995250 pythonPackages.os-testr: mark as broken 2017-05-03 09:42:33 +02:00
Frederik Rietdijk a6175a477c pythonPackages.pivy: disable on 3.x 2017-05-03 08:57:06 +02:00
Frederik Rietdijk 82e99edf31 pythonpackages.pywinrm: broken 2017-05-03 08:53:58 +02:00
Frederik Rietdijk 8017bc934e Merge pull request #25453 from LnL7/python-stevedore 
python-stevedore: 1.7.0 -> 1.21.0
 2017-05-03 08:46:32 +02:00
Frederik Rietdijk 97630b21c9 pythonPackages.pydot: fix build 2017-05-03 08:42:24 +02:00
Frederik Rietdijk d317e834c1 pythonPackages.pytestcov: never propagate pytest 
Because we have multiple versions of pytest and we do not want to end up
with multiple in one closure.
 2017-05-03 08:34:47 +02:00
Frederik Rietdijk 6d1408153c pythonPackages.setuptoolsTrial: do not depend on old pytest 2017-05-03 08:30:08 +02:00
Frederik Rietdijk a7b206bb89 pythonPackages.certifi: move to separate file 2017-05-03 08:19:58 +02:00
zraexy 31ad4e1657 perlPackages.RegexpGrammars: init at 1.045 2017-05-02 13:14:36 -08:00
Matthew Bauer 1234825656 xsv: fix "has invalid meta attribute" 
Without this there's an eval error, when running nix-env -f '<nixpkgs>'
--query --available --json.

  derivation ‘xsv-0.11.0’ has invalid meta attribute ‘override’
  derivation ‘xsv-0.11.0’ has invalid meta attribute ‘overrideDerivation’

[Bjørn: extend commit message.]
 2017-05-02 21:04:34 +02:00
Daiderd Jordan 5217969f69
python-stevedore: 1.7.0 -> 1.21.0 2017-05-02 20:11:49 +02:00
Tim Steinbach a74632f6c2 Merge pull request #25440 from NeQuissimus/ammonite_0_8_4 
ammonite: 0.8.3 -> 0.8.4
 2017-05-02 13:42:49 -04:00
romildo 0de51ef70e connman-gtk: init at 1.1.1 2017-05-02 14:13:31 -03:00
Changlin Li 75197be585 bfg repo cleaner: add top-level aliase (#25420) 
Makes it easier to find and install this package.
 2017-05-02 18:01:18 +02:00
Peter Simons 287e670462 Merge pull request #25390 from Hodapp87/rstudio_fix 
rstudio: Fix recompilation issue with custom package set
 2017-05-02 16:43:41 +02:00
Tim Steinbach c13e328916
ammonite: 0.8.3 -> 0.8.4 
Also rename package and add alias for the old name.
 2017-05-02 08:56:20 -04:00
Tim Steinbach b5169fd277
linux: Add cgroups patches for 4.9, 4.10, 4.11 2017-05-02 08:49:39 -04:00
Vladimír Čunát 9ad1aaae53
lua5_{sec,1_sockets,expat}: convert to aliases 
There's nothing better in these expressions than what we have in
lua-packages.nix
 2017-05-02 14:00:44 +02:00
Lancelot SIX 770b3164be
pythonPackages.asgiref: fix double declaration 
Fix a rebase error
 2017-05-02 11:59:51 +02:00
Frederik Rietdijk 5bcfd2f56c Merge pull request #25407 from matthiasbeyer/add-toot 
toot: init at 0.8.0 (including pythonPackages.beautifulsoup4 update)
 2017-05-02 09:35:47 +02:00
Matthias Beyer 66c21e72e0 toot: init at 0.8.0 2017-05-02 09:30:26 +02:00
Lancelot SIX 068b46d576
pythonPackages.wokkel: disable for python3 2017-05-02 09:28:37 +02:00
Lancelot SIX 578e1cef93
pythonPackages.nevow: disable for python3 2017-05-02 09:28:36 +02:00
Lancelot SIX 3e06c611da
pythonPackages.klein: disable for python3 2017-05-02 09:28:36 +02:00
Lancelot SIX 528a452043
pythonPackages.twisted: 16.4.1 -> 17.1.0 2017-05-02 09:28:34 +02:00
Lancelot SIX d965c8e6e9
pythonPackages.asgi_redis: 1.0.0 -> 1.3.0 2017-05-02 09:28:34 +02:00
Lancelot SIX c767920189
pythonPackages.asgi_ipc: 1.2.0 -> 1.3.1 2017-05-02 09:28:33 +02:00
Lancelot SIX db0627336e
pythonPackages.asgiref: 1.0.0 -> 1.1.1 2017-05-02 09:28:28 +02:00
Lancelot SIX b1d16c731f
pythonPackages.automat: init at 0.5.0 2017-05-02 09:25:35 +02:00
Lancelot SIX 63fd2c7e62
pythonPackages.autobahn: 0.16.0 -> 0.18.2 2017-05-02 09:25:35 +02:00
Lancelot SIX 0743b0fb6e
pythonPackages.pytest-asyncio: init at 0.5.0 2017-05-02 09:25:30 +02:00
Lancelot SIX df79a19638
pythonPackages.constantly: init at 15.1.0 2017-05-02 09:24:46 +02:00
Lancelot SIX 687fe19a04
pythonPackages.txaio: 2.5.2 -> 2.7.0 2017-05-02 09:24:46 +02:00
Lancelot SIX 91b5290412
pythonPackages.m2r: init at 0.1.5 2017-05-02 09:24:42 +02:00
Peter Hoeg 13bca4ba2d rockboxutility: fix linking to Qt libs 2017-05-02 14:34:52 +08:00
Jörg Thalheim d08c717eff pythonPackages.cffi: 1.9.1 -> 1.10.0 2017-05-02 07:32:16 +02:00
Benjamin Staffin a027f103a0 Merge pull request #25423 from jammerful/shibboleth 
nginx: Add Shibboleth Module
 2017-05-01 21:02:39 -07:00
Daniel Ehlers 4338f096f5 nullmailer + service: init at 2.0 2017-05-02 01:46:12 +02:00
Shea Levy 207a0af06a Add linux 4.11 2017-05-01 19:04:45 -04:00
Michael Raskin 4099450bea Merge pull request #25414 from LnL7/darwin-nox 
nox: fix darwin build
 2017-05-02 00:25:07 +02:00
Michael Raskin a5f436814a Merge pull request #21017 from AndersonTorres/rst2html5 
rst2html5: init at 1.9.3
 2017-05-01 23:58:28 +02:00
Daiderd Jordan 74686d6c8c
python-dogpile-cache: fix darwin build and add missing test dependencies 2017-05-01 23:41:12 +02:00
Daiderd Jordan bf64f96e7f
python-pytestcov: add missing dependencies 2017-05-01 23:37:28 +02:00
AndersonTorres 4a87eae13c rst2html5: put its expression in a separate file 
As recommended by @7c6f434c and @FRidh, rst2html5 now resides
in its proper file.
 2017-05-01 18:12:36 -03:00
jammerful da5bc79469 nginx: Add Shibboleth Module 
Also add nginxShibboleth package
 2017-05-01 17:09:00 -04:00
Michael Raskin f4289c8b19 qtinstaller: init at 2.0.3; adapted from expression by @spacefrogg 
See #23620
 2017-05-01 22:32:37 +02:00
Matthias Beyer 146f8af47c beautifulsoup4: 4.5.1 -> 4.5.3 2017-05-01 21:38:18 +02:00
Jörg Thalheim 95f6bece88
wpa_supplicant: upgrade to qt5 
also inkscape removal patch, as it introduced a bug: #25320
fixes #25320 #25325
 2017-05-01 21:23:22 +02:00
Brendan Miller 064882e52a pants13-pre: 1.3.0.dev13 -> 1.3.0.dev19 
Pulling in the latest dev release from pants to get the latest bug fixes
and features.

Implements NixOS/nixpkgs#25401
 2017-05-01 14:07:44 -04:00
Michael Raskin 208fa65256 Merge pull request #23080 from nixy/init/linode-cli 
linode-cli: init at 1.4.7
 2017-05-01 19:27:30 +02:00
Michael Raskin ee790bf944 Merge pull request #23321 from jensbin/networkmanager_dmenu 
networkmanager_dmenu: init at unstable-2017-04-13
 2017-05-01 19:25:44 +02:00
Jens Grunert 87a450e466 Adding networkmanager_dmenu 2017-05-01 19:00:33 +02:00
Andrew R. M 61668b036a linode-cli: init at 1.4.7 2017-05-01 12:58:54 -04:00
Michael Raskin 008bd11363 Merge pull request #25237 from ericsagnes/pkg-update/fcitx-related 
fcitx-engines.mozc: 2.17.2313.102.1 -> 2.18.2612.102.1 and other minor fcitx packages updates
 2017-05-01 18:58:53 +02:00
Andrew R. M f9429cc7f8 perlPackages.WebServiceLinode: init at 0.28 2017-05-01 12:58:07 -04:00
Vladimír Čunát 92ee3b02e8
Merge branch 'staging' 
Master is seeing a very large rebuild now, and this version of staging
seemed rather fine already (only a few thousand builds remaining now).
I really didn't want to wait a few more days because of this.
 2017-05-01 18:00:21 +02:00
Michael Raskin 6fc51d1d7f django_hijack: reduce hackishness of overrides 2017-05-01 17:42:31 +02:00
Michael Raskin a53fb88d33 Merge pull request #25170 from emanueleperuffo/dash-to-dock 
gnomeExtensions.dash-to-dock: init at version v57
 2017-05-01 16:44:37 +02:00
Chris Hodapp 29969a5ec7 rstudio: Fix recompilation issue with custom package set 
This attempts to fix the issue described at
https://github.com/NixOS/nixpkgs/pull/22219#issuecomment-291801133.
Any change to the custom packages passed to RStudio causes this to
completely rebuild RStudio, which is completely unnecessary and also a
bit of a hindrance as it's a fairly slow build.

This rolls back most of that old PR, and instead implements something
more like rWrapper.  Existing configurations with the old useRPackages
will break.
 2017-05-01 09:46:40 -04:00
Michael Raskin 47d352fd28 pythonPackages.django_compat: restore access to buildPythonPackage override 2017-05-01 15:14:39 +02:00
Michael Raskin b8dab3a0dd Merge pull request #25123 from vmchale/master 
madlang: init at 2.3.0.3
 2017-05-01 14:39:31 +02:00
Michael Raskin 49c419cf3e Merge pull request #25117 from lucas8/cubicle 
cubicle: init at 1.0.2
 2017-05-01 14:26:52 +02:00
Michael Raskin 619039c04a Merge pull request #25078 from ericsagnes/pkg-update/rainbowstream 
rainbowstream 1.3.6 -> 1.3.7 & top-level attribute
 2017-05-01 13:47:44 +02:00
Michael Raskin bcbafdefc4 Merge pull request #25035 from elitak/cross-staging 
Add some ARM platforms
 2017-05-01 13:30:32 +02:00
Michael Raskin d8b2641b58 Merge pull request #25029 from wizeman/u/new-doit 
doit: init at 0.30.3
 2017-05-01 13:29:18 +02:00
Michael Raskin 8295ecfa79 Merge pull request #25027 from armijnhemel/pydot 
pydot: 1.0.2 -> 1.2.3
 2017-05-01 13:26:45 +02:00
Michael Raskin d767b6bfbd Merge pull request #25021 from leenaars/dkimpy 
pythonPackages.dkimpy: init -> 0.6.1
 2017-05-01 13:26:15 +02:00
Frederik Rietdijk 08e484c444 pythonPackages.mysql_connector_repackaged: disable on 3.x 2017-05-01 12:29:42 +02:00
Frederik Rietdijk da73ab3cac pythonPackages.pyramid_beaker: not broken 2017-05-01 12:29:42 +02:00
Frederik Rietdijk 1376c661a9 pythonPackages.almir: make sqlalchemy8 private to almir 
because this is the only package that is using it.
 2017-05-01 12:29:42 +02:00
Michael Raskin 3a548b8fef Merge pull request #24872 from lheckemann/libgme 
Add libgme
 2017-05-01 12:00:30 +02:00
Jörg Thalheim 8b5c1ec440 Merge pull request #25283 from Mic92/file-slurp 
perlPackages.FileSlurp: silence perl 5.24.1 warnings
 2017-05-01 11:44:32 +02:00
Michael Raskin 4d2f7b63e0 Merge pull request #24803 from pajowu/master 
browserpass: init at 1.0.2
 2017-05-01 11:27:17 +02:00
Michael Raskin 4d4af5a13a Merge pull request #24768 from snyh/deepin-terminal 
deepin-terminal: Init at 2.3.3
 2017-05-01 11:23:56 +02:00
Frederik Rietdijk db41aa6a94 pythonPackages.SQLAlchemy-ImageAttach: 0.8.2 -> 1.0.0 
- package update
- use upstream name as attribute name
 2017-05-01 11:22:56 +02:00
Frederik Rietdijk 464b5aa6fb pythonPackages.Wand: fix loading extensions 2017-05-01 11:22:56 +02:00
Frederik Rietdijk 5b7b91f6b3 pythonPackages.sharedLibraryExtension 2017-05-01 11:22:56 +02:00
Michael Raskin bed819afc7 Merge pull request #24766 from nlewo/pr/dogpile 
pythonPackages.dogpile_cache: 0.5.4 -> 0.6.2
 2017-05-01 11:22:42 +02:00
Michael Raskin 7a298266a2 Merge pull request #24765 from nlewo/pr/pbr 
pythonPackages.pbr: 1.8.1 -> 2.0.0
 2017-05-01 11:21:38 +02:00
Michael Raskin b3e69c08ee Merge pull request #24742 from volth/reason-1.13.3-master 
reason: init at 1.13.3
 2017-05-01 11:20:50 +02:00
Michael Raskin d7cb79a1ef Merge pull request #24712 from lsix/add_django_1_11 
Add django 1 11
 2017-05-01 11:17:31 +02:00
Michael Raskin 3d1f825d2b murmur_git: mark as not broken without iceSupport 2017-05-01 10:44:47 +02:00
Frederik Rietdijk c0282dc058 pythonPackages.flask-restplus_0_8: move to separate file 
and fix on Python 3.x
 2017-05-01 10:10:34 +02:00
Frederik Rietdijk c61e9b24c4 pythonPackages.guessit: 2.0.4 -> 2.1.2 2017-05-01 10:10:34 +02:00
Frederik Rietdijk 312631a37e pythonPackages.plumbum: 1.5.0 -> 1.6.3 2017-05-01 10:10:34 +02:00
Frederik Rietdijk 0af84da84b pythonPackages.colorclass: disable tests 2017-05-01 10:10:34 +02:00
Frederik Rietdijk 7b28208b00 pythonPackages.babelfish: do not disable on 3.x 2017-05-01 10:10:34 +02:00
Frederik Rietdijk c0b77d9902 pythonPackages.zxcvbn-python: init at 4.4.14 2017-05-01 10:10:34 +02:00
Frederik Rietdijk e2bc80ce49 pythonPackages.APScheduler: fix tests 2017-05-01 10:10:34 +02:00
Frederik Rietdijk 12caccfe80 pythonPackages.PyRSS2Gen: 1.0.0 -> 1.1 2017-05-01 10:10:34 +02:00
Peter Marheine e38c47ddd4 flask-restplus: enable tests 2017-05-01 10:10:34 +02:00
Peter Marheine fa7e942f98 rednose: init at 1.2.1 2017-05-01 10:10:34 +02:00
Peter Marheine c1cbae5a1e flexget: 1.2.337 -> 2.8.17 2017-05-01 10:10:34 +02:00
Peter Marheine d5ffb897a2 guessit: 0.9.4 -> 2.0.4 2017-05-01 10:10:34 +02:00
Michael Raskin 9c770f64c6 Merge pull request #24583 from veprbl/yoda166 
yoda: 1.6.5 -> 1.6.6, provide version with ROOT
 2017-05-01 09:49:48 +02:00
Michael Raskin c1a1e3a273 Merge pull request #24430 from winniequinn/premake5 
premake5: init at 5.0.0pre.alpha.11
 2017-05-01 09:42:16 +02:00
Frederik Rietdijk 12b2fbf7fb pythonPackages.mccabe_0_5: remove old and unused version 
https://github.com/NixOS/nixpkgs/issues/25375
 2017-05-01 07:52:37 +02:00
Frederik Rietdijk d3cebfb907 pythonPackages.lxml_3_5: remove old and unused version 
https://github.com/NixOS/nixpkgs/issues/25375
 2017-05-01 07:52:37 +02:00
Frederik Rietdijk 4847ef5428 pythonPackages.billiard_33: remove old and unused version 
https://github.com/NixOS/nixpkgs/issues/25375
 2017-05-01 07:52:37 +02:00
Michael Raskin 90ce1aa28a Merge branch 'master' into clickhouse 2017-05-01 07:33:31 +02:00
Frederik Rietdijk 6c467b7448 pythonPackages.pyparsing1: make private to mwlib 
because pyparsing1 is an old version that is only used by mwlib.
 2017-05-01 07:20:52 +02:00
Frederik Rietdijk 63550e35fb pythonPackages.deform2: remove duplicate package 
This is an exact duplicate of pythonPackages.deform.
 2017-05-01 07:04:53 +02:00
Frederik Rietdijk a33f9b0ff0 backblaze-b2: use latest tqdm and remove pythonPackages.tqdm4 
backblaze-b2 need tqdm >= 4.5.0 and that dependency was already
fulfilled with pythonPackages.tqdm, so let's use the current version and
remove pythonPackages.tqdm4.

cc @hrdinka @kevincox
 2017-05-01 06:16:38 +02:00
Frederik Rietdijk 536a634f28 pythonPackages.tqdm: 4.8.4 -> 4.11.2 
- matplotlib and pandas are optional dependencies, so let's remove them
- enable tests again
 2017-05-01 06:06:38 +02:00
Orivej Desh 2efb099c00 pythonPackages.ipython: support python2 
Fixes #25234
 2017-05-01 05:56:38 +02:00
Cray Elliott fe3590b5ba remove ffmpeg_3_2 and ffmpeg_3_1 2017-04-30 16:52:48 -07:00
Cray Elliott 7172556e8d ffmpeg: 3.2.4 -> 3.3 2017-04-30 16:52:48 -07:00
Michael Raskin a7455d7f5c Merge pull request #24283 from dyrnade/chrome-gnome-shell 
native host connector for gnome extensions: init at 7d99523e90805cb65027cc2f5f1191a957dcf276
 2017-05-01 01:19:29 +02:00
Michael Raskin 1aa652fdce Merge pull request #24278 from knedlsepp/add_eccodes 
eccodes: init at 2.2.0
 2017-05-01 01:18:07 +02:00
Michael Raskin 1cce0887ee Merge branch 'master' into mptcp-v91.3 2017-05-01 00:43:08 +02:00
michael bishop 70863d5326
ioport: init at 1.2 2017-04-30 18:34:17 -03:00
Michael Raskin 1c8d388201 Merge pull request #23865 from volth/xrdp-tests 
xrdp: init at 0.9.2
 2017-04-30 22:35:48 +02:00
Michael Raskin d5ec7bc748 Merge pull request #23697 from sargon/master 
sshguard + service: init at 2.0.0
 2017-04-30 21:43:12 +02:00
Marc Weber f8b5b85df6 displaycal: init at 3.2.4.0 2017-04-30 21:12:36 +02:00
Bjørn Forsman fdcb4fa4b8 owncloud-client: unbreak build (qt58 -> qt56) 
The build fails due to missing qt linguist tools. That's solved by
adding 'qttools'. But the build fails soon after with missing 'Sql'
module. I didn't manage to solve that, so use Qt 5.6 where it works.

Using libsForQt seems to be the way Qt packages are composed today, so
use that (seems safer).
 2017-04-30 20:19:57 +02:00
Clemens Manert 6939341455 termdown: init at 1.11.0 2017-04-30 19:50:50 +02:00
Clemens Manert 7f8c564315 Upgraded pyfiglet from 0.7.2 -> 0.7.5 2017-04-30 19:44:55 +02:00
Michael Raskin 929ae39dbe Merge pull request #22683 from aneeshusa/add-nixos-test-for-radicale 
Add nixos test for radicale
 2017-04-30 18:51:46 +02:00
Michael Raskin ebc9e7a201 Merge pull request #22660 from timbertson/nix-update-source 
nix-update-source: init at 0.3.0
 2017-04-30 18:49:07 +02:00
Michael Raskin 67c309d458 Merge pull request #22554 from SuprDewd/google-music 
google-play-music-desktop-player: init at 4.2.0
 2017-04-30 18:44:18 +02:00
Michael Raskin b3d1050cf2 Merge pull request #22438 from rnhmjoj/masscan 
masscan: init at 2016-11-03
 2017-04-30 18:40:58 +02:00
Michael Raskin 929eed352b Merge pull request #22410 from adnelson/upstart_improvements 
upstart: wrap binaries and patch hard-coded paths
 2017-04-30 18:29:33 +02:00
AndersonTorres 234b1cf794 rst2html5: init at 1.9.3 
Converts ReSTructuredtext (.rst) to (X)HTML5
 2017-04-30 11:47:08 -03:00
Frederik Rietdijk b7e7646849 Merge pull request #25159 from matthewbauer/wxwidgets-refactor2 
wxWidgets: move wxGTK-* to one wxWidgets folder
 2017-04-30 15:02:18 +02:00
Vladimír Čunát 9860e77f79
Merge branch 'master' into staging 2017-04-30 14:40:39 +02:00