Commit Graph

171 Commits

Author SHA1 Message Date
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
Dmitry Kalinkin
c2ed843f38
vim: 8.0.1655 -> 8.1.0001 2018-05-19 00:29:50 -04:00
Daiderd Jordan
1c3d38c69b
vim_configurable: replace default ftNix patch with sources from vim-nix 2018-04-24 22:56:25 +02:00
Bryan Richter
16bfd5a2be
vim: Set softtabstop in nix filetype plugin 2018-04-20 11:46:40 -04:00
Bryan Richter
94fd34a31b
vim: idiomatic nix filetype plugin
* Never modify tabstop. This causes incompatibilities with other
  utilities that expect tabs to always be 8 spaces.
* Add standard boilerplate for system-level filetype plugins.
2018-04-20 10:39:58 -04:00
R. RyanTM
5b8455c338 vim: 8.0.1605 -> 8.0.1655
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/vim/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/j6w96w36f0naab7fffqri1cmspaa3mnb-vim-8.0.1655/bin/vim -h` got 0 exit code
- ran `/nix/store/j6w96w36f0naab7fffqri1cmspaa3mnb-vim-8.0.1655/bin/vim --help` got 0 exit code
- ran `/nix/store/j6w96w36f0naab7fffqri1cmspaa3mnb-vim-8.0.1655/bin/vim --version` and found version 8.0.1655
- found 8.0.1655 with grep in /nix/store/j6w96w36f0naab7fffqri1cmspaa3mnb-vim-8.0.1655
- directory tree listing: https://gist.github.com/b65f9cb4045c205c8c3ee68503c42596
2018-03-30 20:06:39 +01:00
Ryan Mulligan
a998162d7f vim: 8.0.1451 -> 8.0.1605
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/5afa788kqasx65plvzwjnffq9ihzdbmn-vim-8.0.1605/bin/vim -h` got 0 exit code
- ran `/nix/store/5afa788kqasx65plvzwjnffq9ihzdbmn-vim-8.0.1605/bin/vim --help` got 0 exit code
- ran `/nix/store/5afa788kqasx65plvzwjnffq9ihzdbmn-vim-8.0.1605/bin/vim --version` and found version 8.0.1605
- found 8.0.1605 with grep in /nix/store/5afa788kqasx65plvzwjnffq9ihzdbmn-vim-8.0.1605
- directory tree listing: https://gist.github.com/f9af564ba8cc53b90d1d262c2e786eee
2018-03-17 05:38:34 -07:00
zimbatm
e8194c2c5b
ruby: remove unsupported versions (#34927)
* remove EOL ruby versions for security and maintenance reasons.
* only expose ruby_MAJOR_MINOR to the top-level. we don't provide
guarantees for the TINY version.
* mark all related packages as broken
* switch the default ruby version from 2.3.x to 2.4.x
2018-02-14 09:53:54 +00:00
Will Dietz
28f7f0794e vim: 8.0.1428 -> 8.0.1451
Changes:
https://github.com/vim/vim/compare/v8.0.1428...v8.0.1451
2018-02-01 07:20:07 -06:00
Daiderd Jordan
92bf8c66ba
Merge pull request #34149 from dtzWill/update/vim-8.0.1428
vim: 8.0.1257 -> 8.0.1428
2018-01-22 20:04:01 +01:00
Will Dietz
f851457368 vim: fix for cross, add missing configure test override
This is one of the variables mentioned to set
when cross-compiling:

https://github.com/vim/vim/blob/master/src/INSTALLx.txt
2018-01-22 12:48:00 -06:00
Will Dietz
360b86e515 vim: 8.0.1257 -> 8.0.1428 2018-01-22 11:12:43 -06:00
Tuomas Tynkkynen
78eaae0204 vim: 8.0.1245 -> 8.0.1257 2017-11-03 21:25:41 +02:00
aszlig
74260a4922
vim: 8.0.1150 -> 8.0.1245
This update contains a lot of fixes that are too much to be summarized
here, so here is the upstream changelog (basically "git log"):

https://github.com/vim/vim/commits/v8.0.1250

The main reason for this bump is that I got annoyed by a bug that was
fixed in upstream version 8.0.1194, which caused a race condition during
vim startup when it's trying to retrieve background colors from the
terminal.

Sometimes it could happen that random commands are executed at Vim
startup (typically pasting the "" buffer) and after bisecting I've found
out that version 8.0.1194 indeed fixed this problem.

The reason why I'm updating to version 8.0.1250 is that when looking
through the Git log it contains a whole lot of fixes but no new
features, so I'd assume it's safe to upgrade.

I've tested all packages that depend on Vim and they still succeed
building. In addition to that I've used the new version for a couple of
hours without any issue.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @lovek323, @LnL7, @vaibhavsagar
2017-11-03 15:19:06 +01:00
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Vaibhav Sagar
6498ac609a vim: 8.0.0442 -> 8.0.1150 2017-09-26 22:48:09 +08:00
John Ericson
ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
John Ericson
100db4fa3b vim: Properly categorize pkgconfig dependency 2017-09-20 00:58:55 -04: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
John Ericson
aac32fe2d1 vim: cc-wrapper can be relied on to export this env var 2017-06-28 18:31:37 -04:00
John Ericson
8b22e497f2 vim: Modernize derivation, hopefully fixing cross 2017-06-22 17:53:53 -04:00
Tim Shaffer
e973c75d65 vim: update URL for vimrc
Previous URL was returning a 404. Adjusting the query parameters fixes
things.
2017-06-13 13:31:17 -04:00
Franz Pletz
12f3006861
vim: 8.0.0329 -> 8.0.0442 2017-03-11 08:14:28 +01:00
Michael Raskin
8eccd34f10 vim_configurable: enable ximSupport by default 2017-03-03 21:20:19 +01:00
Daiderd Jordan
d2d12c2f4c
vim: 8.0.0075 -> 8.0.0329 2017-02-15 21:00:59 +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
Tim Digel
babbe0e14d vim: 8.0.0005 -> 8.0.0075 2016-11-11 10:12:18 +01: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
Matthias Beyer
ff7f39febb vim: 7.4.1585 -> 8.0.0005 2016-09-16 21:42:38 +02: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
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
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