Commit graph

74 commits

Author SHA1 Message Date
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Dhruv Dang ca799c5187 vim_configurable: build against gtk{2,3}-x11 instead of gtk{2,3} to fix builds on darwin 2019-05-24 10:51:59 -07:00
Jörg Thalheim dadc7eb329
treewide: use runtimeShell instead of stdenv.shell whenever possible
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
2019-02-26 14:10:49 +00:00
Daiderd Jordan c66c469433
Merge pull request #45352 from LnL7/darwin-vim-x11
vim_configurable: fix darwin build with guiSupport
2018-08-28 21:14:22 +02:00
Michael Raskin 083220867c Improve re-wrapping in case of GTK3 2018-08-28 13:32:55 +03:00
Daiderd Jordan cfc3d7c918
vim_configurable: use gtk3 on darwin 2018-08-24 00:38:12 +02:00
Daiderd Jordan e2ef327652
vim_configurable: disable darwinSupport by default
Using gtk + darwin support seems broken at the moment, we probably want
guiSupport = "carbon" instead but that doesn't work and something like
macvim is probably better for that.  This fixes the build while keeping
guiSupport enabled which might be desirable for eg. +clientserver.

Fixes #45025
2018-08-19 21:52:51 +02:00
Daiderd Jordan 8a6064a526
vim_configurable: make gtk optional
Using vim_configurable.override { guiSupport = "no"; } would still pull
in gtk2 as a dependency.
2018-08-19 21:41:15 +02:00
Daiderd Jordan a50807e1b8
vim_configurable: fix lua reference 2018-08-19 21:39:10 +02:00
Michael Raskin 40dea2488f vim_configurable: make gvim command launch GUI again 2018-08-11 10:25:21 +03: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
Uli Baum 9f96ec8b03 vimNox: drop
not updated since 2012, see #40876
2018-08-06 21:36:00 +02:00
Daiderd Jordan 5b211b6f4c
vim-configurable: fix python support
Removed --enable-python since that doesn't seem to do anything.
2018-07-28 11:30:46 +02:00
Frederik Rietdijk 539f4f644a vim_configurable: get rid of composableDerivation
Use `stdenv.mkDerivation` directly instead of `composableDerivation`.

Some configure flags may have changed as the conversion wasn't exactly
straightforward.
2018-07-21 13:48:19 +02:00
Maximilian Bosch f43446c9ca
vim_configurable: restore ability to override python for modules
It seems as Python will be fetched from $PATH in Vim 8.1:

```
stat("/home/ma27/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory)
stat("/run/wrappers/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory)
stat("/home/ma27/.nix-profile/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory)
stat("/nix/var/nix/profiles/default/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory)
stat("/run/current-system/sw/bin/python", {st_mode=S_IFREG|0555, st_size=291, ...}) = 0
readlink("/run/current-system/sw/bin/python", "/nix/store/ggjkqbvwnv7dflkmdgmmp"..., 4096) = 72
```

This breaks in cases where you want to use a modified Python derivation
for the VIM plugins you use in `vim_configurable`:

```
let
  vim_configurable' = vim_configurable.override {
    # python with modules for ensime
    python = python.withPackages (ps: with ps; [ sexpdata websocket_client ]);
  };
in
  vim_configurable'.customize {
    # ...
  }
```

With VIM 8.0 this worked perfectly fine, now it's necessary to install
the modified `python` in $PATH to actually use it, otherwise an error
like this arises:

```
[ensime] A dependency is missing, please `pip2 install sexpdata websocket-client` and restart Vim.
Press ENTER or type command to continue
```

However it should be possible to pass the modified Python to the
modules, the easiest workaround is to write a wrapper which prefixes
$PATH to have the Python derivation available.
2018-05-30 09:16:55 +02:00
Daiderd Jordan 1c3d38c69b
vim_configurable: replace default ftNix patch with sources from vim-nix 2018-04-24 22:56:25 +02:00
davidak 3270aa896b replace "Mac OS X" and "OS X" with "macOS"
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
Bjørn Forsman 1639429359 vim_configurable: add ".../after" plugin dirs to runtimepath
This fixes using e.g. CSApprox when installed with nix.
2017-07-29 14:34:13 +02:00
Michael Raskin 8eccd34f10 vim_configurable: enable ximSupport by default 2017-03-03 21:20:19 +01:00
Benjamin Staffin 24716fe954 vim: Create xdg apps/icons dirs so .desktop items get installed
In theory this ought to make gvim show up in the kde/gnome/xfce
application menus.
2017-02-04 21:29:59 -05:00
Benjamin Staffin 3dd2a271ef vim: make it possible to build with --enable-gui=gtk3
This doesn't change any defaults; I suspect that dropping gtk2 support
would annoy some people so I didn't want to do that without asking
around first.
2017-01-31 02:17:11 -05:00
Vladimír Čunát 996d8ddd99 vim*: fix :Man a bit 2016-11-07 18:55:21 +01:00
Vladimír Čunát 51feecbe88 vim_configurable: misc improvements
- fix wrongly used *native* build inputs;
- remove confusing `prePatch = "cd src";` ;
- adapt RPATH handling to multiple-output changes;
- don't list full compiler flags in vim --version,
  as that would keep references to -dev paths.

Together, the closure of the default feature-set drops almost by 100 MB.
The lean vim attribute would *not* lose any references due to patching
--version, so we only apply it for vim_configurable.
2016-11-07 18:55:21 +01:00
Vladimír Čunát 1667046505 vim: factor common.nix from {default,configurable}.nix
The derivations are unchanged.
2016-11-07 16:38:13 +01:00
Wink Saville d81a6e6f9c Remove python_framework.patch
In the [discussion](https://github.com/NixOS/nixpkgs/pull/18801) of this pull
request @LnL7 was unable to complete a darwin build because the
python_framework.patch does not apply and suggests it should be removed.
2016-09-23 09:13:23 -07:00
Wink Saville 08d7cfa420 Update vim_configurable to vim 8.0005 2016-09-20 16:56:31 -07:00
Kirill Boltaev bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Tuomas Tynkkynen 6dc452313a vim_configurable: vimNoX broken on Darwin, but bring back vimHugeX works
D'oh, I was careless.
2016-09-01 20:49:32 +03:00
Tuomas Tynkkynen 3364230d56 Disable bunch of non-compiling packages on Darwin
These ones have a "Last successful build" timestamp in the 2014s or
2015s. Presumably no one will notice if we now stop building them.

softether_4_18              2015-09-20  http://hydra.nixos.org/build/39418483
lensfun                     2014-09-30  http://hydra.nixos.org/build/39394104
net_snmp                    2015-09-20  http://hydra.nixos.org/build/39410553
djview                      2015-08-11  http://hydra.nixos.org/build/39413233
libmusicbrainz2             2015-09-20  http://hydra.nixos.org/build/39410106
fox_1_6                     2014-05-07  http://hydra.nixos.org/build/39410858
libofx                      2015-09-24  http://hydra.nixos.org/build/39423507
yacas                       2014-09-30  http://hydra.nixos.org/build/39393150
iomelt                      2014-09-30  http://hydra.nixos.org/build/39408486
softether                   2015-09-20  http://hydra.nixos.org/build/39425800
mp4v2                       2014-09-30  http://hydra.nixos.org/build/39421899
virtuoso7                   2014-09-21  http://hydra.nixos.org/build/39415206
man_db                      2015-04-23  http://hydra.nixos.org/build/39404236
libdiscid                   2014-09-30  http://hydra.nixos.org/build/39412202
zabbix22.agent              2014-09-21  http://hydra.nixos.org/build/39412149
vidalia                     2015-08-06  http://hydra.nixos.org/build/39411500
libmtp                      2015-09-20  http://hydra.nixos.org/build/39419199
wxGTK29                     2015-09-20  http://hydra.nixos.org/build/39415296
ncmpcpp                     2015-11-06  http://hydra.nixos.org/build/39404455
libtorrent                  2014-09-21  http://hydra.nixos.org/build/39394646
shishi                      2014-03-21  http://hydra.nixos.org/build/39418874
ocaml_3_12_1                2014-09-30  http://hydra.nixos.org/build/39392996
djview4                     2015-08-11  http://hydra.nixos.org/build/39427799
vimNox                      2014-05-23  http://hydra.nixos.org/build/39397012
ttfautohint                 2015-08-06  http://hydra.nixos.org/build/39398330
libraw                      2015-09-24  http://hydra.nixos.org/build/39402271
wxGTK30                     2015-09-20  http://hydra.nixos.org/build/39401871
sbcl_1_2_5                  2015-09-20  http://hydra.nixos.org/build/39426091
prover9                     2014-09-30  http://hydra.nixos.org/build/39406476
rcs                         2015-08-25  http://hydra.nixos.org/build/39392037
gpac                        2015-09-24  http://hydra.nixos.org/build/39399470
virtuoso6                   2014-09-30  http://hydra.nixos.org/build/39398651
xlslib                      2015-09-24  http://hydra.nixos.org/build/39410387
ucommon                     2015-03-27  http://hydra.nixos.org/build/39414040
commoncpp2                  2014-09-30  http://hydra.nixos.org/build/39420117
virtuoso                    2014-09-21  http://hydra.nixos.org/build/39399978
miniHttpd                   2014-09-30  http://hydra.nixos.org/build/39392925
mpack                       2014-09-26  http://hydra.nixos.org/build/39399535
nbd                         2014-09-26  http://hydra.nixos.org/build/39401367
newsbeuter-dev              2014-07-29  http://hydra.nixos.org/build/39406259
gimp_2_8                    2015-09-20  http://hydra.nixos.org/build/39436271
gimp                        2015-09-20  http://hydra.nixos.org/build/39435976
zabbix20.agent              2014-09-30  http://hydra.nixos.org/build/39393242
gst_all_1.gst-plugins-good  2015-09-20  http://hydra.nixos.org/build/39408506
ocaml_4_00_1                2014-09-30  http://hydra.nixos.org/build/39399526
inadyn                      2014-09-30  http://hydra.nixos.org/build/39426389
gst_all_1.gst-plugins-bad   2015-09-20  http://hydra.nixos.org/build/39392970
zabbix.agent                2014-09-30  http://hydra.nixos.org/build/39421412
cmake-2_8                   2015-09-24  http://hydra.nixos.org/build/39399443
liblastfm                   2015-08-06  http://hydra.nixos.org/build/39421812
newsbeuter                  2014-07-29  http://hydra.nixos.org/build/39396605
sdcv                        2014-09-26  http://hydra.nixos.org/build/39412928
2016-09-01 20:39:33 +03:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Christoph Hrdinka 8cbbc73dce vim_configurable: googlecode -> github
Vim is now hosted on github instead of googlecode.
2016-06-16 15:35:58 +02: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
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 97ebba6f1a add vim-vanilla changes to vim_configurable 2015-10-19 16:46:23 -07: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
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 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
Vladimír Čunát c76b399644 vim-configurable: update the patch-version 2014-11-14 23:16:17 +01:00
Boris Sukholitko 8bc9e80d94 vim_configurable: add cscope support by default 2014-11-13 18:02:14 +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 496d12958e Add automatic plugin activation for vim 2014-07-15 14:59:15 +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