1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-15 09:03:48 +00:00
Commit graph

243 commits

Author SHA1 Message Date
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
Eelco Dolstra d81ed8201f * Turn vim/default.nix into a regular package. We don't need two
configurable VIMs.

svn path=/nixpkgs/trunk/; revision=22784
2010-07-28 12:52:54 +00:00
Michael Raskin 01d5ec596b Some more optional features for Vim
svn path=/nixpkgs/trunk/; revision=20288
2010-02-28 17:54:41 +00:00
Michael Raskin 9df96554ec Make Vim source overridable and add ECL configuration information. Currently Vim with ECL support requires unofficial source package, like the one retrievable from http://repo.or.cz/w/vim_extended.git
svn path=/nixpkgs/trunk/; revision=20200
2010-02-23 18:10:42 +00:00
Marc Weber 4007d19700 fix vim_configurable
svn path=/nixpkgs/trunk/; revision=20084
2010-02-18 01:49:22 +00:00
Lluís Batlle i Rossell 7e3bcbd4c2 Made the small vim (attribute 'vim') have --enable-multibyte. Not that a luxurious
features, in these times of utf-8, and at the end our ncurses has multibyte.

svn path=/nixpkgs/trunk/; revision=17757
2009-10-12 14:29:07 +00:00
Marc Weber 23ca0bb3c2 vim version (7.2), optional .nix filetype detection and syntax highlighting
svn path=/nixpkgs/trunk/; revision=14431
2009-03-07 00:27:13 +00:00
Marc Weber b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
2009-03-06 23:21:28 +00:00
Marc Weber 387478ce5e vim_configurable: build with gtk, fix passing features=huge
using gtk gvim does start much faster

svn path=/nixpkgs/trunk/; revision=14053
2009-02-12 20:27:56 +00:00
Marc Weber fd948733a0 fix perl, ruby, tcl support in vim_configurable
svn path=/nixpkgs/trunk/; revision=14052
2009-02-12 20:27:54 +00:00
Marc Weber e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
2008-12-20 01:20:35 +00:00
Armijn Hemel e60a0c2591 7.1 -> 7.2
svn path=/nixpkgs/trunk/; revision=12573
2008-08-10 15:05:08 +00:00
Yury G. Kudryashov e281a287b2 vim: now compiles in stdenv-updates (-lutil -lpthread)
svn path=/nixpkgs/branches/stdenv-updates/; revision=10525
2008-02-06 19:01:06 +00:00
Yury G. Kudryashov 98a81beaac meta.homepage added to several packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=10431
2008-01-31 10:41:45 +00:00
Yury G. Kudryashov a7703662a4 Merged with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=10145
2008-01-15 00:55:21 +00:00
Michael Raskin 54a1f25c4c Added conditional concatenation and used it for name and configureFlags generation.
svn path=/nixpkgs/trunk/; revision=9136
2007-08-15 21:17:11 +00:00
Michael Raskin 118e9d6ebf Corrected a flaw that made automated package silently accept any extra arguments
svn path=/nixpkgs/trunk/; revision=9101
2007-08-11 11:14:36 +00:00
Michael Raskin efbabdb598 Converted Vim package to a template-based form with only lists filled in manually. Added library functions to support it. Added two proposed package templates to top-level, so that every discussion about package format can result in just editing templates or adding new ones.
svn path=/nixpkgs/trunk/; revision=9100
2007-08-11 10:34:07 +00:00
Michael Raskin 2d6a65b666 Included some configuration for Vim.
svn path=/nixpkgs/trunk/; revision=9099
2007-08-10 19:53:30 +00:00
Armijn Hemel 5a6c931123 7.0 -> 7.1
svn path=/nixpkgs/trunk/; revision=8682
2007-05-14 00:33:03 +00:00
Eelco Dolstra 1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra 368c196a62 * More descriptions.
svn path=/nixpkgs/trunk/; revision=6709
2006-10-12 10:53:16 +00:00
Armijn Hemel 6a1a282635 vim 7.0
svn path=/nixpkgs/trunk/; revision=5289
2006-05-08 21:05:07 +00:00
Armijn Hemel 5c8e0170c8 add an alias "vi", for my convenience ;)
svn path=/nixpkgs/trunk/; revision=4506
2006-01-07 16:10:13 +00:00
Eelco Dolstra 82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Eelco Dolstra 454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Armijn Hemel 5868736733 forgot a "
svn path=/nixpkgs/trunk/; revision=1214
2004-08-03 14:23:33 +00:00
Armijn Hemel 705027be2d fix typo
svn path=/nixpkgs/trunk/; revision=1201
2004-07-30 13:28:55 +00:00
Armijn Hemel 5d1cf55dc1 add vim
svn path=/nixpkgs/trunk/; revision=1200
2004-07-30 12:57:27 +00:00