about summary refs log tree commit diff
path: root/pkgs/applications/editors
Commit message (Expand)AuthorAge
* Merge branch 'master' into staging-nextVladimír Čunát2019-07-15
|\
| * quilter: 1.9.1 -> 1.9.2worldofpeace2019-07-13
| * jetbrains update via update.pljoncojonathan2019-07-13
* | Merge master into staging-nextFrederik Rietdijk2019-07-13
|\|
| * Merge pull request #64572 from eadwu/vscode/1.36.1worldofpeace2019-07-11
| |\
| | * vscodium: 1.36.0 -> 1.36.1Edmund Wu2019-07-10
| | * vscode: 1.36.0 -> 1.36.1Edmund Wu2019-07-10
| * | jupyter-kernel: remove traceValFrederik Rietdijk2019-07-11
| * | Add optional Jupyter kernelspec options from the spec (#55989)Tom McLaughlin2019-07-11
* | | Merge master into staging-nextFrederik Rietdijk2019-07-11
|\| |
| * | android-studio: 3.4.1.0 -> 3.4.2.0Michael Weiss2019-07-10
| |/
| * Merge pull request #64495 from dtzWill/update/okteta-0.26.2Peter Hoeg2019-07-10
| |\
| | * okteta: 0.26.1 -> 0.26.2Will Dietz2019-07-09
* | | Merge staging-next into stagingFrederik Rietdijk2019-07-10
|\| |
| * | Merge pull request #64236 from NixOS/staging-nextFrederik Rietdijk2019-07-10
| |\ \
| * | | eclipses: 2018-12 -> 2019-06Matt McHenry2019-07-09
| | |/ | |/|
* | | Merge staging-next into stagingFrederik Rietdijk2019-07-09
|\ \ \ | | |/ | |/|
| * | Merge master into staging-nextFrederik Rietdijk2019-07-09
| |\|
| | * emacs: Silence compiler warnings in site-start.elAlex Branham2019-07-07
| | * neovim: 0.3.7 -> 0.3.8Roman Volosatovs2019-07-07
* | | Merge staging-next into stagingFrederik Rietdijk2019-07-09
|\| |
| * | Merge branch 'master' into staging-nextVladimír Čunát2019-07-06
| |\|
| | * emacsPackagesNg: Mark merlin and flycheck-ocaml as unbroken (#55361)Jake Waksbaum2019-07-05
| | * vscodium: 1.35.1 -> 1.36.0Edmund Wu2019-07-04
| | * vscode: 1.35.1 -> 1.36.0Edmund Wu2019-07-04
| | * vscodium: drop i686-linuxEdmund Wu2019-07-04
| | * vscode: drop i686-linuxEdmund Wu2019-07-04
| | * Merge pull request #64030 from r-ryantm/auto-update/gnome-builderworldofpeace2019-07-04
| | |\
| | | * gnome-builder: 3.32.0 -> 3.32.3R. RyanTM2019-07-01
| | * | Remove me (garbas) as maintainer since I don't have much time to maintain any...Rok Garbas2019-07-03
* | | | Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-appsThomas Tuegel2019-07-05
|\ \ \ \
| * | | | wrapQtAppsHook: Remove ad hoc Qt wrappersThomas Tuegel2019-07-05
| | |_|/ | |/| |
* | | | vim: remove cf-privateDaiderd Jordan2019-07-03
* | | | emacs: remove cf-privateDaiderd Jordan2019-07-03
| |/ / |/| |
* | | Merge staging-next into stagingFrederik Rietdijk2019-07-03
|\ \ \ | | |/ | |/|
| * | Merge pull request #64220 from r-ryantm/auto-update/typoraworldofpeace2019-07-02
| |\ \
| | * | typora: 0.9.70 -> 0.9.72R. RyanTM2019-07-02
| | |/
| * | androidStudioPackages.beta: 3.5.0.16 -> 3.5.0.17Michael Weiss2019-06-27
| * | Merge pull request #61385 from eraserhd/kakoune-pluginsAlyssa Ross2019-06-26
| |\ \
| | * | kakoune: support for adding pluginsJason Felice2019-06-25
| * | | vscode-with-extensions: add missing URL handlerhyperfekt2019-06-26
| | |/ | |/|
* | | treewide: use dontUnpackworldofpeace2019-07-01
* | | treewide: use dontConfigureworldofpeace2019-07-01
|/ /
* | sigil: 0.9.13 -> 0.9.14R. RyanTM2019-06-23
* | Merge pull request #62164 from benley/benley/org-packagesMatthew Bauer2019-06-20
|\ \
| * | org-packages 2019-05-27Benjamin Staffin2019-05-28
* | | Merge pull request #62978 from m-labs/for-upstreamAaron Andersen2019-06-19
|\ \ \
| * | | amp: init at unstable-2019-06-09Sebastien Bourdeauducq2019-06-14
* | | | Merge pull request #63447 from jtojnar/sublime-cleanupJan Tojnar2019-06-19
|\ \ \ \ | |_|_|/ |/| | |
| * | | sublime{3,-merge}: simplify codeJan Tojnar2019-06-18