Commit graph

2092 commits

Author SHA1 Message Date
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