1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-15 17:25:11 +00:00
Commit graph

2096 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
Charles Strahan 0fe9b1e203
vim-plugins: use ycmd package for youcompleteme 2017-02-10 01:10:54 -05: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
Vladimír Čunát d442a0ffc0
wine*: fixup build by using older flex 2017-01-06 16:25:37 +01:00
Vladimír Čunát 75fc704cfe
treewide: more fixes of phases after bash 4.3 -> 4.4 2017-01-06 14:05:22 +01:00
Matthias Beyer eb07e35554 pipes: 1.1.0 -> 1.2.0 2017-01-04 16:29:30 +01:00
Rok Garbas 2c88414274 vimPlugins: update to latest 2017-01-04 10:53:27 +01:00
Herwig Hochleitner cd9edbb15b wine: 1.8.4 -> 1.8.6
wine: 2.0-rc2 -> 2.0-rc3
winetricks: 20160724 -> 20170101
2017-01-02 13:20:19 +01:00
Daiderd Jordan 2c288548b9 Merge pull request #21574 from veprbl/ycm_fix
youcompleteme: fix compilation
2017-01-02 00:10:04 +01:00
Dmitry Kalinkin f37c7e01d5
youcompleteme: fix compilation
1) Replace --system-libclang with an explicit setting for the path to
nix libclang 3.9. Otherwise it will find system's libclang on darwin.

2) Remove clang/llvm from build inputs. This prevents ycm itself from
being compiled by clang 3.9. stdenv's standard compiler (gcc or
clang 3.7) will suffice.

3) Enable C++11 again as #16212 is caused by incopatibility between
clang 3.9 and libc++ 3.7, but we don't compile YCM with clang 3.9, so
this is not needed anymore.
2017-01-01 17:35:16 -05:00
Bart Brouns 59dbcefaa7
physlock: git-20150126 -> 0.5 2016-12-30 22:45:56 -05:00
Alexander V. Nikolaev 76b5f2c249 wineUnstable: 1.9.23 -> 2.0-rc2
Update staging as well
2016-12-22 16:06:18 +02:00
Balletie bf82db37d2
light-locker: Conform meta.description to CONTRIBUTING 2016-12-18 19:38:12 +01:00
Balletie 786b5dd07b
light-locker: use systemd/logind instead of UPower
Since systemd has been adopted for a while now, we should switch to
using it for light-locker as well. So I disabled ConsoleKit/UPower
support in favor of using systemd with logind. This fixed many issues
for me, and made light-locker working again.

I followed the PKGBUILD of Arch's package in determining the right
configure flags. See: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/light-locker
2016-12-18 19:26:58 +01:00
Will Dietz b035da2e4d Add vim-markdown plugin.... 2016-12-14 17:29:52 -06:00
Daniel Brockman 8c0f4755bd urbit: 2016-06-02 -> 0.4 (#20922) 2016-12-13 15:43:02 +01:00
romildo 500816150f flat-plat-gtk-theme: remove build dependency on gnome-shell 2016-12-10 07:11:30 -02:00
romildo 8bdf8b7b51 flat-plat-gtk-theme: eba3be5 -> 2016-12-03 2016-12-09 19:31:35 -02:00
Joachim F 67b79c32f5 Merge pull request #20990 from romildo/upd.numix-gtk-theme
numix-gtk-theme: 2016-06-12 -> 2016-11-19
2016-12-08 11:30:53 +01:00
Joachim F b5116b8b12 Merge pull request #20984 from romildo/upd.paper-gtk-theme
paper-gtk-theme: 2016-05-27 -> 2016.08-16
2016-12-08 11:30:14 +01:00
romildo 0a09969693 numix-gtk-theme: 2016-06-12 -> 2016-11-19 2016-12-07 18:45:25 -02:00
romildo 1678119dcc paper-gtk-theme: 2016-05-27 -> 2016.08-16 2016-12-07 17:38:07 -02:00
romildo 1039d9d7eb arc-theme: 2016-10-13 -> 2016-11-25 2016-12-07 16:52:34 -02:00
Joachim F 583e5cfa0d Merge pull request #20881 from romildo/new.e17gtk
e17gtk: init at 3.22.0
2016-12-07 05:25:30 +01:00
Tuomas Tynkkynen 1e7bb272e1 U-Boot: Add platforms to legacy U-Boots
Or they will be tried to be built on x86_64 since #19990.
2016-12-05 02:17:41 +02:00
romildo 650501f5b1 e17gtk: init at 3.22.0 2016-12-03 08:20:33 -02:00
romildo 3170266657 adapta-gtk-theme: 3.21.3.68 -> 3.89.1.66 2016-12-02 22:26:27 -02:00
Tuomas Tynkkynen 8a4d6516ee Merge remote-tracking branch 'upstream/staging' into master 2016-11-30 00:34:23 +02:00
Tuomas Tynkkynen 02e1846d62 U-Boot: 2016.05 -> 2016.11 2016-11-28 00:23:12 +02:00
Vladimír Čunát 925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
romildo a357777fc0 Greybird: 2016-09-13 -> 2016-11-15 2016-11-25 05:08:03 -02:00
Frederik Rietdijk 12d9fe12f0 urbit: use python2 2016-11-24 22:28:03 +01:00
Arseniy Seroka 39a0d766db Merge pull request #20678 from carlsverre/fix/ctrlp-cmatcher
Fix/ctrlp cmatcher
2016-11-24 22:53:15 +04:00
Arseniy Seroka c8e014e5a6 Merge pull request #20681 from carlsverre/add/cpsm
cpsm: init at 565ab53a66fa52c46d80adf6981b07f4bdffcb1d
2016-11-24 22:52:15 +04:00
Carl Sverre a7500ca12b cpsm: init at 565ab53a66fa52c46d80adf6981b07f4bdffcb1d 2016-11-24 00:16:24 -08:00
Carl Sverre 1d45e5d6c7 fix/ctrlp-cmatcher: add extra steps to additional-nix-code 2016-11-23 23:53:32 -08:00
Nikolay Amiantov be95ceaff2 treewide: quote URLs in my packages 2016-11-24 01:17:52 +03:00
Pascal Wittmann 703deb0bc0
slock: 1.3 -> 1.4
fixes CVE-2016-6866
2016-11-20 15:12:04 +01:00
Arseniy Seroka 57260d4c79 Merge pull request #20483 from steveeJ/vim-plugins-deoplete-go
vim-plugins/deoplete-go: init at 2016-11-12
2016-11-18 23:35:21 +04:00
Michael Raskin fd0d7229ff Merge pull request #20519 from avnik/wine-update
wine-unstable: 1.9.22 -> 1.9.23
2016-11-18 11:22:19 +00:00
Alexander V. Nikolaev edcfa0f3fa wine-unstable: 1.9.22 -> 1.9.23 2016-11-18 13:16:02 +02:00
Pascal Wittmann ec6e4689ea xlockmore: 5.47 -> 5.49 2016-11-17 22:34:03 +01:00
Stefan Junker da23970660 vim-plugins/deoplete-go: init at 2016-11-12 2016-11-17 18:23:33 +01:00
Jaka Hudoklin f4780da125 vimPlugins/vim-jsdoc: init at 0kr4p01p 2016-11-17 13:07:38 +01:00
Joe Hermaszewski d6a3aaef89 vim-utils: fix typo 2016-11-13 12:07:10 +00:00
James Cunningham 5dee508acf vim plugins: add dracula theme 2016-11-10 16:24:45 +00:00
Arseniy Seroka d4d2e7fd9e Merge pull request #20237 from vcunat/p/vim-fixes
vim fixes
2016-11-09 12:22:45 +03:00
Vladimír Čunát 8e86d3d451 vim-plugins: add clighter8 2016-11-07 20:21:42 +01:00
Vladimír Čunát d8652a053b vimPlugins: auto-update
- Rename couldn't be fetched; new URL should be OK.
- Two plugins got re-ordered (added ad-hoc, apparently).
- ctrlp* is suspected to contain non-generated code;
  I left it untouched this round but it should be fixed.
  /cc @carlsverre for 71a94dfd9
2016-11-07 18:55:21 +01:00
Bart Brouns 78121c2118 build jack unstable without profiling 2016-11-07 12:59:05 +01:00
Michael Raskin 4bfa6989f0 wineUnstable: 1.9.20 -> 1.9.22 2016-11-04 08:58:17 +01:00
Alexander V. Nikolaev d89c3acced wineUnstable: 1.9.20 -> 1.9.22
Also update staging as well
2016-11-04 06:04:15 +02:00
Kier Davis 9f4114a740
samsung-unified-linux-driver_1_00_37: fix build failing due to upstream change in 'cups'
This commit should fix the package building to build due to https://github.com/NixOS/nixpkgs/issues/16238

Printing tested on M2875FD and M2675FN models. Scanning not tested yet due to lack of access of Samsung scanning devices.

All work in this commit is attributed to @jokogr. Content of this commit is basically copied+pasted from c41e771a38
2016-11-02 15:13:46 +00:00
Frederik Rietdijk 84174c0cb8 libjack2Unstable: and remove the old file
that I forgot to stage.
2016-11-02 14:54:48 +01:00
Frederik Rietdijk ab0ac18279 libjack2Unstable: fix evaluation
broken by f64933596c
2016-11-02 14:20:58 +01:00
Bart Brouns d315ca4080 libjack2-git: 2015-09-03 -> 2016-08-18 2016-11-02 12:51:22 +01:00
Ioannis Koutras 270365a1ee samsung-unified-linux-driver: add 4.01.17 2016-11-01 19:19:53 +02:00
Dan Peebles 89915f8206 db45: remove outdated version 2016-11-01 03:10:13 +00:00
Frederik Rietdijk beef906d2e Merge pull request #19882 from FRidh/hplip
hplip: use mkPythonDerivation
2016-10-28 20:00:08 +02:00
Frederik Rietdijk 7077a270bf Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-26 13:06:43 +02:00
Frederik Rietdijk d9c7a14c6a hplip: use mkPythonDerivation
since hplip is a Python package that doesn't use setuptools. Note that a
setup.py is provided, however, using buildPythonPackage fails.
2016-10-26 10:46:53 +02:00
Jaka Hudoklin 48c94846c9 vim-plugins/editorconfig-vim: init at a459b8 2016-10-23 17:27:32 +02:00
Jaka Hudoklin 3ba12b3333 vim-plugins/auto-pairs: init at 1b3a1efb 2016-10-23 17:27:24 +02:00
Alexander Ried 459da7b86e gnome3: default to 3.22 (#19743)
* gnome3: default to 3.22

* zuki-themes: add src for gnome 3.22, remove 3.18

* gnome3_22.vte_290: copy from gnome3.20

* termite: use vte-select-text from gnome3_20
2016-10-22 19:54:20 +02:00
Frederik Rietdijk e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Vladimír Čunát 4d5b893002 Merge #19081: gnome-3.22
Also master commits are brought in.
2016-10-20 23:04:10 +02:00
Graham Christensen 8d9a2c191f Merge pull request #19681 from grahamc/ghostscript
ghostscript: 9.18 -> 9.20 for multiple CVEs
2016-10-19 20:58:45 -04:00
Graham Christensen 3c2306e216
ghostscript: 9.18 -> 9.20 for multiple CVEs: https://lwn.net/Vulnerabilities/703324/ 2016-10-19 08:09:17 -04:00
Frederik Rietdijk 481eea3280 lilypond: use python2 2016-10-18 23:16:09 +02:00
Frederik Rietdijk e7834d4ed9 jack2Full: use python2 2016-10-18 23:14:34 +02:00
Ram Kromberg 1e290ae75f mfcj6510dw: init at 3.0.0-1 2016-10-15 18:57:37 +03:00
romildo b59b353d4d theme-vertex: revert package renaming 2016-10-14 14:27:50 -03:00
Tim Steinbach 24de66ce48 Merge pull request #19541 from romildo/upd.themes
vertex-theme: 20160329 -> 20161009
2016-10-14 09:28:05 -04:00
romildo 6eef45e58e arc-theme: 2016-06-06 -> 2016-10-13 2016-10-14 06:59:55 -03:00
romildo 6ed72b2c1a vertex-theme: 20160329 -> 20161009 2016-10-14 06:38:30 -03:00
Vladimír Čunát 6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Michael Raskin 80ca889586 xscreensaver: 5.35 -> 5.36 2016-10-12 15:29:25 +02:00
Sander van der Burg 22a4d6bd54 fs-uae: 2.4.3 -> 2.8.0 2016-10-10 20:37:11 +00:00
AndersonTorres fd38aeafcd mgba: git-20160325 -> 0.5.1 2016-10-09 16:47:54 +02:00
Robin Gloster 30accf4d3e
treewide: fix licence -> license occurences 2016-10-09 12:45:32 +02:00
Nikolay Amiantov bc0970f1e3 zsnes: use more debian patches
Fixes #19343
2016-10-08 01:40:22 +03:00
Lorenzo Manacorda 3dab3b6fd6 vimPlugins: added Rename (#19298) 2016-10-06 18:34:39 +02:00
Edward Tjörnhammar 5b11c34b51
vimPlugins: added agda-vim vim-grammarous vim-easytags, updates 2016-10-05 15:11:20 +02:00
Michael Raskin 92675bb6e5 wineUnstable, wineStaging: 1.9.18 -> 1.9.20 2016-10-03 13:54:18 +02:00
Jörg Thalheim 4059854351
cups-kyocera: fix downloading of source
the site blocked use of curl
fixes #14167
2016-10-01 23:41:46 +02:00
Ivan Solyankin 226f62317c
cups-kyocera: init at 1.1203 2016-10-01 23:41:46 +02:00
Aneesh Agrawal fcee1d0b28
Remove redundant -DCMAKE_BUILD_TYPE=Release flags
Since commit 183d05a0 in 2012, this is the default.

fixes #18000
2016-10-01 16:13:41 +02:00
Michael Raskin 33ccf3abed xscreensaver: XScreenSaver actually needs GLU, so use mesa, not mesa_noglu 2016-09-28 10:05:12 +02:00
Joachim F 3177dd89bb Merge pull request #19008 from artuuge/epson-escpr
epson-escpr: 1.6.5 -> 1.6.8
2016-09-28 01:44:49 +02:00
artuuge 2168f2bf1b epson-escpr: 1.6.5 -> 1.6.8 2016-09-27 16:02:10 +02:00
Joachim F 81f47f7982 Merge pull request #18700 from yochai/master
mfcj470dw: split into mfcj470dwlpr and mfcj470dwcupswrapper
2016-09-27 12:56:05 +02:00
Eelco Dolstra cd901eac5f xscreensaver: Drop runtime dependency on mesa_noglu.dev and glu.dev 2016-09-26 19:58:52 +02:00
Yochai 3b548dacf4 mfcj470dw: split into mfcj470dwlpr and mfcj470dwcupswrapper 2016-09-26 18:26:52 +03:00
Frederik Rietdijk a07a60724b solfege: do not use top-level python packages 2016-09-26 11:10:50 +02:00
Frederik Rietdijk 7d4f8d29e7 gcdemu: do not use top-level python packages 2016-09-25 23:13:41 +02:00
Joachim F 25828b546f Merge pull request #18867 from carlsverre/add/ctrlp-cmatcher
ctrlp-cmatcher: init at 09-22-2016
2016-09-24 00:11:06 +02:00
Tobias Geerinckx-Rice 0a2f4e4d56 Merge pull request #17850 from regnat/hplip
hplip: Allow building with plugins on arm
2016-09-23 21:39:36 +02:00
Carl Sverre 71a94dfd93 ctrlp-cmatcher: init at 09-22-2016
Faster matcher for the ctrlp vim plugin.
2016-09-22 22:59:37 -07:00
Charles Strahan 358232f68a
cnijfilter2: fix build 2016-09-17 15:54:07 -04:00
Hoang Xuan Phu c678e121c4 vim-plugins: remove unused arguments 2016-09-17 16:45:34 +08:00
Hoang Xuan Phu 81cc672000 vim-plugins: add some more aliases 2016-09-17 16:44:56 +08:00
Hoang Xuan Phu 4ccbab01a9 vim-plugins: add acp, rainbow and vim-repeat 2016-09-17 16:40:15 +08:00