Commit graph

3413 commits

Author SHA1 Message Date
worldofpeace 9ccd6471b1
Merge pull request #53602 from ivan/wine-4.0-rc5
wine{Unstable,Staging}: 4.0-rc2 -> 4.0-rc5
2019-01-11 18:06:10 -05:00
Vladimír Čunát 287144e342
Merge branch 'master' into staging-next 2019-01-10 13:07:21 +01:00
Timo Kaufmann e012ec5b14
Merge pull request #53670 from timokau/vim-plugins-update
vimPlugins: update, init neoterm and vim-slime
2019-01-08 22:27:42 +01:00
Timo Kaufmann 67cf32751c vimPlugins.vim-slime: init at 2019-01-03 2019-01-08 22:04:27 +01:00
Timo Kaufmann f7113786af vimPlugins.neoterm: init at 2018-12-21 2019-01-08 21:59:31 +01:00
Timo Kaufmann 114a9e6bd4 vimPlugins: update 2019-01-08 17:55:56 +01:00
Matthew Bauer bb874163fd cups: use v2.2.6 on darwin
This is the last version known to build.

Fixes #53609.
2019-01-07 19:41:12 -06:00
Ivan Kozik 2f80d662a8 wine{Unstable,Staging}: 4.0-rc2 -> 4.0-rc5 2019-01-07 21:43:41 +00:00
Frederik Rietdijk a4250d1478 Merge staging-next into staging 2019-01-06 09:48:31 +01:00
Frederik Rietdijk e5381cdece Merge master into staging-next 2019-01-06 09:36:23 +01:00
Tadeo Kondrak 0d99389a6d wine: add perl to buildInputs to fix winemaker 2019-01-05 18:40:59 +01:00
Frederik Rietdijk 60a3973a55 Merge staging-next into staging 2019-01-05 10:15:00 +01:00
Frederik Rietdijk 9618abe87c Merge master into staging-next 2019-01-04 21:13:19 +01:00
Lengyel Balazs f4a53ff3bc treewide/xorg: replace *proto with xorgproto 2019-01-04 14:38:57 +01:00
Dmitry Bogatov 1d41509599 vimPlugins.ansible-vim: init at 2.0 2019-01-03 22:48:14 +00:00
Frederik Rietdijk 2da31b80bb Merge master into staging-next 2019-01-03 20:07:35 +01:00
Timo Kaufmann e33d6364f6
Merge pull request #53240 from timokau/vim-drv-recursively
vimUtils: apply pluginToDrv recursively
2019-01-03 11:56:44 +01:00
wedens 88a82a4dc9 xkb-switch: 1.3.1 -> 1.5.0, rename from xkb_switch 2019-01-02 21:59:41 -05:00
Ryan Mulligan 5f8594e094
Merge pull request #53174 from r-ryantm/auto-update/sc-controller
sc-controller: 0.4.6 -> 0.4.6.1
2019-01-02 14:03:10 -08:00
Timo Kaufmann 801a548183 vimUtils: fix map parentheses 2019-01-02 22:59:19 +01:00
Timo Kaufmann f38363387e vimUtils: apply pluginToDrv recursively
This is necessary to handle plugin dependencies which also may be
strings.
2019-01-02 22:12:27 +01:00
Frederik Rietdijk 092e3b50a8 Merge master into staging-next 2019-01-02 21:08:27 +01:00
Vladimír Čunát 70bff06140
Merge branch 'master' into staging 2019-01-02 17:19:23 +01:00
R. RyanTM 8726301d33 sc-controller: 0.4.6 -> 0.4.6.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sc-controller/versions
2019-01-01 20:43:27 -08:00
Yegor Timoshenko f5d4254972 vim-parinfer: init (#53140) 2019-01-01 20:33:57 +01:00
Timo Kaufmann a0dc57e27b
vimUtils: derive pname from the plugin string (#53121)
For backwards compatibility. The user may specify their own plugins
without the pname attribute. In that case the attrname of the plugin
(given as a string) is the pname.

Fixes #53112
2018-12-31 16:26:06 +01:00
Frederik Rietdijk 070290bda7 Merge master into staging-next 2018-12-31 12:00:36 +01:00
Timo Kaufmann 093cfde1e0 vimUtils: fix requiredPlugins
I broke this in #52767 and didn't notice because I only tested with vim
and `requiredPlugins` is only used by neovim. This would break setups
that use string-plugins (like pathogen) with neovim.
2018-12-31 10:31:14 +01:00
Roman Volosatovs f8ff164806 vimPlugins: Fix update.py, update (#53081) 2018-12-30 18:13:00 +01:00
Frederik Rietdijk 26e5c0f07a
Merge pull request #51846 from veprbl/pr/pyqt5_opt_qtwebkit
pyqt5: make qtwebkit optional, disable by default
2018-12-30 16:34:39 +01:00
Timo Kaufmann 30ff3e0f39
vimUtils.buildVimPlugin: fix helptag generation (#53071)
I messed that up in my refactoring in #52767, since I moved the relevant
bash code out of a function and failed to adjust the shell variable
name. Now the plugin build will fail loudly when help tag generation
fails to make sure this doesn't happen again.
2018-12-30 12:22:17 +01:00
Dmitry Kalinkin 16f11dff3f
frescobaldi: add explicit dependency on sip 2018-12-29 22:54:03 -05:00
Silvan Mosberger 50a5902319
Merge pull request #52513 from ceedubs/init-vim-lsc
vim-lsc: init at fe6d3bd
2018-12-29 22:25:02 +01:00
ash lea ace58271af dolphinEmuMaster: 2018-09-24 -> 2018-12-25 (#52917) 2018-12-29 20:34:53 +01:00
Timo Kaufmann 22d0f320e8
Merge pull request #52767 from timokau/vim-plugin-updates
Fix vim-plugin dependencies
2018-12-28 13:48:21 +01:00
Timo Kaufmann 58b4351b38 vimPlugins.taglist-vim: fix build
The override actually broke the build, no idea why it was added
originally. The build works fine without it.
2018-12-28 13:31:58 +01:00
Frederik Rietdijk 10afccf145 Merge staging-next into staging 2018-12-27 18:11:34 +01:00
Dmitry Kalinkin 20d60c8238
treewide: use pythonPackages.pyqt5_with_qtwebkit where QtWebKit is needed 2018-12-27 09:14:21 -05:00
Timo Kaufmann af465293f1 vimPlugins: use fixed point 2018-12-27 11:55:53 +01:00
Timo Kaufmann 96b6396101 vimUtils.buildVimPlugin: derive name from pname and version 2018-12-27 10:34:14 +01:00
Timo Kaufmann edf8b984fa vimPlugins: Update 2018-12-27 10:32:27 +01:00
Jan Tojnar c45e9d0fac
Merge branch 'master' into staging 2018-12-25 17:03:57 +01:00
Jan Tojnar 4c5a5dc627
Merge pull request #52715 from jtojnar/poppler-0.72
poppler: 0.67.0 → 0.72.0
2018-12-25 16:34:54 +01:00
Timo Kaufmann 8e8a09bfc9 vimUtils: add dependency logic to nativeImpl
nativeImpl previously simply ignored dependency information.
2018-12-24 23:41:44 +01:00
Timo Kaufmann b352318cd1 vimUtils: represent vim plugins as derivations
Vim plugins were previously represented as strings by default,
necessitating a `knownPlugins` set. Backwards compatibility is kept
(strings are still accepted), so vam plugins should continue to work.
2018-12-24 23:41:41 +01:00
Timo Kaufmann ce7899bea5 vimPlugins.ncm2-jedi: init at 2018-07-18 2018-12-24 23:40:44 +01:00
José Romildo Malaquias 5b1fb49416 matcha: move to pkgs/data/themes 2018-12-24 18:10:13 -02:00
José Romildo Malaquias dd915395c4 matcha: 2018-11-12 -> 2018-12-24 2018-12-24 18:04:05 -02:00
Sander van der Burg a27aa247c0
Merge pull request #50596 from svanderburg/mobile-updates
Mobile updates
2018-12-24 15:52:33 +01:00
Jan Tojnar ef935fa101
Merge branch 'master' into staging 2018-12-24 15:02:29 +01:00
Timo Kaufmann 1e25b748fa vimPlugins: Update 2018-12-23 23:30:11 +01:00
R. RyanTM c6436ab382 sc-controller: 0.4.5 -> 0.4.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sc-controller/versions
2018-12-23 11:06:44 +01:00
Jan Tojnar 6d36caab18
cups-filters: 1.20.4 → 1.21.6 2018-12-23 02:39:47 +01:00
Samuel Dionne-Riel 3c38cc8058
Merge pull request #51813 from samueldr/aarch64/disable-non-arm-builds-part-1
aarch64: ZHF for aarch64 (1/??)
2018-12-20 21:06:52 -05:00
Will Dietz ec040d9b22 cups: drop patches
(cherry picked from commit 085a74cb42074384958c23bd762af589da570042)
2018-12-20 10:43:36 -06:00
Maximilian Bosch 87e637df10
Merge pull request #52483 from marsam/init-vimplugins-recover-vim
vimPlugins.Recover-vim: init at 2018-10-22
2018-12-20 13:09:53 +01:00
Lengyel Balazs a960696f71 wineStable: 3.0.3 -> 3.0.4 2018-12-19 16:55:08 -05:00
Lengyel Balazs 80a1d934b8 winetricks: 20180815 -> 20181203 2018-12-19 16:55:08 -05:00
Matthew Bauer df90fdf62b
Merge pull request #51301 from timor/libretro-dolphin-dep-fix
libretro.dolphin: add missing dependencies to fix build
2018-12-19 12:05:03 -06:00
Matthew Bauer 762c3d730f
Merge pull request #52011 from r-ryantm/auto-update/snes9x-gtk
snes9x-gtk: 1.56.2 -> 1.57
2018-12-19 11:00:02 -06:00
Renaud 433b867b61
Merge pull request #52520 from romildo/upd.plano-theme
plano-theme: 3.28-3 -> 3.30-1
2018-12-19 15:55:44 +01:00
José Romildo Malaquias 9f934e8efc shades-of-gray-theme: 1.1.1 -> 1.1.3 2018-12-19 10:48:29 -02:00
José Romildo Malaquias 91e1e2fd92 plano-theme: 3.28-3 -> 3.30-1 2018-12-19 10:28:40 -02:00
Florian Klink f6ab103cf1 Revert "brlaser: fix $out"
This reverts commit 04405f65f9.

This was already fixed in https://github.com/NixOS/nixpkgs/pull/49180,
but never got backported to 18.09.
2018-12-19 10:58:53 +01:00
Florian Klink 15ecc67c21
Merge pull request #52502 from flokli/brlaser-fix-out
brlaser: fix $out
2018-12-19 09:58:20 +01:00
Will Dietz 61e9fc2e52 cups: 2.2.9 -> 2.2.10
https://www.cups.org/blog/2018-12-07-cups-2.2.10.html
2018-12-19 09:21:54 +01:00
Will Dietz bf174887e5 cups: 2.2.6 -> 2.2.9
https://github.com/apple/cups/releases/tag/v2.2.9
https://github.com/apple/cups/releases/tag/v2.2.8
https://github.com/apple/cups/releases/tag/v2.2.7
2018-12-19 09:21:54 +01:00
Cody Allen 4699d76d98
vim-lsc: init at fe6d3bd
`natebosch/vim-lsc` is a language server client plugin for vim/neovim. This commit
adds it to the `vim-plugin-names` file and the generated vim-plugins
file.

This is a reboot of #52407 that doesn't call the `update.py` script for
vim plugins, because doing so led to quick merge conflicts. Let me know
if there is a preferred way to do this.
2018-12-18 20:04:40 -08:00
Alexander V. Nikolaev 946e6af857 wine{Unstable,Staging}: 3.20 -> 4.0-rc2
Disabling the build of regression tests was proposed in #51341
but this change has been postponed until we reach a concensus.
2018-12-18 21:29:23 -05:00
Florian Klink 04405f65f9 brlaser: fix $out 2018-12-19 01:18:02 +01:00
Sander van der Burg 53550c826d Port packages with Android dependencies to new androidenv 2018-12-18 21:16:06 +01:00
Edmund Wu ceb89f042e vscode-extensions.WakaTime.vscode-wakatime: 1.2.4 -> 1.2.5 2018-12-18 14:08:08 -05:00
Edmund Wu d8b5275d43 vscode-extensions.ms-python.python: 2018.11.0 -> 2018.12.1 2018-12-18 12:27:44 -05:00
Mario Rodas a506fb228d
vimPlugins.Recover-vim: init at 2018-10-22 2018-12-18 08:15:42 -05:00
Jörg Thalheim 6b69a8c8f5
Merge pull request #51935 from neonfuz/retroarch-menu-fix
retroarch: Remove --menu from wrapper
2018-12-18 10:44:09 +00:00
Roman Volosatovs 8c836fab9c
vimPlugins: Update 2018-12-15 13:48:38 +01:00
Matthew Bauer 9a06f08d85
Merge pull request #51847 from plapadoo/fix-epsxe
epsxe: add libGLU_combined to buildInputs
2018-12-14 22:19:45 -06:00
R. RyanTM c6cb93339f snes9x-gtk: 1.56.2 -> 1.57
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/snes9x-gtk/versions
2018-12-14 00:53:57 -08:00
Sage Raflik b33fc4e618 retroarch: Remove --menu from wrapper 2018-12-13 02:20:31 -08:00
Alyssa Ross 64f73752fc
Merge pull request #51928 from neonfuz/retroarch-1.7.5
retroarch: 1.7.1 -> 1.7.5
2018-12-13 10:17:55 +00:00
Sage Raflik 8cccab7bf4 retroarch: 1.7.1 -> 1.7.5 2018-12-12 21:11:01 -08:00
Rok Garbas 7cbb09a2ec vimPlugins: update all plugins to latest and adding vimux and neovim-sensible plugins 2018-12-12 22:09:39 +01:00
Philipp Middendorf f4ea6fd287 epsxe: add libGLU_combined to buildInputs
This fixes #51845.
2018-12-10 22:41:22 +01:00
Samuel Dionne-Riel 38d6719cbc blastem: Disables build for aarch64-linux. 2018-12-10 14:55:20 -05:00
Robert Schütz 25de143c84 seafile-shared: 6.2.8 -> 6.2.9 2018-12-10 15:50:29 +01:00
Jörg Thalheim d81439db9b
Merge pull request #51785 from rvolosatovs/update/vim-plugins
vimPlugins: Update
2018-12-09 23:46:50 +00:00
Roman Volosatovs 75a1dfbe75
vimPlugins: Update 2018-12-09 16:24:46 +01:00
Tor Hedin Brønner 0ed7d3c62a ghostscript: 9.25 -> 9.26 2018-12-08 19:15:06 +01:00
Frederik Rietdijk e0950ae9ad Merge master into staging-next 2018-12-08 12:40:13 +01:00
Alyssa Ross 0e8e02e686
Merge pull request #51214 from rnhmjoj/wine
winePackages.wine: add SDL support
2018-12-07 22:44:13 +00:00
Frederik Rietdijk 5f554279ec Merge master into staging-next 2018-12-07 15:22:35 +01:00
Robert Schütz 3df463d351 seafile-shared: 6.2.7 -> 6.2.8 2018-12-07 14:16:26 +01:00
Tom Bereknyei b17eaa3aa9 scrcpy: 1.3 -> 1.5 2018-12-06 21:27:45 -05:00
Dmitry Kalinkin c64e5ccc2f
Merge pull request #51419 from eadwu/vscode-extensions.ms-python.python/2018.11.0
vscode-extensions.ms-python.python: 2018.10.1 -> 2018.11.0
2018-12-04 15:23:01 -05:00
Dmitry Kalinkin 9dec684c89
Merge pull request #51420 from eadwu/vscode-extensions.WakaTime.vscode-wakatime/1.2.4
vscode-extensions.WakaTime.vscode-wakatime: 1.2.3 -> 1.2.4
2018-12-04 15:21:28 -05:00
José Romildo Malaquias c46915c9c1 materia-theme: move to pkgs/data/themes 2018-12-04 10:56:57 -02:00
José Romildo Malaquias eff0cf020f materia-theme: 20181115 -> 20181125 2018-12-04 10:50:48 -02:00
Roman Volosatovs d59498f653
vimPlugins: update 2018-12-03 13:08:10 +01:00
Frederik Rietdijk a510aa2672 Merge master into staging-next 2018-12-03 12:18:43 +01:00
Edmund Wu 70092febc4
vscode-extensions.WakaTime.vscode-wakatime: 1.2.3 -> 1.2.4 2018-12-02 19:34:22 -05:00