Commit graph

3310 commits

Author SHA1 Message Date
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
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