Commit Graph

198 Commits

Author SHA1 Message Date
Frederik Rietdijk
b2ab860db3 Merge master into staging-next 2019-05-25 12:38:00 +02: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
R. RyanTM
a529bc7f59 vim: 8.1.0675 -> 8.1.1234
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vim/versions
2019-05-02 16:52:13 -07:00
R. RyanTM
94169b1666 vim: 8.1.0578 -> 8.1.0675 (#53172)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vim/versions
2019-04-07 12:46:20 +00: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
R. RyanTM
7da09859a7
vim: 8.1.0535 -> 8.1.0578
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vim/versions
2018-12-16 18:08:29 +00:00
R. RyanTM
b07330de54 vim: 8.1.0490 -> 8.1.0535
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vim/versions
2018-11-17 23:32:21 -08:00
Daiderd Jordan
d4b7c2b88f
vim: add cf-private on darwin
Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in os_macosx.o
    ld: symbol(s) not found for architecture x86_64
2018-11-05 20:30:02 +01:00
R. RyanTM
4552801c81
vim: 8.1.0450 -> 8.1.0490
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vim/versions
2018-10-26 23:31:16 +02:00
R. RyanTM
759703419a vim: 8.1.0348 -> 8.1.0450 (#47725)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vim/versions
2018-10-12 23:05:16 +02:00
R. RyanTM
6fcbae1e9c vim: 8.1.0146 -> 8.1.0348 (#46181)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
vim
2018-09-15 17:02:58 +02:00
John Ericson
0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04: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
ea91420675
Merge pull request #43886 from FRidh/vim
qvim, vim_configurable: get rid of composableDerivation
2018-07-26 11:42:40 +02:00
Frederik Rietdijk
9cb1e7a1f3 qvim: 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 16:52:30 +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
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Will Dietz
0b7d6bb04f vim: v8.1.0001 -> v8.1.0146 2018-07-03 19:31:05 -05: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
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