mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 18:42:15 +00:00
Code Issues Wiki Activity
165699 commits 203 branches 125 tags 5.6 GiB
Commit graph

3609 commits

Author SHA1 Message Date
Peter Hoeg b5c69bca37 emacs: magithub and magit-svn require git 2018-10-01 11:37:47 +08:00
xeji 75fd708391
Merge pull request #47366 from LnL7/darwin-broken-f 
broken darwin packages (f)
 2018-09-28 22:32:45 +02:00
Will Dietz eb91037e7b tree-wide: patchelf used during build -> nativeBuildInputs 
In a few cases it wasn't clear so I left them as-is.

While visiting these moved other things to nativeBuildInputs
when it was clear they were one of these cases:

* makeWrapper
* archive utilities (in order to unpack src)
  * a few of these might no longer be needed but leaving for another day
 2018-09-28 11:43:16 -05:00
Robert Helgesson 1bd1587342
eclipses: remove old platform and sdk version 
This removes the old 4.6.2 version of eclipse-platform and
eclipse-sdk.
 2018-09-27 20:50:52 +02:00
Robert Helgesson b0ea289f4c
eclipses: 4.8 -> 4.9 
This bumps eclipse-platform, eclipse-sdk, and eclipse-plugin-jdt to
version 4.9.
 2018-09-27 20:50:48 +02:00
Patrick Hilhorst a3f8ce2c94 atom, atom-beta: 1.30.0 -> 1.31.0, 1.31.0-beta0 -> 1.32.0-beta0 (#47417) 
* atom: 1.30.0 -> 1.31.0

* atom-beta: 1.31.0-beta0 -> 1.32.0-beta0
 2018-09-27 19:32:06 +02:00
Bastian Köcher 0d810c5ac4 vscode: 1.26.1 -> 1.27.2 (#47397) 2018-09-27 19:26:29 +02:00
Michael Weiss 699b2bde44 androidStudioPackages.{dev,canary}: 3.3.0.10 -> 3.3.0.11 2018-09-27 17:54:50 +02:00
Michael Weiss 16f55b2bf8 android-studio: 3.1.4.0 -> 3.2.0.26 
androidStudioPackages.beta: 3.2.0.25 -> 3.2.0.26
 2018-09-27 17:54:44 +02:00
Daiderd Jordan cd78d0cc3f
flpsed: mark linux only 
Doesn't build on darwin and probably other platforms.

    GsWidget.H:26:3: error: 'Atom' does not name a type; did you mean 'tm'?
       Atom atoms[5];
       ^~~~
       tm
    GsWidget.cxx: In member function 'void GsWidget::setProps()':
    GsWidget.cxx:47:2: error: 'atoms' was not declared in this scope
      atoms[0] = XInternAtom(fl_display,"GHOSTVIEW" , false);
      ^~~~~

/cc ZHF #45961
 2018-09-25 22:31:20 +02:00
Uli Baum 6b4abb9fa7 monodevelop: mark broken 
build has failed since 2018-03-08
cc maintainer @obadz
 2018-09-25 11:59:26 +02:00
Matthew Bauer 2240445067 emacsMacport: 7.1 → 7.2 
Fixes a critical issue with macOS

[NEWS](https://bitbucket.org/mituharu/emacs-mac/raw/master/NEWS-mac)

* emacs-26.1-mac-7.2 (2018-09-09)

** Fixed bugs

*** Buffer contents are not displayed on macOS 10.14.
This is mainly because now NSViews are backed by Core Animation Layer
(layer-backed) by default and non-deferred drawing into views no
longer works.  Instead of switching to deferred drawing (i.e., draw
only inside -[NSView drawRect:]), we draw into our own backing bitmap
in a non-deferred way as before, and update the view contents with the
resulting image via -[NSView updateLayer].  This "application-side
double buffering" is also available on OS X 10.8 - macOS 10.13 if you
set the frame parameter `inhibit-double-buffering' to nil when
creating a frame.  Just like on macOS 10.14, such a frame does not do
LCD smoothing.

*** Screenshot grabbed via Services is displayed in wrong size when we
have display mirroring between Retina and non-Retina displays.

*** Cursor movement just after frame resize sometimes leaves garbage.

*** Crash by the Fall_threads call from the GUI thread at the select
emulation when there are multiple Lisp threads.

*** Info title has ASCII underline unlike other window systems.

*** Vertical scroll bar is created as horizontal if frame font height
is short.

** Improvements

*** macOS 10.14 adds property :appearance to (mac-application-state).
The value may be "NSAppearanceNameAqua" or "NSAppearanceNameDarkAqua".

*** Add new color format "mac:COLOR-LIST-NAME:COLOR-NAME" and
"mac:COLOR-NAME" (shorthand for "mac:System:COLOR-NAME").  The actual
color may be different depending on the global appearance setting on
macOS 10.14.  For example, "mac:textColor" is black on the Light Mode
but is white on the Dark Mode.

*** Default frame colors respect appearance setting on macOS 10.14.
Now the default frame foreground/background color is
"mac:textColor"/"mac:textBackgroundColor", respectively.  Changes of
the system setting of the global appearance are dynamically reflected.

*** New function `mac-color-list-alist' to get the available
combinations of COLOR-LIST-NAMEs and COLOR-NAMEs.  Note that this
value is dependent on user environment and OS version.  Also, some
combinations may represent image patterns rather than colors.  For the
former cases, `(color-values "mac:COLOR-LIST-NAME:COLOR-NAME")'
returns nil.
 2018-09-24 21:39:11 -05:00
Edward Tjörnhammar f9c4a74b73
jetbrains.pycharm-professional: 2018.2.3 -> 2018.2.4 2018-09-24 16:39:40 +02:00
Edward Tjörnhammar feb57bc9b9
jetbrains.pycharm-community: 2018.2.3 -> 2018.2.4 2018-09-24 16:39:11 +02:00
Edward Tjörnhammar 546dfb51a6
jetbrains.goland: 2018.2.2 -> 2018.2.3 2018-09-24 16:38:35 +02:00
Edmund Wu 4b1e3376d1 jetbrains.webstorm: 2018.2.2 -> 2018.2.3 2018-09-24 16:35:17 +02:00
Edmund Wu 9b69a2520a jetbrains.ruby-mine: 2018.2.1 -> 2018.2.2 2018-09-24 16:35:17 +02:00
Edmund Wu 88692dd376 jetbrains.rider: 2018.2 -> 2018.2.3 2018-09-24 16:35:17 +02:00
Edmund Wu 3bc77e5977 jetbrains.pycharm-professional: 2018.2.2 -> 2018.2.3 2018-09-24 16:35:17 +02:00
Edmund Wu b30e64bb8a jetbrains.pycharm-community: 2018.2.2 -> 2018.2.3 2018-09-24 16:35:17 +02:00
Edmund Wu 6f78c882da jetbrains.phpstorm: 2018.2.2 -> 2018.2.3 2018-09-24 16:35:17 +02:00
Edmund Wu 7ce6836e95 jetbrains.idea-ultimate: 2018.2.2 -> 2018.2.4 2018-09-24 16:35:17 +02:00
Edmund Wu e2ff1bceb3 jetbrains.idea-community: 2018.2.2 -> 2018.2.4 2018-09-24 16:35:17 +02:00
Edmund Wu 397215b8b6 jetbrains.goland: 2018.2.1 -> 2018.2.2 2018-09-24 16:35:17 +02:00
Edmund Wu 0174f259ac jetbrains.datagrip: 2018.2.2 -> 2018.2.4 2018-09-24 16:35:17 +02:00
Edmund Wu 98fe28e5ab jetbrains.clion: 2018.2.2 -> 2018.2.4 2018-09-24 16:35:17 +02:00
Michael Weiss 1357f6492c androidStudioPackages.{dev,canary}: 3.3.0.9 -> 3.3.0.10 2018-09-22 15:27:42 +02:00
Jan Tojnar d1b6cb7e6e
Merge pull request #46594 from worldofpeace/gnome-builder/ctags 
gnome-builder: add ctags
 2018-09-17 01:03:01 +02:00
Thomas Tuegel bd3e3d8a18
elpa-packages: 2018-09-15 2018-09-15 14:43:56 -05:00
Thomas Tuegel e68f1b3aba
org-packages: 2018-09-15 2018-09-15 14:40:41 -05:00
Thomas Tuegel 4a2e7f3119
melpa-stable-packages: 2018-09-15 2018-09-15 14:39:38 -05:00
Thomas Tuegel 851da08dd9
melpa-packages: 2018-09-15 2018-09-15 14:39:27 -05:00
R. RyanTM 76051c1ef6 neovim-qt: 0.2.9 -> 0.2.10 (#46234) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
neovim-qt
 2018-09-15 17:19:19 +02:00
R. RyanTM 6fcbae1e9c vim: 8.1.0146 -> 8.1.0348 (#46181) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
vim
 2018-09-15 17:02:58 +02:00
Jan Tojnar b3d079f34a
Merge pull request #46365 from worldofpeace/elementary-variety 
add various elementary thirdparty applications
 2018-09-14 02:17:26 +02:00
xeji eb88142c4b
leo-editor: 5.6 -> 5.7.3, fix build (#46589) 
Previous version depended on qt56.qtwebengine which was broken.
 2018-09-13 12:17:45 +02:00
worldofpeace 73e468005b gnome-builder: add ctags 2018-09-13 03:27:08 -04:00
R. RyanTM 64ab031a57 focuswriter: 1.6.15 -> 1.6.16 (#46286) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/focuswriter/versions
 2018-09-12 23:11:11 +02:00
Michael Weiss 0fe81b0d54 androidStudioPackages.{dev,canary}: 3.3.0.7 -> 3.3.0.9 2018-09-12 20:38:27 +02:00
Matthew Bauer a03f07e18b
Merge pull request #45632 from leenaars/thonny2 
thonny: init at 3.0.0b3
 2018-09-10 15:04:30 -05:00
Matthew Bauer f45fe1f17e
Merge pull request #45988 from thefloweringash/emacs-darwin-cli 
emacs: allow X and cli-only builds on Darwin
 2018-09-10 14:54:50 -05:00
Michael Weiss fe1d9edfa7 androidStudioPackages.beta: 3.2.0.24 -> 3.2.0.25 2018-09-10 19:59:55 +02:00
Timo Kaufmann cb7c04f53c
Merge pull request #46444 from etu/upgrade-nano 
nano: 2.9.8 -> 3.0
 2018-09-10 12:26:45 +02:00
Andrew Childs bbf37b8c45 emacs: allow X and cli-only builds on Darwin 2018-09-10 12:20:23 +09:00
Orivej Desh 78bc2f9800 aseprite-unfree: 1.2.4 -> 1.2.9 2018-09-10 03:01:36 +00:00
worldofpeace 0f760506be quilter: init at 1.6.3 2018-09-09 18:34:30 -04:00
Elis Hirwing b47c5870f4
nano: 2.9.8 -> 3.0 
Changelog: http://lists.gnu.org/archive/html/info-nano/2018-09/msg00000.html

Also updated the nix highlighting for nano
 2018-09-09 23:16:07 +02:00
Tim Steinbach bd55a78f6d nanorc: Init at 2018-09-05 2018-09-07 21:11:26 -04:00
Peter Hoeg 033964f541
Merge pull request #46221 from r-ryantm/auto-update/okteta 
kdeApplications.okteta: 0.25.2 -> 0.25.3
 2018-09-07 10:55:40 +08:00
R. RyanTM e5b17f61ef rednotebook: 2.3 -> 2.6.1 (#46200) 2018-09-06 23:57:44 +00:00
R. RyanTM b710f4a85c kdeApplications.okteta: 0.25.2 -> 0.25.3 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
okteta
 2018-09-06 15:41:10 -07:00
Jörg Thalheim ca2ba44cab
Merge pull request #46123 from utdemir/kakoune-20180904 
kakoune: 2018.08.05 -> 2018.09.04
 2018-09-05 23:55:55 +01:00
Utku Demir c90f96ad32
kakoune: 2018.08.05 -> 2018.09.04 2018-09-06 09:12:12 +12:00
John Ericson 5d2d80d1cf
Merge pull request #46104 from obsidiansystems/trace-to-warn 
stdenv, neovim: Use `lib.warn` for deprecation warnings
 2018-09-05 11:54:35 -04:00
John Ericson 51907d257c stdenv, neovim: Use lib.warn for deprecation warnings 2018-09-05 11:40:29 -04:00
Jan Tojnar 58a3726252
gnome-builder: add python3 for install script 
Meson no longer propagates it so we need to re-add it.
 2018-09-04 03:23:41 +02:00
Daniël de Kok 9d6ff38f70 magit-todos: fix build by providing git as input. (#45999) 
magit-todos requires git during builds. Fixes #45868.
 2018-09-03 23:42:57 +02:00
Michiel Leenaars bfb14fbe72 thonny: init at 3.0.0b3 2018-09-03 23:40:34 +02:00
Michael Weiss 85e46d12b3 android-studio: Refactor the code & minor improvements 2018-09-02 18:45:40 +02:00
Michael Weiss 044c16a978
Merge pull request #45853 from bkchr/android_studio_desktop 
android-studio: Add desktop item
 2018-09-02 16:27:46 +02:00
Markus Kowalewski ebc1854726
flpsed: fix homepage 2018-09-02 00:04:23 +02:00
Bastian Köcher 6d28393eb1 android-studio: Add desktop item 2018-08-31 12:05:24 +02:00
John Ericson 0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff 
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
 2018-08-30 17:20:32 -04:00
John Ericson 2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system 
It is deprecated and will be removed after 18.09.
 2018-08-30 17:20:32 -04:00
Simon Lackerbauer 3f61866ea6 rstudio: 1.1.442 -> 1.1.456 (#45781) 2018-08-30 16:56:04 +02:00
Jörg Thalheim 663951eaa3
Merge pull request #43388 from symphorien/neovim-python-env 
Fix neovim PYTHONPATH handling
 2018-08-30 08:51:21 +01:00
Michael Weiss 364c5047bc androidStudioPackages.{dev,canary}: 3.3.0.6 -> 3.3.0.7 2018-08-29 19:53:59 +02:00
Jörg Thalheim cbdcf6b4db vanubi: remove 2018-08-29 11:39:28 +01:00
Patrick Hilhorst 7a3f62fa0b
atom, atom-beta: 1.29.0 -> 1.30.0, 1.30.0-beta1 -> 1.31.0-beta0 2018-08-29 09:06:30 +02:00
Jörg Thalheim bc09c14519
Merge pull request #45712 from seitz/master 
nano: updated 'nixSyntaxHighlight'
 2018-08-28 21:19:25 +01:00
Daiderd Jordan c66c469433
Merge pull request #45352 from LnL7/darwin-vim-x11 
vim_configurable: fix darwin build with guiSupport
 2018-08-28 21:14:22 +02:00
Paul Seitz 9b30f32478 nano: updated 'nixSyntaxHighlight' 2018-08-28 17:00:09 +00:00
Will Dietz 6cf92400b2 micro: 1.4.0 -> 1.4.1 2018-08-28 07:59:13 -05:00
Michael Raskin 083220867c Improve re-wrapping in case of GTK3 2018-08-28 13:32:55 +03:00
Augustin Borsu 359368f76f jupyter: init 
Top-level jupyter package that, given kernel definitions, can be used with
various kernels.
 2018-08-26 12:00:54 +02:00
Augustin Borsu 16f4076c70 jupyter-kernel: init 
This is a meta package for creating a jupyter notebook
kernel definition folder. It must be used in conjunction
with jupyter or jupyterhub to make different environements
availables.
 2018-08-26 12:00:54 +02:00
Thomas Tuegel b55e3f6449
Merge pull request #45376 from bkchr/kde_applications_18_08_0 
kde-applications: 18.04.03 -> 18.08.0
 2018-08-25 08:49:20 -05:00
Michael Weiss f0f94aaad0 androidStudioPackages.beta: 3.2.0.23 -> 3.2.0.24 2018-08-25 15:38:06 +02:00
Bastian Köcher 7229b8db08 kdevelop: 5.1.2 -> 5.2.4 2018-08-24 17:35:58 +02:00
Michael Weiss 27bdee9847 androidStudioPackages.beta: 3.2.0.22 -> 3.2.0.23 2018-08-24 15:48:52 +02:00
Michael Weiss 7fd5afebfe androidStudioPackages.{dev,canary}: 3.3.0.5 -> 3.3.0.6 2018-08-24 15:48:52 +02:00
Jörg Thalheim 93d9a66f1a
Merge pull request #45553 from r-ryantm/auto-update/neovim-qt 
neovim-qt: 0.2.8 -> 0.2.9
 2018-08-24 09:46:56 +01:00
R. RyanTM 9dfb851c6f neovim-qt: 0.2.8 -> 0.2.9 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/neovim-qt/versions.
 2018-08-24 00:21:53 -07:00
Daiderd Jordan cfc3d7c918
vim_configurable: use gtk3 on darwin 2018-08-24 00:38:12 +02:00
Herman Fries 8db26ed5b5 webstorm: 2018.2.1 -> 2018.2.2 2018-08-23 18:05:03 +02:00
Herman Fries e1147d90a7 rider: 2018.1.3 -> 2018.2 2018-08-23 18:04:26 +02:00
Herman Fries a4275efede pycharm-professional: 2018.2.1 -> 2018.2.2 2018-08-23 18:03:30 +02:00
Herman Fries b40cdd0a77 pycharm-community: 2018.2.1 -> 2018.2.2 2018-08-23 18:02:44 +02:00
Herman Fries e05e2c5d10 phpstorm: 2018.2.1 -> 2018.2.2 2018-08-23 18:02:08 +02:00
Herman Fries 0d763c9f3e idea-ultimate: 2018.2.1 -> 2018.2.2 2018-08-23 18:01:11 +02:00
Herman Fries 3a57481654 idea-community: 2018.2.1 -> 2018.2.2 2018-08-23 18:00:35 +02:00
Herman Fries e64831c79f datagrip: 2018.2.1 -> 2018.2.2 2018-08-23 17:59:57 +02:00
Herman Fries ce19fc55ab clion: 2018.2.1 -> 2018.2.2 2018-08-23 17:59:18 +02:00
xeji 54ff14b6f3
Merge pull request #45399 from markuskowa/license-8 
Add licenses
 2018-08-21 12:05:10 +02:00
Benjamin Staffin 23340918d9
vdiff-magit: Include git in nativeBuildInputs (#45314) 
Like magit, vdiff-magit expects git to be present at install time.
 2018-08-20 21:23:54 -04:00
Markus Kowalewski 24513e08d7
geany: fix license 
geany-with-vte:  inherit meta data from geany
 2018-08-20 19:35:29 +02:00
Peter Hoeg 5a3f063ebc
Merge pull request #45362 from peterhoeg/u/okteta 
okteta: 17.12.3 -> 0.25.2
 2018-08-20 14:15:23 +08:00
Peter Hoeg c19cceca1c okteta: 17.12.3 -> 0.25.2 2018-08-20 10:08:46 +08:00
Daiderd Jordan e2ef327652
vim_configurable: disable darwinSupport by default 
Using gtk + darwin support seems broken at the moment, we probably want
guiSupport = "carbon" instead but that doesn't work and something like
macvim is probably better for that.  This fixes the build while keeping
guiSupport enabled which might be desirable for eg. +clientserver.

Fixes #45025
 2018-08-19 21:52:51 +02:00
Daiderd Jordan 8a6064a526
vim_configurable: make gtk optional 
Using vim_configurable.override { guiSupport = "no"; } would still pull
in gtk2 as a dependency.
 2018-08-19 21:41:15 +02:00
Daiderd Jordan a50807e1b8
vim_configurable: fix lua reference 2018-08-19 21:39:10 +02:00
Andrew Childs 3f0fa8fd77 neovim-qt: fix msgpack dependency, disable failing test, Darwin 2018-08-20 01:07:57 +09:00
Orivej Desh 65663f883c msgpack: rename from libmsgpack 
The project does not use the name "libmsgpack". It variously uses "msgpack" and
"msgpack-c", and "msgpackc" for the name of the library.
 2018-08-18 23:19:54 +00:00
Jörg Thalheim 6faae709e4
Merge pull request #45289 from Chiiruno/dev/vscode 
vscode: Wrap with GAppsHook
 2018-08-18 17:56:50 +01:00
Okina Matara 8f8de78013 vscode: Wrap with GAppsHook, remove makeWrapper 2018-08-18 11:40:33 -05:00
Michael Weiss 6bc625ada9 androidStudioPackages.{dev,canary}: 3.3.0.4 -> 3.3.0.5 2018-08-18 14:18:06 +02:00
Gabriel Ebner 848111e42b vscode: 1.26.0 -> 1.26.1 2018-08-17 20:57:03 +02:00
Vladimír Čunát 209730208a
Merge branch 'staging-next' 2018-08-17 20:51:31 +02:00
Vladimír Čunát cbabebcc2e
Merge branch 'master' into staging-next 
Hydra: ?compare=1473892
 2018-08-17 13:45:21 +02:00
Jörg Thalheim 046ff920ea
Merge pull request #45231 from r-ryantm/auto-update/ghostwriter 
ghostwriter: 1.7.2 -> 1.7.3
 2018-08-17 11:54:52 +01:00
R. RyanTM 16e3728e4d ghostwriter: 1.7.2 -> 1.7.3 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ghostwriter/versions.
 2018-08-17 03:02:36 -07:00
Herwig Hochleitner ea5bcb78c2 emacs: update dependencies 
new config options, xwidgets support updated in emacs 26

cc @chaoflow @lovek323 @peti @the-kenny @jwiegley
 2018-08-16 09:38:55 +02:00
Gabriel Ebner 9c4018302a
Merge pull request #45029 from rawkode/feature/upgrade-vscode 
Update vscode from 1.15.1 -> 1.26.0
 2018-08-14 19:43:15 +02:00
David McKay 82f651b977
vscode: 1.25.1 -> 1.26.0 2018-08-14 17:02:35 +01:00
Vladimír Čunát 5b0398dc36
Merge branch 'master' into staging-next 
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
 2018-08-13 20:43:59 +02:00
Samuel Dionne-Riel bd77c653a7
Merge pull request #44686 from r-ryantm/auto-update/sigil 
sigil: 0.9.9 -> 0.9.10
 2018-08-12 20:46:22 -04:00
Jan Tojnar f496d26247
Merge pull request #44651 from jtojnar/gobby 
gobby5: fix build
 2018-08-12 17:25:07 +02:00
Vladimír Čunát 00df25ee57
Merge branch 'master' into staging-next 
Hydra: ?compare=1472947
 2018-08-12 10:33:41 +02:00
Pascal Wittmann a34579e01e
Merge branch 'master' into add-missing-licenses 
Conflicts:
	pkgs/tools/networking/network-manager/fortisslvpn.nix
 2018-08-11 09:36:34 +02:00
Michael Raskin 40dea2488f vim_configurable: make gvim command launch GUI again 2018-08-11 10:25:21 +03:00
Andrew Childs 3513c5dc49 jetbrains.ruby-mine: 2018.2 -> 2018.2.1 2018-08-11 04:05:21 +09:00
Andrew Childs c08067b74d jetbrains.goland: 2018.2 -> 2018.2.1 2018-08-11 04:03:49 +09:00
Frederik Rietdijk d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
Andrew Childs b1dc1f95b7 jetbrains.webstorm: 2018.2 -> 2018.2.1 2018-08-09 23:23:44 +09:00
Andrew Childs 23831c50bf jetbrains.pycharm-professional: 2018.2 -> 2018.2.1 2018-08-09 23:23:35 +09:00
Andrew Childs d76c046b6f jetbrains.pycharm-community: 2018.2 -> 2018.2.1 2018-08-09 23:23:24 +09:00
Andrew Childs db427ff1f5 jetbrains.phpstorm: 2018.2 -> 2018.2.1 2018-08-09 23:22:53 +09:00
Andrew Childs 6c8bec9e13 jetbrains.idea-ultimate: 2018.2 -> 2018.2.1 2018-08-09 23:22:32 +09:00
Andrew Childs 9d942c7367 jetbrains.idea-community: 2018.2 -> 2018.2.1 2018-08-09 23:22:16 +09:00
Andrew Childs a57a0296d7 jetbrains.datagrip: 2018.2 -> 2018.2.1 2018-08-09 23:21:50 +09:00
Andrew Childs 52b9d0a3e8 jetbrains.clion: 2018.2 -> 2018.2.1 2018-08-09 23:21:11 +09:00
Pascal Wittmann af8cd3c74e
Merge branch 'master' into add-missing-licenses 
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
 2018-08-09 13:10:27 +02:00
8573 6b486cf947 vim_configurable: Add wrapGAppsHook for GTK 3 (#44645) 
As suggested by @jtojnar in GitHub issue #44580, this patch adds the
package `wrapGAppsHook` to the dependencies (specifically, the
`nativeBuildInputs`) of `vim_configurable`, when `vim_configurable` is
built against GTK 3.

This change prevents GVim from crashing if one tries to use its
file-choosing dialog, and fixes a warning that otherwise might be
emitted if one tries to use its find/replace dialog.
 2018-08-09 11:11:24 +02:00
Utku Demir 1f00380cfa kakoune: 2018-05-21 -> 2018-08-05 (#44706) 2018-08-09 00:28:19 +02:00
R. RyanTM b0f70f1709 sigil: 0.9.9 -> 0.9.10 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sigil/versions.
 2018-08-08 01:27:35 -07:00
Jan Tojnar 59a2753e9e
gobby5: 0.5.0 → unstable-2018-04-03 
fix build
 2018-08-08 03:01:44 +02:00
Michael Weiss 57a429d0dc androidStudioPackages.{dev,canary}: 3.3.0.3 -> 3.3.0.4 2018-08-07 20:02:16 +02:00
Michael Weiss bd012413e4 android-studio: 3.1.3.0 -> 3.1.4.0 2018-08-07 11:07:18 +02:00
Jörg Thalheim 3a609282a7
Merge pull request #44569 from xeji/p/drop-vimNox 
vimNox: drop
 2018-08-07 01:26:47 +01:00
Uli Baum 9f96ec8b03 vimNox: drop 
not updated since 2012, see #40876
 2018-08-06 21:36:00 +02:00
Peter Simons 37adba4045
Merge pull request #44543 from peterhoeg/u/emacs 
emacs: make a number of melpa packages work again
 2018-08-06 17:39:09 +02:00
Pascal Wittmann 351ee40066
nedit: add license 
see issue #43716
 2018-08-06 12:38:10 +02:00
Peter Hoeg 9823e4caa7 emacs-magit-annex: git was missing 2018-08-06 17:09:26 +08:00
Jörg Thalheim bb76f9a210 atom: gtk3 should be in buildInputs 2018-08-05 15:35:35 +01:00
Yannik Sander 57d5e2b20d atom: fix crash on Glib-GIO-ERROR 
include gtk3 to fix atom's path such that file open dialogs wont cause atom to crash due to missing GIO files
 2018-08-05 15:30:30 +01:00
Tuomas Tynkkynen 008fd5fcf5 Merge remote-tracking branch 'upstream/master' into staging 2018-08-04 15:17:42 +03:00
John Ericson db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
John Ericson 85a9913edd treewide: Make more complicated configureFlags lists 2018-08-03 17:06:03 -04:00
John Ericson e8a291ff61 gobby: Remove empty configure flags 2018-08-03 16:06:43 -04:00
Michael Weiss 6cf519df6e androidStudioPackages.{dev,canary}: 3.3.0.2 -> 3.3.0.3 2018-08-03 13:31:00 +02:00
Vladimír Čunát 86b5b1e174
Revert "android-studio-preview: Print a deprecation warning" 
This reverts commit 88bfbf6c7d.
It broke the tarball job.  Discussion:
https://github.com/NixOS/nixpkgs/pull/44310#issuecomment-409690460
 2018-08-02 16:32:55 +02:00
Peter Hoeg 9ddd60138c emacs-php-auto-yasnippets: fix HOME 2018-08-02 16:04:57 +08:00
Peter Hoeg 5867097d1f emacs-connection: upstream is OK again 2018-08-02 13:48:51 +08:00
Peter Hoeg 0de9d840ab emacs-dictionary: upstream is OK again 2018-08-02 13:48:37 +08:00
Peter Hoeg bcbfed377e emacs-link: upstream is OK again 2018-08-02 13:48:24 +08:00
Peter Hoeg b1914088e1 emacs-powershell: upstream is OK again 2018-08-02 13:47:33 +08:00
Peter Hoeg 667938468b emacs-magit-gitflow: git was missing 2018-08-02 13:47:12 +08:00
Peter Hoeg fe6313da30 emacs-insert-shebang: fix compilation 2018-08-02 13:46:43 +08:00
Peter Hoeg 64c0d50fc3 emacs-evil-search-highlight-persist: add dependencies 2018-08-02 13:46:21 +08:00
Peter Hoeg 66d16a5409 emacs-evil-magit: needs git 2018-08-02 13:46:07 +08:00
Peter Hoeg d172d404e9 emacs-cmake: upstream is OK again 2018-08-02 13:45:45 +08:00
Jan Tojnar 0a12371dfb
https://gitlab.gnome.org/GNOME/gnome-keyring/issues/1 2018-08-02 00:32:51 +02:00
Jamey Sharp f2434d1208 gnome-builder: fix whitespace 2018-08-01 13:12:54 -07:00
Michael Weiss 8aa04df600
Merge pull request #44310 from primeos/android-studio-improvements 
Android Studio improvements
 2018-08-01 20:24:03 +02:00
Michael Weiss 88bfbf6c7d android-studio-preview: Print a deprecation warning 
Hope this is ok... :)
 2018-08-01 19:47:36 +02:00
Michael Weiss d8b44edd8f androidStudioPackages: Use more intuitive names for the derivations 2018-08-01 19:47:36 +02:00
Michael Weiss 31583d7cb6 androidStudioPackages: Refactor the code 2018-08-01 19:47:36 +02:00
Patrick Hilhorst e616563433 atom, atom-beta: 1.28.2 -> 1.29.0, refactored build script (#44297) 
atom-beta: 1.29.0-beta1 -> 1.30.0-beta1

The beta version jump seems like an irregular update, but 1.30.0-beta0
was retired rougly 3 hours after release due to an macOS error:

> Fixed an error about a missing string_decoder module when the Git pane
> is displayed on macOS.

This shouldn't affect the Linux x86_64 version, but latest versions are
always nice.

Also refactored the build script, it now takes the version number as
an extra (optional) argument and creates the version number from that.

Also removed `rec` from the main set because it was no longer needed.
 2018-08-01 11:30:10 +02:00
Jamey Sharp e6bcb54539 gnome-builder: add a long description 
Including a comment about the need for additional runtime dependencies.
 2018-07-31 22:46:47 -07:00
Jamey Sharp 499ca65930 gnome-builder: document why tests and clang are disabled 2018-07-31 21:51:11 -07:00
Jamey Sharp 4ab66373f0 gnome-builder: remove no-longer-used patches 
Whoops!
 2018-07-31 21:50:52 -07:00
Jamey Sharp e0180052a7 gnome-builder: split devdoc to a separate output 2018-07-31 17:04:03 -07:00
Jamey Sharp 63445d0120 gnome-builder: use fetchpatch for upstream patches 
These patches were merged to master so we can fetch them from the GNOME
GitLab instance now.
 2018-07-31 17:03:08 -07:00
Michael Weiss d817ccbf83 androidStudioPackages.beta: 3.2.0.21 -> 3.2.0.22 2018-07-31 21:29:31 +02:00
Jan Tojnar 8fe7dd59a3
gnome-latex: 3.28.1 → 3.30.1 2018-07-31 11:37:56 +02:00
Robert Schütz 55b41a7e33 ghostwriter: 1.7.0 -> 1.7.2 2018-07-31 08:45:17 +02:00
Jamey Sharp 3a64f5790e gnome-builder: ensure gtkdoc can find docbook DTDs 2018-07-30 23:05:11 -07:00
Jamey Sharp e32a5dafaf gnome-builder: include developer docs in $out 2018-07-30 21:43:12 -07:00
Jamey Sharp 6ae9723cfb gnome-builder: enable docs, fix typos. 
I also tried turning on the tests, but they don't work and I don't
understand why not.
 2018-07-30 17:34:30 -07:00
Jamey Sharp 7bd3ca49bc gnome-builder: address review from @jtojnar/#44217 2018-07-30 15:20:45 -07:00
Jamey Sharp 126f205752 gnome-builder: init at 3.28.4 2018-07-30 12:09:03 -07:00
Jiri Danek 35e6e9282c jetbrains.ruby-mine: 2018.1.4 -> 2018.2 2018-07-29 16:46:22 +02:00
Jiri Danek 4172475f5f jetbrains.phpstorm: 2018.1.6 -> 2018.2 2018-07-29 16:45:39 +02:00
Jiri Danek d3a94427f5 jetbrains.datagrip: 2018.1.5 -> 2018.2 2018-07-29 16:44:33 +02:00
Jiri Danek 435e663eae jetbrains.clion: fix paths to patched binaries and fix gdb binary 2018-07-28 21:38:10 +02:00
Jiri Danek 47eb7ecd76 jetbrains.goland: 2018.1.5 -> 2018.2 2018-07-28 21:38:10 +02:00
Averell Dalton 7932d521bf jetbrains.rider: 2018.1.2 -> 2018.1.3 2018-07-28 21:38:10 +02:00
Averell Dalton 92da0cc767 jetbrains.pycharm-professional: 2018.1.4 -> 2018.2 2018-07-28 21:38:10 +02:00
Averell Dalton df169bfe90 jetbrains.pycharm-community: 2018.1.4 -> 2018.2 2018-07-28 21:38:10 +02:00
Averell Dalton 57cde57b01 jetbrains.idea-ultimate: 2018.1.6 -> 2018.2 2018-07-28 21:38:10 +02:00
Averell Dalton ba83cd406b jetbrains.idea-community: 2018.1.6 -> 2018.2 2018-07-28 21:38:10 +02:00
Averell Dalton 93dc95d68a jetbrains.clion: 2018.1.6 -> 2018.2 2018-07-28 21:38:10 +02:00
Averell Dalton 9181456576 jetbrains.webstorm: 2018.1.5 -> 2018.2 2018-07-28 21:38:10 +02:00
Averell Dalton e8a15d070f jetbrains.ruby-mine: 2018.1.3 -> 2018.1.4 2018-07-28 21:38:10 +02:00
Averell Dalton 8b80a9481e jetbrains.idea-ultimate: 2018.1.5 -> 2018.1.6 2018-07-28 21:38:10 +02:00
Averell Dalton 47c2046f90 jetbrains.idea-community: 2018.1.5 -> 2018.1.6 2018-07-28 21:38:10 +02:00
Averell Dalton e9d12e649f jetbrains.goland: 2018.1.4 -> 2018.1.5 2018-07-28 21:38:10 +02:00
Averell Dalton 8d621910f5 jetbrains.datagrip: 2018.1.4 -> 2018.1.5 2018-07-28 21:38:10 +02:00
Averell Dalton 07348da4d7 jetbrains.clion: 2018.1.5 -> 2018.1.6 2018-07-28 21:38:10 +02:00
Daiderd Jordan 5b211b6f4c
vim-configurable: fix python support 
Removed --enable-python since that doesn't seem to do anything.
 2018-07-28 11:30:46 +02:00
Symphorien Gibol dddaa94ac2 neovim wrapper: also make <vimplugin>.pythonDepedencies a function 
A function of the same signature as the argument of python.withPackages
 2018-07-27 00:27:44 +02:00
Thomas Tuegel 4f5837668b
hindent: build Emacs package with latest Melpa recipe 
The hindent Emacs package is built with the latest Melpa recipe, but the same
source version as in haskellPackages.
 2018-07-26 15:36:43 -05:00
Robert Helgesson a01a52a2d7
eclipse-plugin-spotbugs: 3.1.5 -> 3.1.6 2018-07-26 15:43:59 +02:00
Frederik Rietdijk ea91420675
Merge pull request #43886 from FRidh/vim 
qvim, vim_configurable: get rid of composableDerivation
 2018-07-26 11:42:40 +02:00
Frederik Rietdijk 099c13da1b Merge staging-next into master (#44009) 
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.

* libffi: simplify using `checkInputs`

* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix

* utillinux: 2.32 -> 2.32.1

https://lkml.org/lkml/2018/7/16/532

* busybox: 1.29.0 -> 1.29.1

* bind: 9.12.1-P2 -> 9.12.2

https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html

* curl: 7.60.0 -> 7.61.0

* gvfs: make tests run, but disable

* ilmbase: disable tests on i686. Spooky!

* mdds: fix tests

* git: disable checks as tests are run in installcheck

* ruby: disable tests

* libcommuni: disable checks as tests are run in installcheck

* librdf: make tests run, but disable

* neon, neon_0_29: make tests run, but disable

* pciutils: 3.6.0 -> 3.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.

* mesa: more include fixes

mostly from void-linux (thanks!)

* npth: 1.5 -> 1.6

minor bump

* boost167: Add lockfree next_prior patch

* stdenv: cleanup darwin bootstrapping

Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.

* Revert "pciutils: use standardized equivalent for canonicalize_file_name"

This reverts commit f8db20fb3a.
Patching should no longer be needed with 3.6.1.

* binutils-wrapper: Try to avoid adding unnecessary -L flags

(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>

* libffi: don't check on darwin

libffi usages in stdenv broken darwin. We need to disable doCheck for that case.

* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook

* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273

When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.

* parity-ui: fix after merge

* python.pkgs.pytest-flake8: disable test, fix build

* Revert "meson: 0.46.1 -> 0.47.0"

With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.

When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.

Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.

I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)

This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.

--

Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).

Fixes #43650.

This reverts commit 305ac4dade.

(cherry picked from commit 273d68eff8)
Signed-off-by: Domen Kožar <domen@dev.si>
 2018-07-24 15:04:48 +01:00
Symphorien Gibol c1752666df neovim wrapper: use python.withPackages instead of python.buildEnv 
They are both as powerful, but buildEnv is treacherous: if you pass a
package which depends on another python (for example the one of unstable
when you are on stable) it will be *silently* dropped, leading to hair
pulling.

Use case:
override neovim from unstable, but still keep stable's pythonPackages.
 2018-07-24 15:05:50 +02:00
Symphorien Gibol 10436a707a neovim wrapper: do not unset PYTHONPATH 
This solves the following bug:
opening neovim in nix-shell -p pythonPackages.numpy does not enable to
run successfully
:!python -c "import numpy"
because the PYTHONPATH is wiped by the neovim wrapper.

This wiping is necessary for the python providers, though, otherwise a
python2 nix-shell will make the python3 provider read python2 files.

We wrap the providers only, instead of neovim as whole.
 2018-07-24 15:02:48 +02:00
Jörg Thalheim 1ebf90b9fb
Merge pull request #44043 from ljli/vscode-fix 
vscode: fix keymapping.node rpath
 2018-07-24 05:54:53 -04:00
Leon Isenberg 6bf5dfc874 vscode: fix keymapping.node rpath 2018-07-24 03:04:36 +02:00
Thomas Tuegel 0015c34f9c
Merge pull request #44007 from ttuegel/emacs-packages-2018-07-22 
Emacs package updates
 2018-07-23 08:35:11 -05:00
Thomas Tuegel 648911fee3
melpa-packages: Fix evaluation 2018-07-23 06:51:51 -05:00
Thomas Tuegel 095e2f961f
elpa-packages: Fix evaluation 2018-07-23 06:51:51 -05:00
Thomas Tuegel a0762a4eee
org-packages: 2018-07-22 2018-07-23 06:51:51 -05:00
Thomas Tuegel 56df454a07
elpa-packages: 2018-07-22 2018-07-23 06:51:51 -05:00
Thomas Tuegel 8ecdc02f95
melpa-stable-packages: 2018-07-22 2018-07-23 06:51:51 -05:00
Thomas Tuegel 707010ef23
melpa-packages: 2018-07-22 2018-07-23 06:51:51 -05:00
Jörg Thalheim 102eb1fd29
Merge pull request #43995 from kalbasit/fix-neovim-unwrapped 
neovim: fix the xsel path in the clipboard runtime provider
 2018-07-23 10:52:34 +01:00
adisbladis 607ae1df1b
emacsPackagesNg.elpaPackages: Don't pass fetchurl to elpa.nix 
This fixes evaluation error of elpa packages.
 2018-07-23 15:38:20 +08:00
Wael M. Nasreddine 5c7c2be709 neovim: fix the xsel path in the clipboard runtime provider 2018-07-22 21:32:16 -07:00
Frederik Rietdijk 6c72782d36 Merge staging-next into master 2018-07-22 11:04:28 +02:00
Frederik Rietdijk e3d4ef9c7e
Merge pull request #43925 from r-ryantm/auto-update/neovim-unwrapped 
neovim-unwrapped: 0.3.0 -> 0.3.1
 2018-07-22 08:37:44 +02:00
Frederik Rietdijk e4dab5a3da
Merge pull request #43943 from r-ryantm/auto-update/focuswriter 
focuswriter: 1.6.14 -> 1.6.15
 2018-07-22 08:22:46 +02:00
R. RyanTM 7968bf4935 focuswriter: 1.6.14 -> 1.6.15 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/focuswriter/versions.
 2018-07-21 18:56:13 -07:00
R. RyanTM 4c1eb7fbe6 neovim-unwrapped: 0.3.0 -> 0.3.1 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/neovim-unwrapped/versions.
 2018-07-21 14:18:00 -07:00
Jörg Thalheim 5e05b0a105
Merge pull request #43901 from periklis/orgit-fix-inputs 
orgit: add git to native build inputs
 2018-07-21 19:05:46 +01:00
Frederik Rietdijk ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02:00
Frederik Rietdijk 1c45f35bfd
Merge pull request #43902 from r-ryantm/auto-update/tiled 
tiled: 1.1.5 -> 1.1.6
 2018-07-21 19:40:53 +02:00
R. RyanTM 83cfb08654 tiled: 1.1.5 -> 1.1.6 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tiled/versions.
 2018-07-21 08:55:50 -07:00
Periklis Tsirakidis 2bf47aa2b8 orgit: add git to native build inputs 2018-07-21 17:45:08 +02:00
Frederik Rietdijk 9cb1e7a1f3 qvim: get rid of composableDerivation 
Use `stdenv.mkDerivation` directly instead of `composableDerivation`.

Some configure flags may have changed as the conversion wasn't exactly
straightforward.
 2018-07-21 16:52:30 +02:00
Jörg Thalheim 218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
Frederik Rietdijk 539f4f644a vim_configurable: get rid of composableDerivation 
Use `stdenv.mkDerivation` directly instead of `composableDerivation`.

Some configure flags may have changed as the conversion wasn't exactly
straightforward.
 2018-07-21 13:48:19 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth dda95bae35 [bot] treewide: remove unused 'args@' in lambdas 2018-07-20 19:54:05 +00:00
Frederik Rietdijk 1a6af9f88e
Merge pull request #43857 from volth/unused 
[bot] treewide: remove unreferenced code
 2018-07-20 21:06:32 +02:00
volth 87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Tim Steinbach 871f3396a5
vscode: 1.25.0 -> 1.25.1 2018-07-20 08:22:03 -04:00
Frederik Rietdijk 8213ff161c Merge master into staging-next 2018-07-19 18:24:24 +02:00
R. RyanTM 80d44926bf atom: 1.28.1 -> 1.28.2 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/atom/versions.
 2018-07-19 12:23:36 +00:00
Matthew Bauer 76999cc40e treewide: remove aliases in nixpkgs 
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
 2018-07-18 23:25:20 -04:00
Thomas Tuegel 9cfbef8bf2
Merge pull request #43609 from ttuegel/emacs-packages-2018-07-14 
Emacs package updates
 2018-07-17 17:53:54 -05:00
Michael Weiss bf23666022 androidStudioPackages.beta: 3.2.0.20 -> 3.2.0.21 2018-07-17 20:06:20 +02:00
Thomas Tuegel a5f026f778
emacsPackagesNg.magit: find Git during build 2018-07-16 12:29:10 -05:00
Thomas Tuegel d3cea48608
emacsPackagesNg: 2018-07-15 update 
All package sets are simultaneously updated to accommodate changes to
package-build. Due to new restrictions in package-build, all packages using
`melpaBuild` must now provide a recipe file, even those packages which are not
included in upstream MELPA.
 2018-07-15 20:52:41 -05:00
Robert Schütz 18774d4173 Merge branch 'master' into staging 2018-07-15 12:31:18 +02:00
Benjamin Andresen b07deda268 emacsPackages.cask: 0.8.1 -> 0.8.4 2018-07-14 14:07:23 +02:00
Frederik Rietdijk 3e31d23d99 Merge master into staging 2018-07-13 19:34:19 +02:00
Michael Weiss 33719a9108 androidStudioPackages.{dev,canary}: 3.3.0.1 -> 3.3.0.2 2018-07-13 16:09:04 +02:00
Michael Weiss 67a4ac8f90 androidStudioPackages.beta: 3.2.0.19 -> 3.2.0.20 2018-07-13 16:04:13 +02:00
Frederik Rietdijk f8701caafc Merge master into staging 2018-07-10 15:51:20 +02:00