3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2072 commits

Author SHA1 Message Date
Vladimír Čunát 455ce3528c
Merge branch 'staging' 2017-03-24 21:07:55 +01: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
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
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