diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2013-06-11 15:46:10 +0400 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2013-06-11 15:46:10 +0400 |
commit | 1a45886454c7200fa142f00c941b02afe59792ed (patch) | |
tree | 12c8d662cb422cf0d352029c1a9c891aa7ae5842 /pkgs/applications/editors | |
parent | a2680cdc48b47dbd37b1e734452b3df3bb3ed8a9 (diff) | |
parent | 55249de9246606691e73de9ae1095cc164428b0f (diff) | |
download | nixlib-1a45886454c7200fa142f00c941b02afe59792ed.tar nixlib-1a45886454c7200fa142f00c941b02afe59792ed.tar.gz nixlib-1a45886454c7200fa142f00c941b02afe59792ed.tar.bz2 nixlib-1a45886454c7200fa142f00c941b02afe59792ed.tar.lz nixlib-1a45886454c7200fa142f00c941b02afe59792ed.tar.xz nixlib-1a45886454c7200fa142f00c941b02afe59792ed.tar.zst nixlib-1a45886454c7200fa142f00c941b02afe59792ed.zip |
Merge branch 'master' into x-updates
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 38 |
1 files changed, 32 insertions, 6 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 9d07121f4cb4..c10db35a51b9 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,14 +1,38 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc -args: with args; +args@{source ? "latest", ...}: with args; + + let inherit (args.composableDerivation) composableDerivation edf; in -composableDerivation {} { +composableDerivation {} (fix: { name = "vim_configurable-7.3"; - src = args.fetchurl { - url = ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2; - sha256 = "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw"; + enableParallelBuilding = true; # test this + + src = + builtins.getAttr source { + "default" = + # latest release + args.fetchurl { + url = ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2; + sha256 = "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw"; + }; + "vim-nox" = + { + # vim nox branch: client-server without X by uing sockets + # REGION AUTO UPDATE: { name="vim-nox"; type="hg"; url="https://code.google.com/r/yukihironakadaira-vim-cmdsrv-nox/"; branch="cmdsrv-nox"; } + src = (fetchurl { url = "http://mawercer.de/~nix/repos/vim-nox-hg-2082fc3.tar.bz2"; sha256 = "293164ca1df752b7f975fd3b44766f5a1db752de6c7385753f083499651bd13a"; }); + name = "vim-nox-hg-2082fc3"; + # END + }.src; + "latest" = { + # vim latest usually is vim + bug fixes. So it should be very stable + # REGION AUTO UPDATE: { name="vim"; type="hg"; url="https://vim.googlecode.com/hg"; } + src = (fetchurl { url = "http://mawercer.de/~nix/repos/vim-hg-7f98896.tar.bz2"; sha256 = "efcb8cc5924b530631a8e5fc2a0622045c2892210d32d300add24aded51866f1"; }); + name = "vim-hg-7f98896"; + # END + }.src; }; configureFlags = ["--enable-gui=auto" "--with-features=${args.features}"]; @@ -54,6 +78,7 @@ composableDerivation {} { cscopeSupport = config.vim.cscope or false; # add .nix filetype detection and minimal syntax highlighting support ftNixSupport = config.vim.ftNix or true; + netbeansSupport = config.netbeans or true; # eg envim is using it }; #--enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon @@ -85,4 +110,5 @@ composableDerivation {} { homepage = "www.vim.org"; }; -} +}) + |