Commit Graph

4030 Commits

Author SHA1 Message Date
Robin Gloster
30969073f0
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-02 03:01:30 +02:00
worldofpeace
8367f3310e
Merge pull request #65705 from worldofpeace/fix-ghostwriter
ghostwriter: use qt5's mkDerivation
2019-08-01 12:54:38 -04:00
Silvan Mosberger
d834a4a4fa
Merge pull request #59451 from liff/emacs/treemacs-magit-fix
treemacs-magit: needs git at build time
2019-08-01 15:25:22 +02:00
worldofpeace
06b45a8d70 ghostwriter: use qt5's mkDerivation 2019-07-31 21:42:32 -04:00
Akira Komamura
93877c52f6
emacs-libvterm: 2019-04-28 -> 2019-07-22 2019-07-28 17:25:21 +09:00
Orivej Desh
32fbbc6f9b Merge master into staging 2019-07-25 09:23:21 +00:00
Thomas Tuegel
32e552af3f
editorconfig: Include runtime dependency on editorconfig-core-c 2019-07-24 15:39:46 -05:00
worldofpeace
b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
Frederik Rietdijk
b11049d562 Merge staging-next into staging 2019-07-22 14:16:15 +02:00
R. RyanTM
2b974b576c vim: 8.1.1432 -> 8.1.1547
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vim/versions
2019-07-20 14:13:43 +02:00
Ryan Mulligan
04347b76f1
Merge pull request #65112 from r-ryantm/auto-update/neovim-remote
neovim-remote: 2.1.7 -> 2.1.9
2019-07-19 17:07:04 -07:00
R. RyanTM
f1f66e2296 neovim-remote: 2.1.7 -> 2.1.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-remote/versions
2019-07-19 15:54:05 -07:00
Michael Weiss
d345900b98
androidStudioPackages.beta: 3.5.0.17 -> 3.5.0.18 2019-07-18 21:37:28 +02:00
Aaron Andersen
02b260bc57
Merge pull request #65012 from aanderse/kdevelop
kdevelop, kdev-php, kdev-python: 5.3.2 -> 5.3.3
2019-07-18 12:27:45 -04:00
Aaron Andersen
e6a3b3b7df kdevelop, kdev-php, kdev-python: 5.3.2 -> 5.3.3 2019-07-17 22:18:03 -04:00
Matthew Bauer
2255f29206
Merge pull request #64901 from dgchurchill/emacs-imagemagick-macos
emacs: Also allow imagemagick dependency when using withNS
2019-07-17 10:07:01 -04:00
Dave Churchill
9339970dbf emacs: Also allow imagemagick dependency when using withNS
This allows Emacs to be used with imagemagick on macOS.
2019-07-16 22:09:43 +10:00
Vladimír Čunát
3686036e02
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1530372
2019-07-15 09:39:03 +02:00
worldofpeace
8a7be4b651 quilter: 1.9.1 -> 1.9.2
https://github.com/lainsce/quilter/releases/tag/1.9.2
2019-07-13 10:52:17 -04:00
joncojonathan
448de5d5fc jetbrains update via update.pl
jetbrains.datagrip: 2019.1.3 -> 2019.1.4
jetbrains.phpstorm: 2019.1.2 -> 2019.1.3
jetbrains.rider:    2019.1.1 -> 2019.1.2

Updated to latest versions.
2019-07-13 11:02:31 +02:00
Frederik Rietdijk
54065ae20d Merge master into staging-next 2019-07-13 09:45:40 +02:00
worldofpeace
4de9f7a241
Merge pull request #64572 from eadwu/vscode/1.36.1
vscod{e,ium}: 1.36.0 -> 1.36.1
2019-07-11 08:48:52 -04:00
Frederik Rietdijk
48a28c399c jupyter-kernel: remove traceVal
`traceVal` is only for debugging and should not be delivered.

Partial revert of f72d7c49d5, fixes ofBorg eval.
2019-07-11 13:41:13 +02:00
Tom McLaughlin
f72d7c49d5 Add optional Jupyter kernelspec options from the spec (#55989) 2019-07-11 10:29:35 +02:00
Frederik Rietdijk
22cb7f25f2 Merge master into staging-next 2019-07-11 09:40:10 +02:00
Michael Weiss
f5702549bc
android-studio: 3.4.1.0 -> 3.4.2.0 2019-07-10 21:45:08 +02:00
Edmund Wu
269469122f
vscodium: 1.36.0 -> 1.36.1 2019-07-10 09:18:01 -04:00
Edmund Wu
95ce3f54dd
vscode: 1.36.0 -> 1.36.1 2019-07-10 09:17:53 -04:00
Peter Hoeg
99279dff3b
Merge pull request #64495 from dtzWill/update/okteta-0.26.2
okteta: 0.26.1 -> 0.26.2
2019-07-10 17:13:48 +08:00
Frederik Rietdijk
da96a4119f Merge staging-next into staging 2019-07-10 08:52:50 +02:00
Frederik Rietdijk
fb6260fcf7
Merge pull request #64236 from NixOS/staging-next
Staging next
2019-07-10 08:52:04 +02:00
Matt McHenry
fc15a97b7b
eclipses: 2018-12 -> 2019-06 2019-07-09 21:15:50 +02:00
Frederik Rietdijk
79a03641d5 Merge staging-next into staging 2019-07-09 15:46:26 +02:00
Frederik Rietdijk
74c24385cb Merge master into staging-next 2019-07-09 15:46:00 +02:00
Frederik Rietdijk
7cf5909fad Merge staging-next into staging 2019-07-09 15:44:08 +02:00
Will Dietz
3a7ff4e44d
okteta: 0.26.1 -> 0.26.2 2019-07-09 06:11:31 -05:00
Alex Branham
b86c2c54e5
emacs: Silence compiler warnings in site-start.el 2019-07-07 08:35:10 -05:00
Roman Volosatovs
c7a4a0c852 neovim: 0.3.7 -> 0.3.8 2019-07-07 10:22:59 +02:00
Vladimír Čunát
0746c4dbb4
Merge branch 'master' into staging-next
There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940
2019-07-06 13:44:40 +02:00
Thomas Tuegel
56d5963382
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps
Wrap Qt applications
2019-07-05 14:38:10 -05:00
Jake Waksbaum
c7276b2b3d emacsPackagesNg: Mark merlin and flycheck-ocaml as unbroken (#55361) 2019-07-05 18:19:46 +02:00
Thomas Tuegel
51d78034a1
wrapQtAppsHook: Remove ad hoc Qt wrappers 2019-07-05 10:42:08 -05:00
Edmund Wu
427b5bc7e4
vscodium: 1.35.1 -> 1.36.0 2019-07-04 12:40:04 -04:00
Edmund Wu
b196935e6b
vscode: 1.35.1 -> 1.36.0 2019-07-04 12:39:57 -04:00
Edmund Wu
6a01e7007c
vscodium: drop i686-linux 2019-07-04 12:39:48 -04:00
Edmund Wu
c69aeba267
vscode: drop i686-linux 2019-07-04 12:38:45 -04:00
worldofpeace
5d4554bf2c
Merge pull request #64030 from r-ryantm/auto-update/gnome-builder
gnome-builder: 3.32.0 -> 3.32.3
2019-07-04 05:45:44 -04:00
Daiderd Jordan
b0e201f349
vim: remove cf-private 2019-07-03 22:20:21 +02:00
Daiderd Jordan
f2d2381838
emacs: remove cf-private 2019-07-03 22:20:19 +02:00
Rok Garbas
65781e204d
Remove me (garbas) as maintainer since I don't have much time to maintain anything 2019-07-03 11:27:39 +02:00