Commit Graph

179 Commits

Author SHA1 Message Date
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Charles Strahan
ec1c8071b1 macvim: fix build 2016-05-06 22:32:23 -04:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Arseniy Seroka
4d82228a63 vim: 7.4.827 -> 7.4.1585 2016-03-19 00:21:27 +03:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Allan Espinosa
fd59345d73 macvim: remove extra MacVim.app
/MacVim.app is a duplicate of /Applications/MacVim.app
2016-03-10 10:38:13 -06:00
Robin Gloster
2013614e1d vim-configurable: Disable hardening flag fortify
Fortify hardening detects a probable buffer overflow in vim at runtime. This
has to be fixed upstream.

Debian also disables fortify:

  https://anonscm.debian.org/cgit/pkg-vim/vim.git/tree/debian/rules#n6
2016-03-06 16:57:34 +00:00
Franz Pletz
0cad2e7af1 vim: Disable hardening flag fortify
Fortify hardening detects a probable buffer overflow in vim at runtime. This
has to be fixed upstream.

Debian also disables fortify:

  https://anonscm.debian.org/cgit/pkg-vim/vim.git/tree/debian/rules#n6
2016-03-05 21:45:04 +01:00
zimbatm
89f0e25189 vim: provide a default vimrc
Minimal sane defaults imported from ArchLinux.

This is basically `set :nocompatible` with some other small changes.
2016-02-26 21:58:21 +00:00
Ali Abrar
b2a91caea0 vim_configurable: add configuration option for XIM support 2016-02-02 10:14:26 -05:00
William Giokas
c21707ec1f vim-configurable: Change python versioning
Instead of explicitly stating "I want version 3" or "I want version 2"
you now simply specify what the python argument will be, and
vim_configurable will set up the flags for you. config.vim.python must
be set, still.
2016-01-06 14:07:13 -06:00
Jude Taylor
d539d9c935 revert to __impureHostDeps where possible 2015-11-25 10:09:35 -08:00
Jude Taylor
69e7f3bb74 switch to zero underscores for sandbox profiles; remove generateFrameworkProfile 2015-11-21 12:10:33 -08:00
Jude Taylor
a63346e33c use single underscore for sandboxProfile 2015-11-21 11:17:30 -08:00
Jude Taylor
df80090d09 use per-derivation sandbox profiles 2015-11-19 11:31:06 -08:00
Charles Strahan
23e5ffa2e5 macvim: 7.4.648 -> 7.4.909 (and fix build) 2015-11-15 02:04:27 -05:00
Jude Taylor
de0182ee59 vim: clean up arguments list 2015-10-28 13:40:10 -07:00
Jude Taylor
2e29399993 update packages with new cf-private compatibility 2015-10-26 17:13:29 -07:00
Jude Taylor
97ebba6f1a add vim-vanilla changes to vim_configurable 2015-10-19 16:46:23 -07:00
Jude Taylor
7283bb7466 introduce separate cf-private package to account for no CLT 2015-10-06 00:11:10 -07:00
Brandon Martin
265e675152 vim: update python_framework.patch for darwin 2015-09-29 06:44:17 -06:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Kamil Chmielewski
75250d5add vim_configurable: fix revision name and update (close #9365) 2015-08-22 09:14:37 +02:00
William A. Kennington III
8255ac0d68 vim: 7.4.826 -> 7.4.827
Fix the version string to match the new versioning scheme after the
github migration.
2015-08-20 15:57:28 -07:00
William A. Kennington III
d438d0e98b vim: 7.4.683 -> 7.4.826
Also, since googlecode is shutting down in <1 month move this to the new
github tree. This removes the dependence on mercurial.
2015-08-14 14:06:58 -07:00
Charles Strahan
7c1a3da1c4 macvim: fix bad copy/paste in 6f08fdd26
In 6f08fdd26, I left in a typo after copying from my `~/.nixpkgs/config`.
I would normally test this out locally, but I'm fixing up my conf locally,
and, in the interest of not forgetting to push this change up, made the edit
through GitHub's UI.
Oops.
2015-08-04 17:46:45 -05:00
Charles Strahan
6f08fdd26a macvim: 7.4.479 -> 7.4.648
This updates macvim to 7.4.648. This also fixes the build, which was broken when I set the default Ruby version to 2.2.2 (one of the symbols was renamed).
2015-08-04 17:42:08 -05:00
Jude Taylor
976d80eb57 map apple sdk frameworks CF to darwin.CF to avoid confusion 2015-07-08 14:15:04 -07:00
Jude Taylor
857efa12fb make vim frameworks-compliant 2015-06-30 17:34:13 -07:00
Jude Taylor
363d1bf07a darwin purity: vim 2015-06-26 09:54:44 -07:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Tobias Geerinckx-Rice
b84588cbde vim (all builds): add licence information 2015-05-27 01:22:43 +02:00
William A. Kennington III
b91e83dc77 vim: 7.4.410 -> 7.4.683 2015-03-26 14:33:35 -07:00
William Giokas
9e2d8fd259 vim: Fix vim_configurable options
mzscheme and tcl were using `--enable-mzscheme` and `--enable-tcl` when
those are not actual flags. They should be set to `*interp` instead.
2015-03-18 15:50:37 -07:00
William Giokas
463c78a509 vim: Add python3 support to vim_configurable 2015-03-17 14:30:47 -07:00
Eric Seidel
fe49487a05 fix evaluation 2015-02-03 14:31:07 -08:00
Eric Seidel
48f63c2f2e rename gcc-wrapper to cc-wrapper.
also makes cc-wrapper compatible with clang in the darwin fork.
2015-01-14 20:26:56 -08:00
Thomas Tuegel
1286572302 qvim: add ttuegel to maintainers 2014-11-20 05:14:02 -06:00
Thomas Tuegel
f383ecb8c4 qvim: upgrade to 20140827 (stable) 2014-11-20 05:14:02 -06:00
Vladimír Čunát
c76b399644 vim-configurable: update the patch-version 2014-11-14 23:16:17 +01:00
Vladimír Čunát
6d6695ec14 vim: improve *.nix plugin (#4662)
- Sync syntax from source.
- Add indentation conventions.
2014-11-14 22:08:31 +01:00
Vladimír Čunát
b4af993c3f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Boris Sukholitko
8bc9e80d94 vim_configurable: add cscope support by default 2014-11-13 18:02:14 +02:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
John Wiegley
4c81ac3320 macvim: Update sha256 2014-11-03 15:27:32 -06:00
Allan Espinosa
c6089871bb Use fetchurl and the exact release tag 2014-11-03 22:15:58 +09:00
Allan Espinosa
21880ab6fb Update the sha256sum of the new MacVim build
Correct the update from #4576
2014-11-03 22:15:58 +09:00
Charles Strahan
bad51b0b02 Fix MacVim by using clang. 2014-10-18 01:15:45 -04:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Paul Colomiets
ab2c7cfff7 vim: Add syntax on and set nocompatible by default
Its what everybody wants in 2014. They are enabled by default both in
ubuntu and archlinux.
2014-07-15 14:59:16 +02:00
Paul Colomiets
e376e9731d vim: Update vim to 7.4.335 2014-07-15 14:59:16 +02:00
Paul Colomiets
5e99b0553c vim: Implement sourcing /etc/vimrc and /etc/vim/vimrc 2014-07-15 14:59:16 +02:00
Paul Colomiets
abf19df497 Remove wrapVim
I don't see a reason for having wrapVim function and vimWrapper and
vimHugeXWrapper packages. If you need a system vimrc, whats wrong with
``environment.etc."vimrc".text`` ?

Also strictly speaking ``vimHugeXWrapper`` didn't wrap, X-version
properly. I.e. running ``gvim`` have console vim version.
2014-07-15 14:59:16 +02:00
Paul Colomiets
496d12958e Add automatic plugin activation for vim 2014-07-15 14:59:15 +02:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Charles Strahan
03391f9894 Update macvim package to v7.4.355
MacVim's maintenance has stagnated, so this moves `macvim` to a new maintainer.
Additionally, the `-headerpad_max_install_names` linker flag is passed to
prevent problems when setting the rpaths.
2014-07-07 00:16:55 -04:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Benno Fünfstück
e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
John Wiegley
6a3a9589e2 macvim: add missing call to ensureDir 2014-06-07 20:22:58 +00:00
John Wiegley
c06613a3af macvim: move the .app bundle to $out/Applications 2014-06-07 20:18:27 +00:00
Charles Strahan
72cd8ce56c add MacVim 2014-06-07 15:26:01 -04:00
Charles Strahan
0ec25c6f94 update vim to v7.4.316 2014-06-01 21:09:55 -04:00
Thomas Tuegel
7896a84849 qvim: add lua support 2014-04-29 22:19:58 +02:00
Ricardo M. Correia
05a2b88df7 vimHugeX: also add wrapper for system-wide vimrc 2014-03-10 23:40:59 +01:00
Ricardo M. Correia
2537b7c679 vim: add config option to generate vimrc 2014-02-20 14:08:42 +01:00
Domen Kožar
5c9dc83bb9 vim ft: address the problem with broken highlighting in big files
It seems Vim needs to be instructed how to scan for the begining
of the multiline statements to correctly and efficiently highlight
lanuages.

See :help syn-sync-maxlines
2014-02-12 14:41:27 +01:00
Domen Kožar
4f3d4c55ff vim-ft: match attributes with dash and set nix as ft 2014-02-07 11:06:41 +01:00
Domen Kožar
3710322678 Merge pull request #1442 from ttuegel/vim
vim: enable support for Lua
2014-01-01 14:28:45 -08:00
Domen Kožar
28acbbef3a vim: ft-nix-support: update keywords, add builtins 2014-01-01 21:22:02 +01:00
Thomas Tuegel
dd0f48ed98 vim: enable support for Lua 2014-01-01 09:30:57 -06:00
Michael Raskin
e9ec56a596 Update vim_configurable to the same source tag as default vim 2013-12-29 19:38:43 +04:00
William A. Kennington III
a2ff906257 vim: Update from 7.4.23 -> 7.4.131
Instead of applying all of the patches, this build pulls an archive from
the source code repo with all of the patches already applied. This is the
preferred way from http://www.vim.org/sources.php
2013-12-29 07:51:58 -06:00
Sergey Mironov
2b1b4f3d3a qvim: chage platforms from 'unix' to 'linux'
I have no Darwin machine available so lets test qvim on Linux for now
2013-11-08 12:24:51 +04:00
Sergey Mironov
c8bb648f0f qvim: clean up the code 2013-11-06 11:27:06 +04:00
Sergey Mironov
d6d2de4147 Add qvim - an experimental Qt gui for Vim
vim-qt has the most complete set of Ctrl-Alt-Meta binding functionality.
For example, qvim is able to correctly bind keys like Alt-<nonlatin>.
More: https://bitbucket.org/equalsraf/vim-qt/wiki/Features
2013-11-04 23:02:54 +04:00
Vladimír Čunát
009780587f vim: add the missing patches
Somehow curl from github piped into git am didn't add them.
Sorry, I didn't notice. Thanks @shlevy.
2013-09-19 00:03:35 +02:00
Jason \"Don\" O'Conal
2eb384b982 vim_configurable: add patches to 7.4.23 (close #912) 2013-09-18 21:59:49 +02:00
Lluís Batlle i Rossell
2a444fbdee Marc Weber suggests to drop 'latest' in vim_configurable. 2013-08-13 17:52:07 +02:00
Lluís Batlle i Rossell
09e831e292 Updating vim and vim_configurable to 7.4.
I change vim_configurable from 'latest' to 'default', as 'default' now is more
recent than latest.
2013-08-13 17:47:27 +02:00
Jason "Don" O'Conal
1d7d0addcc vim-plugins: add expression command-t
* also fix build of vim on darwin
2013-07-14 11:24:45 +10:00
Jason "Don" O'Conal
719b488b10 vim_configurable: fix python on darwin
* was not linking to the correct python library on darwin (using the OS
  X framework, which is not what we want)
2013-06-19 12:06:55 +10:00
Jason "Don" O'Conal
b7b98f04a2 vim_configurable: improvements
* add ruby interpreter (may have been accidentally removed, or may never
  have existed)
* allow selection of GUI options by setting `config.vim.gui`
2013-06-15 20:48:20 +10:00
Jason "Don" O'Conal
6baad4d4d6 vim_configurable: fix compilation on darwin
* compile with gccApple
* enable darwinSupport by default
* do not use patchelf
2013-06-13 22:20:54 +10:00
Marc Weber
71628d6e35 vim: supporting multiple sources:
- vim-nox: client-server implementation without X
- latest:  latest mercurial sources (still very stable)
- default: latest release

vim-plugins: Introduce an area to put vim plugins which are worth adding to nix
because they need more effort than just "unpacking". Document that
2013-05-27 22:26:29 +02:00
Vladimír Čunát
19721fe792 vim: fix a typo from commit ab3eea 2013-02-05 17:51:30 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
e6077fbc46 Remove getConfig helper function
An expression like ‘getConfig [ "cabal" "libraryProfiling" ] false’
can be written more concisely as ‘config.cabal.libraryProfiling or false’.
2012-09-19 13:56:56 -04:00
Lluís Batlle i Rossell
46201622cb Making vim73 cross-build (it needs a patch)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24243
2010-10-12 18:33:02 +00:00
Lluís Batlle i Rossell
cd4b54748a Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Lluís Batlle i Rossell
bc92057a17 Making vim some configurable options go through getConfig.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24033
2010-10-03 09:18:14 +00:00
Lluís Batlle i Rossell
530ac48a7c Making the default vim have multibyte+nls support. Checking with 'du', I think
the results take almost the same amount of bytes, while we get support for utf8 terminals.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24031
2010-10-03 09:17:22 +00:00
Michael Raskin
2fed251436 Update vim_configurable to 7.3
svn path=/nixpkgs/trunk/; revision=24014
2010-10-01 05:01:32 +00:00
Armijn Hemel
8db80a9616 update to 7.3
svn path=/nixpkgs/trunk/; revision=24008
2010-09-30 17:00:13 +00:00
Lluís Batlle i Rossell
c00b676654 Making the default vim have multibyte+nls support. Checking with 'du', I think
the results take almost the same amount of bytes, while we get support for utf8 terminals.

svn path=/nixpkgs/trunk/; revision=23859
2010-09-18 16:29:47 +00:00
Lluís Batlle i Rossell
51f6aec764 Fixing the gcc-cross-wrapper; it failed after some changes related to breaking
dependencies with it. (I should never link ld.so with a NIX_LDFLAGS -rpath
forced)

I made vim, scummvm cross-build. I added prboom (that cross-builds).
Mplayer and elinks don't cross-build fine still, but are on the way.
The mplayer fails to build in a weird way; nix does not show either a gcc
error message or even the 'make' error message.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23131
2010-08-11 20:14:25 +00:00
Michael Raskin
e8a33e0c82 Make configurable Vim build with most options
svn path=/nixpkgs/trunk/; revision=22924
2010-08-03 10:59:57 +00:00