Commit graph

3368 commits

Author SHA1 Message Date
Jon Banafato 37c1c427f5 seafile-shared: update hash
`seafile-client` does not build successfully because of a hash mismatch
in `seafile-shared`. The old hash appears to point to commit
`b7f2be78c1d979ff1242c3b65b41228e31427843` rather than
`ea8f5e2b45612d77fee9934f942d1d7d55560dad`, which is the commit that the
`v6.2.10` tag currently references.
2019-01-16 00:44:44 +01:00
Robert Schütz 862f762708 seafile-shared: 6.2.9 -> 6.2.10 2019-01-15 11:14:25 +01:00
Jörg Thalheim ff0dc34c1d
Merge pull request #48752 from jorsn/new.epson-workforce-635-nx625-series
epson-workforce-635-nx625-series: init at 1.0.1
2019-01-14 11:02:02 +00:00
R. RyanTM df3ebbea60 libdsk: 1.5.8 -> 1.5.9 (#52849)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libdsk/versions
2019-01-13 22:39:03 +01:00
Vladimír Čunát bde8efe792
Merge branch 'master' into staging-next
A couple thousand rebuilds have accumulated on master.
2019-01-12 12:19:34 +01:00
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