Commit Graph

1995 Commits

Author SHA1 Message Date
Robin Gloster
d12639cb28 Merge pull request #22739 from Mic92/vam
vim.vam: fix filetype detection
2017-02-13 15:10:35 +01:00
Jörg Thalheim
b7d65f8af0
vim.vam: fix filetype detection
According to https://github.com/MarcWeber/vim-addon-manager/blob/master/doc/vim-addon-manager-additional-documentation.txt#L1310
`filetype on` must be called after all VAM plugins are initialized.
Otherwise vim set `conf` filetype for some files containing hash tags.
2017-02-13 14:10:23 +01:00
Jörg Thalheim
d673484683 Merge pull request #22720 from Mic92/vim-plugins
vimPlugins: update to latest
2017-02-13 01:34:57 +01:00
Jörg Thalheim
005a9d2d9d
vimPlugins: update to latest 2017-02-13 01:08:20 +01:00
Graham Christensen
2495065351 Merge pull request #22667 from avnik/wine-update
wineUnstable: 2.0 -> 2.1
2017-02-12 18:54:47 -05:00
Christoph Hrdinka
a7ca114545
libretro: add mGBA core
Closes #22618.
2017-02-12 12:38:20 +01:00
Alexander V. Nikolaev
9ed445a0f7 wineUnstable: 2.0 -> 2.1 2017-02-12 11:23:48 +02:00
Joachim F
2488e42cc5 Merge pull request #22620 from hrdinka/add/libretro-reicast
libretro: add reicast core
2017-02-11 20:15:59 +01:00
Joachim F
6d536f91ba Merge pull request #22662 from hrdinka/add/libretro-mednafen-saturn
libretro: add mednafen-saturn core
2017-02-11 20:13:40 +01:00
Tuomas Tynkkynen
20578372e1 U-Boot: Fix ubootBananaPi & ubootPcduino3Nano by adding python2
Also enable parallel building.
2017-02-11 15:53:01 +02:00
Christoph Hrdinka
c4a47bdb5e
libretro: add mednafen-saturn core 2017-02-11 13:49:33 +01:00
Vladimír Čunát
66fe4af226
Merge recent staging
It's the version last built on Hydra, almost fully.
2017-02-10 18:07:14 +01:00
Christoph Hrdinka
95ee742dcd
attract-mode: init at 2.2.0 2017-02-10 12:25:26 +01:00
Christoph Hrdinka
d04ee2f91c
libretro: add reicast core 2017-02-10 12:11:29 +01:00
Herwig Hochleitner
ae33b4673d wine: 1.8.6 -> 2.0 2017-02-09 16:20:49 +01:00
Vladimír Čunát
6bea415b5e
Merge branch 'master' into staging 2017-02-09 08:42:04 +01:00
Franz Pletz
4494b18fe4
electricsheep: 2.7b33-598d93d90 -> 2.7b33-2017-02-04
Also some cleanups like removed unused buildInputs.
2017-02-08 23:51:02 +01:00
Pascal Wittmann
04a128540d Merge pull request #22285 from nand0p/electricsheep
electricsheep: 2.6.8 -> 2.7b33
2017-02-07 10:20:20 +01:00
Fernando J Pando
17d74c4912 electricsheep: 2.6.8 -> 2.7b33
- Updates and fixes currently broken package.
- Provides Flam3 and GLee dependencies.
- Tested on Nixos Unstable.
2017-02-06 18:05:38 -05:00
Herwig Hochleitner
023c3c77ee cdemu: bugfix updates
image-analyzer: 3.0.0 -> 3.0.1
cdemu-client: 3.0.1 -> 3.0.3
cdemu-daemon: 3.0.3 -> 3.0.5
gcdemu: 3.0.1 -> 3.0.2
libmirage: 3.0.4 -> 3.0.5
vhba: 20140928 -> 20161009
2017-02-06 05:09:12 +01:00
Eelco Dolstra
42574f52b9
Remove references to $NIX_STRIP_DEBUG
This was removed in 3ea1c30846.
2017-02-05 11:08:32 +01:00
Vladimír Čunát
a2c867fd39
Merge branch 'staging' 2017-02-04 21:02:46 +01:00
Evan Danaher
03c10c64ad vim-plugins: add vim-lawrencium 2017-02-03 17:02:35 -05:00
Evan Danaher
20db0d793f vim-plugins: add neco-vim 2017-02-03 09:32:55 -05:00
Evan Danaher
b017334b46 vim-plugins: add vim-scala 2017-02-03 09:32:55 -05:00
Evan Danaher
127c299efc vim-plugins: add vim-highlightedyank 2017-02-03 09:32:54 -05:00
Vladimír Čunát
adab4cd58b
Merge branch 'master' into staging 2017-02-03 11:47:38 +01:00
Cray Elliott
3acd52d917 mgba: 0.5.1 -> 0.5.2 2017-02-02 15:34:38 -08:00
Antoine Racine
9fa9339a13 vimPlugins.alchemist-vim: init at rev c22d4883b7 2017-02-01 23:13:28 -05:00
Antoine Racine
b4f3674694 Add vim-elixir to vim plugins 2017-02-01 20:05:22 -05:00
Vladimír Čunát
9cd2dbc569
Merge branch 'master' into staging
Hopefully this will fix the mass abortion on Hydra;
restarting the jobs didn't help.
2017-01-30 18:39:36 +01:00
Vladimír Čunát
49b136377a
Merge #16501: add a guide about vim plugins 2017-01-30 18:28:20 +01:00
Robert Helgesson
89150d3377
theme-vertex: 20161009 -> 20170128 2017-01-30 16:31:33 +01:00
Tuomas Tynkkynen
424cfe7686 Merge remote-tracking branch 'upstream/master' into staging 2017-01-29 02:16:29 +02:00
Robin Gloster
0cd1f6bb51
gxemul: get rid of composableDerivation 2017-01-27 17:36:38 +01:00
Tuomas Tynkkynen
be0e48e48f Merge remote-tracking branch 'upstream/master' into staging 2017-01-27 02:18:44 +02:00
Robin Gloster
246765f33d
libjack2: add patch to fix build with gcc6 2017-01-25 20:12:40 +01:00
Tuomas Tynkkynen
b29ee6c8ff U-Boot: Add 64-bit Raspberry Pi 3 build
And rename the old ubootRaspberryPi3 to ubootRaspberryPi3_32bit.
2017-01-25 02:14:47 +02:00
schneefux
9ffd864e01
vim plugins: added gruvbox 2017-01-21 16:07:28 +01:00
Franz Pletz
9b92a07843
treewide: use lib.maintainers for meta.maintainers 2017-01-20 15:44:28 +01:00
Tuomas Tynkkynen
1feedf25df U-Boot: 2016.11 -> 2017.01 2017-01-20 14:50:02 +02:00
Nikolay Amiantov
d75a3cfb29 Merge pull request #21995 from abbradar/opencl
Fix OpenCL support
2017-01-20 12:09:17 +03:00
Nikolay Amiantov
10bae1a207 opencl-icd: remove, point to ocl-icd 2017-01-20 03:37:51 +03:00
Arseniy Seroka
fe5cbf221f Merge pull request #21904 from instantepiphany/master
vimPlugins: add typescript-vim, tsuquyomi
2017-01-16 14:41:18 +03:00
Maximilian Güntner
99ca11810a
vim plugins: added vim-speeddating 2017-01-15 18:57:52 +01:00
Jordan Cran
3ba22934e8 vimPlugins: add typescript-vim, tsuquyomi 2017-01-15 23:35:55 +11:00
Robin Gloster
3405f703f2
gxemul: fix disappeared download link 2017-01-14 20:02:12 +01:00
Jude Taylor
a493b89907 vimPlugins: add delimitMate 2017-01-10 11:51:03 -08:00
Pascal Wittmann
de36c3b560
xlockmore: 5.49 -> 5.50 2017-01-09 19:51:34 +01:00
Vladimír Čunát
07bf828bd9
Merge branch 'staging'; security /cc #21642 2017-01-06 16:32:47 +01:00