3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2154 commits

Author SHA1 Message Date
Jörg Thalheim 6bbc02589b Merge pull request #25003 from romildo/upd.greybird
greybird: 2017-02-26 -> 3.22.3
2017-04-19 14:01:50 +02:00
Jörg Thalheim 032cf416ef Merge pull request #25002 from romildo/upd.flat-plat
flat-plat: 2016-12-03 -> 20170323
2017-04-18 21:41:34 +02:00
Masayuki Takeda 733cc23a1b
slock: add configFile support
fixes #24994
2017-04-18 21:06:17 +02:00
romildo ca3d37ffbe greybird: 2017-02-26 -> 3.22.3 2017-04-18 13:54:31 -03:00
romildo e7a3186d28 flat-plat: 2016-12-03 -> 20170323 2017-04-18 13:41:10 -03:00
Vladimír Čunát 7644651e62
desmume: fix mesa+osmesa
It builds fine, but some better testing should be done before merging.
2017-04-16 11:21:28 +02:00
Kamil Chmielewski 78635ce26b vim-elixir: 2017-03-29 -> 2017-04-13 2017-04-13 18:46:37 +02:00
Alexander V. Nikolaev 3ec56d8da2 wineUnstable: 2.4 -> 2.5 2017-04-10 18:37:28 +03:00
Peter Simons 4e307b644a Merge pull request #24760 from matthewbauer/linux-only-pkgs
Mark linux-only pkgs
2017-04-09 14:18:10 +02:00
Matthew Bauer 2a2e9b8f2e
xautolock: make linux-only 2017-04-08 23:34:52 -05:00
Dan Peebles aa31d4b803 cups: fix on Darwin
Kinda fix, anyway. Enough to proceed with other stuff :)
2017-04-06 20:13:33 -04:00
Jean Potier 09b1414acd cups-toshiba-estudio: init at 7.51 (#24676) 2017-04-06 15:00:02 +01:00
Dan Peebles 8b65437aae Merge branch 'master' into staging 2017-03-30 12:54:41 -04:00
Robin Gloster f0512f4ceb
wxmupen64plus: fix eval 2017-03-30 17:36:43 +02:00
Robin Gloster 5c04b32b6c
wxmupen64plus: mark as broken 2017-03-30 16:23:35 +02:00
Robin Gloster cc82423366
freestyle: mark as broken 2017-03-30 16:23:33 +02:00
Joachim F c5a99f89e6 Merge pull request #24272 from therealpxc/ppsspp
ppsspp: 1.1.0 -> 1.3
2017-03-30 14:15:56 +01:00
Jörg Thalheim ded2876073 Merge pull request #24467 from kamilchm/vim-go
vim-go: 2017-02-19 -> 1.12
2017-03-30 10:19:35 +02:00
Kamil Chmielewski c916e2ce98 vim-go: 2017-02-19 -> 1.12 2017-03-30 09:18:07 +02:00
Kamil Chmielewski 835a692e9c vim-elixir: 2017-02-21 -> 2017-03-29 2017-03-30 08:16:23 +02:00
Tuomas Tynkkynen 49f1abec15 U-Boot: 2017.01 -> 2017,03 2017-03-30 02:56:02 +03:00
Daiderd Jordan f51ce6f929 Merge pull request #24417 from edanaher/fix-vim-youcompleteme
Fix vim youcompleteme
2017-03-29 20:35:51 +02:00
Vladimír Čunát 72bb7b399a
Merge #24392: cups-dymo: patch upstream for cups 2.2 2017-03-29 13:57:07 +02:00
Jude Taylor 7ebc75a9a6 Merge pull request #24353 from edanaher/fix-vim-knownplugins
vim-utils: Handle overriding knownPlugins betters.
2017-03-28 14:08:35 -07:00
Evan Danaher c46e2d1903 vim-plugins: bump youcompleteme version.
This fixes a bad interaction with Supertab.
2017-03-28 16:07:51 -04:00
makefu 892c418f5d
cups-dymo: patch upstream for cups 2.2 2017-03-27 23:27:47 +02:00
Vladimír Čunát 96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Vladimír Čunát 036f4b2f04
cups: fix #24339: broken paths in cups-config
Note: this doesn't fix cups-dymo by itself.
It causes a slightly nontrivial rebuild on Linux.
2017-03-27 18:56:59 +02:00
ndowens 9aff9981a4 Merge pull request #24265 from ndowens/mxt-app
mxt-app:1.26 -> 1.27
2017-03-26 17:21:51 -05:00
Vladimír Čunát 455ce3528c
Merge branch 'staging' 2017-03-24 21:07:55 +01:00
Patrick Callahan 75f5ed2489 ppsspp: 1.1.0 -> 1.3 2017-03-24 10:40:24 -07:00
Dan Peebles 306f2c65fe zsnes: only build on Linux
It uses callPackage_i686 which forces Linux anyway, and the current setup
just means that we end up with a weird i686-linux job under Darwin.
2017-03-23 22:41:45 -04:00
ndowens 9512f6bb94 mxt-app:1.26 -> 1.27 2017-03-23 20:15:14 -05:00
Vladimír Čunát c1a9dc3d37
Merge branch 'master' into staging 2017-03-23 13:31:28 +01:00
Herwig Hochleitner a634f0b12c wine: 2.3 -> 2.4
winetricks: 20170207 -> 20170316
2017-03-22 01:14:07 +01:00
Herwig Hochleitner e9a1fc72e0 wine: 2.2 -> 2.3 2017-03-22 01:09:07 +01:00
Herwig Hochleitner 7069b8938d wine: 2.1 -> 2.2 2017-03-22 01:09:03 +01:00
Pascal Wittmann 3411061002 xlockmore: 5.50 -> 5.51 2017-03-21 13:51:43 +01:00
Frederik Rietdijk 94eb74eaad Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-21 13:04:37 +01:00
Frederik Rietdijk 3760c8c7fd Python: replace mkPythonDerivation with buildPythonPackage and format="other";
This way all Python packages use the same function,
`buildPythonPackage`.
2017-03-21 13:01:49 +01:00
Nikolay Amiantov 8eabb34e5f odroid-xu3-bootloader: use 1MB-capable bootloader
(cherry picked from commit 7d66259a777fd1b1930eca26f08236f657529e25)
2017-03-21 04:23:36 +03:00
Robin Gloster 10239a084f
packetbeat: 5.2.1 -> 5.2.2, build from source 2017-03-20 23:01:42 +01:00
Robin Gloster 4d08d1aa8f
metricbeat: 5.2.1 -> 5.2.2, build from source 2017-03-20 23:01:42 +01:00
Robin Gloster 66d0c4b1bd
heartbeat: 5.2.1 -> 5.2.2, build from source 2017-03-20 23:01:41 +01:00
Robin Gloster a0d087b6fe
filebeat: 5.2.1 -> 5.2.2, build from source 2017-03-20 23:01:39 +01:00
Tristan Helmich 8338506abe
packetbeat: init at 5.2.1 2017-03-20 22:37:44 +01:00
Tristan Helmich 9fe3b0eb13
filebeat: init at 5.2.1 2017-03-20 22:37:18 +01:00
Tristan Helmich 9fce67264d
metricbeat: init at 5.2.1 2017-03-20 22:37:17 +01:00
Tristan Helmich 9dfb7e42ad
heartbeat: init at 5.2.1 2017-03-20 22:37:13 +01:00
Nikolay Amiantov 179fe96a03 Merge pull request #24112 from abbradar/odroid
Add ODROID-XU{3,4} support
2017-03-20 17:44:09 +03:00
Jörg Thalheim c031adedba
hplip: 3.16.5 -> 3.16.11
fixes #24109
2017-03-20 11:18:41 +01:00
Nikolay Amiantov a9d44b5c30 ubootOdroidXU3: init 2017-03-20 11:07:12 +03:00
Evan Danaher c34aa75d30 vim-utils: Handle overriding knownPlugins betters. 2017-03-19 18:44:02 -04:00
Michael Raskin 846b6d250a Merge pull request #23256 from edanaher/ensime
Ensime
2017-03-18 18:24:19 +01:00
Tuomas Tynkkynen aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
2017-03-14 00:49:22 +02:00
Vladimír Čunát 50fadc8b18
cups: split the $lib output
This saves > 10 MB from most closures.
Printing test succeeds on x86_64-linux.
2017-03-12 18:36:30 +01:00
Vladimír Čunát 2e4c5711a2
cups: minor expression refactoring 2017-03-12 16:43:26 +01:00
Vladimír Čunát b8685ddf68
cups: 2.1.4 -> 2.2.2
The changelog seems safe, test succeeds on x86_64-linux.
2017-03-12 16:43:02 +01:00
Lluís Batlle i Rossell a2737b1fdf vlock: improve eintr patch 2017-03-11 10:00:06 +01:00
Jörg Thalheim 23990a9044 Merge pull request #23626 from yurrriq/update/pkgs/tools/misc/lilypond-with-fonts
lilypond-with-fonts: fix typos
2017-03-09 01:41:18 +01:00
Tuomas Tynkkynen 413bc03986 mess: Mark broken
Even fixing the source urls doesn't make it build.
2017-03-08 16:14:19 +02:00
Eric Bailey 90c5c9d8c9
lilypond-with-fonts: fix typos
In development, I experimented with file globs, for loops and making the
supplementary fonts optional. As such, the original PR ended up with a
dysfunctional combination.

This commit fully adopts the for loop approach, which I prefer, since failing
matches, e.g. missing supplementary-fonts/, won't cause a failure.
2017-03-07 23:02:26 -06:00
Franz Pletz 99ef5c84b4
cups-pk-helper: 0.2.5 -> 0.2.6 2017-03-07 11:27:18 +01:00
Anderson Torres e96a2f8450 sound-of-sorting: 0.6.5 -> 20150721 (#23549)
* sound-of-sorting: 0.6.5 -> 20150721

* sound-of-sorting: correct unstable version format
2017-03-06 15:24:40 +01:00
Jörg Thalheim d971a9bcca Merge pull request #23548 from yurrriq/update/pkgs/misc/lilypond/with-fonts
lilypond: add openlilylib-fonts and lilypond-with-fonts
2017-03-06 14:37:20 +01:00
Vi Po 133245f961
epson-escpr: 1.6.8 -> 1.6.12
Improve documentation
2017-03-06 08:31:36 -05:00
Eric Bailey f497421e14
lilypond-with-fonts: use all fonts by default
Add a list of all fonts to openlilylib-fonts and use that as the default
fonts argument to lilypond-with-fonts.
2017-03-06 04:34:08 -06:00
romildo 810bf85bfa greybird: 2017-02-17 -> 2017-02-26 2017-03-06 07:26:07 -03:00
Eric Bailey bdc9589df1
lilypond: add openlilylib-fonts and lilypond-with-fonts 2017-03-06 02:16:42 -06:00
Jörg Thalheim c31c11ecef Merge pull request #23482 from rardiol/pcsxr
pcsxr: remove name conflict with zlib 1.2.9
2017-03-06 08:59:13 +01:00
Daiderd Jordan 5262f5e3a2 vim-plugins: add some more plugins 2017-03-04 13:16:46 +01:00
Daiderd Jordan f14b001e27 vim-plugins: update with https sources 2017-03-04 13:16:46 +01:00
Daiderd Jordan 8977b1f2ee vim-plugins: use https for github repositories 2017-03-04 13:16:46 +01:00
Ricardo Ardissone 92d8680785 pcsxr: remove name conflict with zlib 1.2.9 2017-03-04 08:36:06 -03:00
Lluís Batlle i Rossell 1bd3fa6210
vlock: fix ENOPATCH
Thanks, @dtzWill.

Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
2017-03-04 09:19:20 +01:00
Lluís Batlle i Rossell c2291aae44
vlock: fix EINTR handling
Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
2017-03-03 21:18:56 +01:00
Benno Fünfstück 1f7fe3dc07 vbam: fix location of etc in output
Shell variables are not expanded in cmakeFlags, so the etc files ended up in
`$out/'$out'/etc` instead of the expected `$out/etc`.
2017-03-03 12:27:49 +01:00
Christoph Hrdinka c4eee0c4f1
retroarch.beetle-saturn: set platforms to x86_64-linux
cc #23253.

Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
2017-02-28 15:18:06 +01:00
Evan Danaher 4b9ec73288 vim-plugins: Add ensime-vim and dependencies. 2017-02-27 12:37:00 -05:00
Evan Danaher dcab427908 vim-plugins: Add infrastructure for python[3]Dependencies.
This allows vim plugins to specify python dependencies required at
runtime, and they will be added to the python environment.
2017-02-27 12:36:03 -05:00
Jörg Thalheim 1861733b90 Merge pull request #23206 from yurrriq/add/pkgs/misc/lilypond/unstable
lilypond-unstable: init at 2.19.24
2017-02-27 08:29:12 +01:00
Eric Bailey de597b03f7
lilypond-unstable: init at 2.19.24 2017-02-26 03:41:58 -06:00
Bart Brouns 6992824ec1 jack2-unstable: 2016-08-18 -> 2017-02-23 2017-02-26 10:17:38 +01:00
Edward Tjörnhammar a78b801c54 Merge pull request #23176 from hrdinka/retroarch/mednafen2beetle
retroarch: libretro-mednafen-* -> libretro-beetle-*
2017-02-26 09:32:52 +01:00
Thomas Tuegel 0ed156a216 Merge pull request #22977 from ttuegel/triage-kde4
Remove KDE 4 desktop packages
2017-02-25 12:21:44 -06:00
Christoph Hrdinka 1aaf2be2a0
retroarch: libretro-mednafen-* -> libretro-beetle-*
Rename all mednafen-* libretro ports to beetle-* due #23163.

Closes #23163.

Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
2017-02-25 16:19:09 +01:00
Arseniy Seroka 4610fc9310 Merge pull request #23172 from symphorien/plugins
Plugins
2017-02-25 17:06:34 +03:00
Symphorien Gibol ac59309f69 vimPlugins.vim-indent-object: init at 2015-08-11 2017-02-25 14:57:41 +01:00
Symphorien Gibol d95dd3df28 vimPlugins.argtextobj: init at 2010-10-17 2017-02-25 14:44:16 +01:00
Thomas Tuegel f344817a3e
Remove Oxygen GTK themes
- Not useful without the KDE 4 desktop
2017-02-24 16:49:01 -06:00
Thomas Tuegel 25378a6aa0
Remove kde4.qtcurve
- Not useful without the KDE 4 desktop
2017-02-24 16:49:01 -06:00
Joachim F a9555f580e Merge pull request #23141 from romildo/upd.greybird
greybird: 2016-11-15 -> 2017-02-17
2017-02-24 18:55:03 +01:00
Joachim F ad0770fb42 Merge pull request #23144 from romildo/upd.numix-gtk-theme
numix-gtk-theme: 2016-11-19 -> 2017-02-15
2017-02-24 18:50:48 +01:00
Joachim F 63d251f2e3 Merge pull request #23147 from romildo/upd.zuki-themes
zuki-themes: 2016-10-20 -> 2017-02-17
2017-02-24 18:50:22 +01:00
romildo b474c5cd30 zuki-themes: 2016-10-20 -> 2017-02-17 2017-02-24 07:49:15 -03:00
romildo 9ae7fb4b60 numix-gtk-theme: 2016-11-19 -> 2017-02-15 2017-02-24 06:48:09 -03:00
romildo e27a7a3686 greybird: 2016-11-15 -> 2017-02-17 2017-02-24 06:22:42 -03:00
romildo 5b2199fcc6 blackbird: 2016-07-04 -> 2017-02-20 2017-02-24 05:45:11 -03:00
Shea Levy c71bae0330 long-shebang: 1.1.0 -> 1.2.0 2017-02-23 18:27:12 -05:00
Vladimír Čunát 145d3ea81c
Merge branch 'master' into staging 2017-02-22 17:47:49 +01:00