JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,988 Commits 1 Branch 0 Tags 12 GiB
6d46dcc9a7
Commit Graph

1765 Commits

Author SHA1 Message Date
Vladimír Čunát
81039713fa Merge branch 'master' into staging 
... to get the systemd update (rebuilding ~7k jobs).
 2016-05-26 16:50:22 +02:00
Arseniy Seroka
ff87996847 Merge pull request #15688 from AmatCoder/AmatCoder-mednaffe 
mednaffe: Fix segfault on shutdown
 2016-05-25 23:32:34 +03:00
Michael Raskin
e23d64b94c xscreensaver: 5.34 -> 5.35 2016-05-25 15:26:06 +02:00
AmatCoder
15dbdc5930 mednaffe: Fix segfault on shutdown 2016-05-25 06:30:40 +00:00
Rok Garbas
54f5872f06 vimPlugins: updating plugins 2016-05-24 15:37:08 +02:00
Vladimír Čunát
0b192a0976 Merge branch 'master' into staging 
That's to get mesa rebuild from master, as it's nontrivial.
 2016-05-23 09:02:10 +02:00
José Romildo Malaquias
7e390822d2 paper-gtk-theme: 6a5f14cfe697b0a829456a1fd560acdcddc6043f -> 2016-05-18 2016-05-22 10:39:02 -03:00
Vladimír Čunát
73f1f5eb39 imagemagick: split dev output to fix #9604 
Also fixup references to imagemagick.
 2016-05-22 13:41:15 +02:00
José Romildo Malaquias
9752218d40 paper-gtk-theme: moved from "pkgs/misc/themes/gtk3/" to "pkgs/misc/themes/" 2016-05-22 05:58:57 -03:00
José Romildo Malaquias
603db7fa6f numix-gtk-theme: 2.5.1 -> 2016-05-19 2016-05-20 11:52:31 -03:00
José Romildo Malaquias
2d4b6129f9 numix-gtk-theme: moved from "pkgs/misc/themes/gtk3/" to "pkgs/misc/themes/" 2016-05-20 11:21:42 -03:00
Rok Garbas
810a4dd656 vimPlugins.YankRing: fixing the build 2016-05-20 10:48:03 +02:00
Rok Garbas
4b2a5edd7c vimPlugins: update also fixes hashes due to change in fetchgit #15469 2016-05-20 10:40:11 +02:00
Charles Strahan
612d4a1684
mnemonicode: fix name 2016-05-19 16:19:18 -04:00
Charles Strahan
cd0d0944f9
mnemonicode: init at 2015-11-30 
mnemonicode is a set of routines which implement a method for encoding
binary data into a sequence of words which can be spoken over the phone,
for example, and converted back to data on the other side.
 2016-05-19 16:17:18 -04:00
Tuomas Tynkkynen
c857552da8 treewide: Make explicit that 'dev' output of libX11 is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
9d5ba6ba68 treewide: Make explicit that 'dev' output of libusb1 is used 2016-05-19 10:00:47 +02:00
Tuomas Tynkkynen
d1937cf11a treewide: Make explicit that 'dev' output of gtk2 is used 2016-05-19 10:00:38 +02:00
Vladimír Čunát
e429a4012e Merge #15360: xscreensaver: Fix xscreensaver-text 2016-05-17 09:13:59 +02:00
Rommel M. Martinez
7d06d451c3 moltengamepad-git: init at 2016-05-04 (#15462) 2016-05-17 08:09:33 +02:00
Rok Garbas
499195dfcf vimPlugins: updated existing plugins and added new ones 
- also added fzf manuall
- added following plugins to `vim-plugin-names` list:
    github:terryma/vim-expand-region
    github:rust-lang/rust.vim
    github:junegunn/fzf.vim
    github:hecal3/vim-leader-guide
    github:ctjhoa/spacevim
    github:Shougo/deoplete.nvim
 2016-05-17 02:01:10 +02:00
Rok Garbas
3c8bd93f23 base16: use patch for neovim terminal mode 2016-05-17 01:56:35 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Arseniy Seroka
82feebd53d Merge pull request #15479 from mpscholten/vim-plugin-vim-closetag 
vimPlugins: Init vim-closetag
 2016-05-15 21:27:39 +04:00
Marc Scholten
f3a912a0d5
vimPlugins: Init vim-closetag 2016-05-15 17:01:51 +02:00
Joachim Fasting
dffb9a28cf Merge pull request #15451 from romildo/new.blackbird 
blackbird: init at 2016-04-10
 2016-05-15 06:35:24 +02:00
Rok Garbas
3249796220 xautolock: adding patch that enables -lockaftersleep option 
and...
- added metadata
- added myself as a maintainer
 2016-05-15 05:47:35 +02:00
Rok Garbas
bfe8d8ac84 base16: init at revision 9b24598c0 (no release) 
also applied few patches from not merged PRs
 2016-05-15 03:58:28 +02:00
Arseniy Seroka
969ce217f7 Merge pull request #15458 from romildo/upd.arc 
arc: 2015-10-21 -> 2016-05-14
 2016-05-15 01:01:27 +03:00
Pascal Wittmann
b596fd4a42 xlockmore: 5.46 -> 5.47 2016-05-14 18:27:43 +02:00
José Romildo Malaquias
e081433bee arc: 2015-10-21 -> 2016-05-14 2016-05-14 13:05:03 -03:00
José Romildo Malaquias
6f42aeb716 blackbird: init at 2016-04-10 2016-05-14 07:41:25 -03:00
Louis Taylor
3b6550c29b sailsd: 0.1.1 -> 0.2.0 (#15445) 
Sails has now been split into a few subcomponents, sailsd being the main
one. This package has been renamed to sailsd, the sailing simulation
daemon.
 2016-05-14 11:05:37 +02:00
Brandon Kase
ea018f8339 racerd: init at 0.1.1 
Needed for Rust YouCompleteMe support
 2016-05-14 01:28:08 -07:00
Vladimír Čunát
6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Alexey Lebedeff
288c355f01 xscreensaver: Fix xscreensaver-text helper 
xscreensaver-text invokes `appres` binary at runtime. When it's missing,
some screensavers will display Perl stacktraces.
 2016-05-10 18:31:27 +03:00
Sebastian Hagen
c84d366295
ghostscript: update upstream URL 
Closes #15342
 2016-05-10 10:32:48 +02:00
Vladimír Čunát
65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
zimbatm
9c3c8f55b6 Merge pull request #15303 from laMudri/numix 
numix-gtk-theme: 2.2.3 -> 2.5.1
 2016-05-08 13:38:42 +01:00
laMudri
39b3345c12 numix-gtk-theme: 2.2.3 -> 2.5.1 2016-05-08 12:23:50 +01:00
Tobias Geerinckx-Rice
628ac272da
hplip{,WithPlugin}: 3.16.3 -> 3.16.5 2016-05-08 00:45:08 +02:00
Arseniy Seroka
559553d34a Merge pull request #15127 from bkase/haskell-vim 
vimPlugins: add missing haskell plugins
 2016-05-05 14:46:59 +03:00
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks 
changes:
 * buildPhase = "true"
 * buildPhase = ":"
 2016-05-04 10:11:04 +00:00
Brandon Kase
17d85f4e91 vimPlugins: add missing haskell plugins 
* haskell-vim
* hlint-refactor-vim
* vim-haskellConcealPlus
 2016-05-03 23:12:16 -07:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
 2016-05-03 23:12:48 +03:00
José Romildo Malaquias
4b2caa2409 Greybird: init at 2016-03-11 2016-05-03 06:45:17 -03:00
Stefan Junker
3829bcf866 vim-go: 2016-04-15 -> 2016-05-01 (#15157) 2016-05-02 11:09:04 +02:00
Nikolay Amiantov
784a5ed2ef wine: fix pulseaudio in staging 2016-05-01 01:52:06 +03:00
Tobias Geerinckx-Rice
f72d3b2bbf
hplip{,WithPlugin}: 3.15.11 -> 3.16.3 2016-04-30 14:15:33 +02:00
Aristid Breitkreuz
ee672f8559 Merge pull request #15085 from kamilchm/YouCompleteMe 
YouComplteMe: FIX: ycm_core.so: undefined symbol: clang_parseTranslat…
 2016-04-30 13:32:56 +02:00
Nikolay Amiantov
a589b7bd5f ijs: derive from ghostscript 2016-04-30 03:12:32 +03:00
Kamil Chmielewski
0fcf707673 YouComplteMe: FIX: ycm_core.so: undefined symbol: clang_parseTranslationUnit2FullArgv 
https://github.com/Valloric/YouCompleteMe/issues/2125
 2016-04-29 19:29:20 +02:00
artuuge
03912a2761 epson-escpr: 1.6.4 -> 1.6.5 2016-04-29 12:16:30 +02:00
Nikolay Amiantov
5ff40ddedf add get* helper functions and mass-replace manual outputs search with them 2016-04-25 13:24:39 +03:00
Michael Raskin
3db3355c83 dosbox: pass mesa explicitly (needed for glu.h) 2016-04-25 09:12:24 +02:00
Rok Garbas
268ae334d9 Merge pull request #13575 from steveeJ/vimpreviewpandoc 
vim-plugins: init vimpreviewpandoc with python plugins and bugfixes
 2016-04-24 11:19:33 +02:00
Stefan Junker
aaec8fb9f1 vim-plugins: add vimprivewpandoc and needed python modules 2016-04-23 18:48:31 +02:00
Stefan Junker
1b80f24788 vim-plugins: make Cocoa optional 2016-04-23 18:46:36 +02:00
Markus Binsteiner
83274eccf0 seafile-*: 4.4.2 -> 5.0.7 
Also updated dependencies:
ccnet: 1.4.2 -> 5.0.7
libsearpc: 1.2.2 -> 3.0.7
 2016-04-23 12:52:42 +12:00
Robert Helgesson
6ec9d21194 theme-vertex: 20150923 -> 20160329 2016-04-22 22:08:26 +02:00
Nikolay Amiantov
34625f646c ppsspp: move to qmake4Hook 2016-04-20 18:55:54 +03:00
Théophane Hufschmitt
5059511324 hplip : add openssl as buildInput 2016-04-18 13:47:15 +02:00
Nikolay Amiantov
beeb113eaf Merge pull request #14781 from ambrop72/wine-fix 
wine: Disable stripping to avoid breaking fakedlls.
 2016-04-18 04:19:57 +04:00
Luca Bruno
cd8b383f62 cups: do not split doc output 
The DocumentRoot is under doc/ which is looked up in
.out. So for now let doc/ directory in .out.
Not the right fix, but the easiest fix.

cc @vcunat
 2016-04-17 21:09:34 +02:00
Ambroz Bizjak
d7eadb19fb wine: Disable stripping to avoid breaking fakedlls. 2016-04-17 20:59:46 +02:00
Alexander V. Nikolaev
9751cd456a wine: Fix RPATH for multiple-outputs 2016-04-17 18:51:34 +03:00
Arseniy Seroka
c316210f29 Merge pull request #14736 from AndersonTorres/higan 
higan: 096 -> 098
 2016-04-17 00:26:12 +03:00
Joachim Fasting
7d32d92464
cups: add systemd to build inputs on linux 
Otherwise, cups will be built without systemd support. The upstream
systemd service unit expects cups to have systemd support however. When
cups is built without systemd support, the daemon will fork to the
background. Consequently, systemd will think the service is done and
enter inactive state.

Along with 9de93be6cd and
47330b1732 this patch fixes the nixos
printer test timing out in `waitForUnit("cups.service")`; see
NixOS/nixpkgs#14748
 2016-04-16 22:07:21 +02:00
Raymond Gauthier
dbe2c50a66 brgenml1cupswrapper: fix regression and improvements 
`cp`, `grep`, `chmod`, `sed` executables
no longer found when upgrading from nixos
15.09 to 16.03. Fixed by use of wrapper
script that brings these executables into
`PATH`.

Also fix lpd binaries on 64 bits machines
by use of `callPackage_i686`.
 2016-04-16 00:25:17 -04:00
Arseniy Seroka
6dfe7a7114
vimPlugins: update 2016-04-16 2016-04-16 01:32:47 +03:00
AndersonTorres
92f06ba130 higan: 096 -> 098 
Now without some options, reflecting upstream development.
In special, no GTK building (as it was obsoleted on 096)
and no profile selecion, because it will be obsoleted
on next release.
 2016-04-15 15:04:20 -03:00
joachifm
be284a5f97 Merge pull request #14577 from hrdinka/fix/pcsx2 
pcsx2: disable advance SIMD instructions
 2016-04-14 14:17:22 +02:00
Nikolay Amiantov
755e4633c7 mass-replace glib and gtk lib/*/include paths 2016-04-14 04:13:54 +03:00
Nikolay Amiantov
8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Anderson Torres
4ec9453881 mgba: 0.3.1 -> git 20160325 (#14578) 
I have made this release fromgit because 0.4.0 release doesn't
compile (gcc complains with an error in Window.cpp: "isnan is not
defined on this scope"). The error disappears on mgba git master.
 2016-04-13 19:55:33 +01:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Nikolay Amiantov
24835df322 wine: use gcc49 for 64-bit builds 2016-04-12 20:55:28 +03:00
Nikolay Amiantov
71e7f0cad4 wine: use only native-arch native dependencies 2016-04-12 18:52:05 +03:00
Nikolay Amiantov
ff7f297ea2 wine: add more dependencies (notably, mpg123 and openal) 2016-04-12 18:44:04 +03:00
Nikolay Amiantov
b109f33d64 wine: fix outputs and pulseaudio support 2016-04-12 18:44:04 +03:00
Alexander V. Nikolaev
25d2a6a1b2 wineUnstable: 1.9.4 -> 1.9.7 
Also update wineStaging as well
 2016-04-12 18:44:04 +03:00
Christoph Hrdinka
cc1cef3abc pcsx2: disable advance SIMD instructions 
By setting `-DDISABLE_ADVANCE_SIMD=TRUE` pcsx2 will be compiled with predefined
SIMD flags instead of `-march=native`. This makes the resulting binary more
portable. Further this seems to be needed to make pcsx2 compile with gcc5.
 2016-04-10 20:54:32 +02:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
 2016-04-10 11:17:52 +02:00
Tobias Geerinckx-Rice
d54bc765b5 hplip: canonicalise 56-hpmud.rules' paths if installed 
Fixes #14338.
 2016-04-04 22:14:21 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Benjamin Staffin
bd4fdfd722 vimPlugins: add vim-jsonnet and zenburn 2016-03-31 23:20:44 -07:00
Michael Raskin
1a97cfb91f lilypond: set some HOME during the build for Metafont 2016-03-28 01:00:27 +02:00
Domen Kožar
b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Nikolay Amiantov
0c6db0ca48 cc-wrapper: add option to skip flags for native optimizations 2016-03-24 20:16:17 +03:00
Sheena Artrip
ef2f2de53a mednaffe: init at 0.8 2016-03-23 00:38:58 -04:00
Arseniy Seroka
1bb80801eb Merge pull request #14044 from kamilchm/youcompleteme 
vimPlugins: youcompleteme FIX #14006 No rule to make target 'ycm_support_libs'
 2016-03-21 23:19:59 +03:00
Kamil Chmielewski
6386d68e9d vimPlugins: youcompleteme FIX #14006 No rule to make target 
'ycm_support_libs'
599de71575 (diff-6725b893dfc969abac4f4ee39a3a317f)
 2016-03-21 09:45:57 +01:00
Brandon Kase
51eb1dce81 vim-plugins: add airline-themes 2016-03-20 02:31:24 -07:00
joachifm
25a1e5d5f2 Merge pull request #14010 from yochai/master 
mfcj470dw: fix missing file error
 2016-03-18 22:08:23 +00:00
Yochai
e6b85e6b78 mfcj470dw: fix missing file error 2016-03-18 19:56:27 +02:00
Peter Simons
6c935046a7 splix: revert of revert of "2.0.0 -> svn-r315 version update" 
This reverts commit e338d6a0fc. I originally
reverted the update because it broke my Samsung printer. Now, it turns out that
this issue can be fixed by deleting and then re-creating the printer in CUPS to
update the driver.

It's possible that Gutenprints 'cups-genppdupdates' could remedy the situation
as well, but I had no chance to verify that since I don't use Gutenprint.

Closes https://github.com/NixOS/nixpkgs/issues/13734.
 2016-03-18 11:36:58 +01:00
joachifm
e1d451c8c5 Merge pull request #7596 from jraygauthier/jrg/brother_mfc7860dw 
Brother MFC7860DW cups lpr wrapper drivers.
 2016-03-15 02:06:59 +00:00
Raymond Gauthier
f4cc2c6fb7 brgenml1cupswrapper: init at 3.1.0-1 
Brother generic cups wrapper over lpr driver
`brgenml1lpr` init at same version.
 2016-03-14 21:54:57 -04:00
Raymond Gauthier
9be54a523e retroarch: improvements 
-  Added missing freedesktop items (`*.desktop` and icon).

    Note that for the moment, only added an `*.svg`
    icon as was the only available. It does not give
    us the best results (at least in xfce). We may decide
    later on to extract the content of the `*.ico` instead
    which is a bit more involved.
 2016-03-13 20:05:01 -04:00
宋文武
93feb5d115 drop my maintainership (close #13881) 2016-03-13 18:39:01 +01:00
joachifm
d30b6f6a7b Merge pull request #13781 from romildo/new.epson_201207w 
epson_201207w: init at 1.0.0
 2016-03-10 11:29:10 +00:00
José Romildo Malaquias
e57f1eb6d0 epson_201207w: init at 1.0.0 2016-03-09 15:25:53 -03:00
Arseniy Seroka
b20439ef67 vimPlugins: update 2016-03-09 2016-03-09 20:24:06 +03:00
Lluís Batlle i Rossell
63ffd27a6b Fixing my-env to get NIX_CFLAGS_COMPILE and so on 
Yes, I still use my-env. I tested that it works on 16.03.
 2016-03-09 12:44:29 +01:00
Arseniy Seroka
6eac14e8ae Merge pull request #13761 from hrdinka/add/libretro-psx 
libretro-mednafen-psx: init at 2016-03-04
 2016-03-08 22:27:56 +03:00
Christoph Hrdinka
c5ec5bc84a libretro-mednafen-psx: init at 2016-03-04 2016-03-08 14:18:44 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Arseniy Seroka
be497419f4 Merge pull request #13729 from AveryGlitch/vim/lightline 
vimPlugins: init Lightline and Spacegray
 2016-03-07 22:53:56 +03:00
Peter Simons
e338d6a0fc splix: revert "2.0.0 -> svn-r315" version update 
This reverts commit 6ea526462b and a9f8613dae to fix
https://github.com/NixOS/nixpkgs/issues/13734.
 2016-03-07 13:37:54 +01:00
Avery Glitch
ada1051888 Added vim plugins Lightline and Spacegray 2016-03-07 18:53:40 +11:00
Christoph Hrdinka
56705a1fa3 retrofe: fix gstreamer plugin path 2016-03-06 15:04:16 +01:00
Edward Tjörnhammar
64f006d08c Merge pull request #13483 from hrdinka/add/libretro-mame 
libretro-mame: init at git-2016-02-10
 2016-03-04 10:50:10 +01:00
artuuge
edfb2e7ccb update epson-escpr meta 2016-03-03 14:59:40 +01:00
artuuge
7ddd6fc1c3 epson-escpr: 1.6.3 -> 1.6.4 2016-03-02 14:49:23 +01:00
zimbatm
69ce5cb656 use the sourceforge mirrors everywhere 
find pkgs -name "*.nix" -exec sed -r \
    "s|https?://downloads.sourceforge.net/|mirror://sourceforge/|g" -i {} \;
 2016-02-28 12:07:42 +00:00
zimbatm
6ea526462b splix: cleanup 
* remove commented code
* remove unused patch
* fix package naming
 2016-02-27 17:36:10 +00:00
Tuomas Tynkkynen
0fc6de6c3a U-Boot: Fix ubootTools 
Oops, I forgot to test build this...
 2016-02-27 19:30:17 +02:00
Christoph Hrdinka
d1c35db920 retrofe: init at 0.6.169 2016-02-27 15:41:21 +01:00
Arseniy Seroka
b9ab76c2b2 Merge pull request #13479 from hrdinka/add/pcsx2 
pcsx2: init at 1.4.0
 2016-02-26 23:56:55 +03:00
Nikolay Amiantov
d9c10d6f56 gutenprint: fix cups and gimp paths 
Also disable GIMP support by default to reduce closure
 2016-02-26 18:27:41 +03:00
Christoph Hrdinka
13f0bb7a53 libretro-mame: init at git-2016-02-10 2016-02-26 14:21:43 +01:00
Domen Kožar
a469681a51 Merge pull request #13365 from abbradar/cups-second-attempt 
CUPS update (second attempt)
 2016-02-26 11:13:30 +00:00
Christoph Hrdinka
bd5e2d723c pcsx2: init at 1.4.0 2016-02-26 10:21:31 +01:00
Arseniy Seroka
e695d73d8f vimPlugins.vim-autoformat: init at 2016-02-24 2016-02-25 12:22:44 +03:00
Arseniy Seroka
d2d0f19b57 vimPlugins: update 2016-02-25 2016-02-25 12:17:06 +03:00
zimbatm
bd8f383f15 Merge pull request #12532 from bendlas/update-splix 
splix: 2.0.0 -> svn-r315
 2016-02-24 00:02:28 +00:00
zimbatm
16f95fd8e2 Merge pull request #12875 from artuuge/epson-escpr 
epson-escpr: init at version 1.6.3
 2016-02-23 23:57:53 +00:00
Frederik Rietdijk
40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication 
buildPythonApplication: use new function for Python applications
 2016-02-23 16:02:10 +01:00
Herwig Hochleitner
53b9ac0d13 wine-unstable: 1.9.3 -> 1.9.4 
winetricks: 20160109 -> 20160219
gecko: 2.40 -> 2.44
 2016-02-22 23:41:12 +01:00
Nikolay Amiantov
1a025a4a96 cups: 2.0.4 -> 2.1.3 
Also enable parallel building and don't install rc.d scripts.
 2016-02-22 12:42:01 +03:00
Luca Bruno
dc3a1bff57 cups: add a comment about updates 2016-02-21 13:51:08 +01:00
Domen Kožar
410107cf76 Revert "cups: 2.0.4 -> 2.1.2" 
This reverts commit 35e1f49545.
 2016-02-20 22:32:26 +00:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Pascal Wittmann
7dc93ebdff Merge pull request #13090 from ebzzry/xboxdrv-0.8.8 
xboxdrv: 0.8.5 -> 0.8.8
 2016-02-19 13:13:57 +01:00
Nikolay Amiantov
aeee93faf3 m3d-linux: init at 2016-01-20 2016-02-17 16:56:14 +03:00
Vladimír Čunát
e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Herwig Hochleitner
a9f8613dae splix: 2.0.0 -> svn-r315 
r315 has been in use for several years, but was never officially released
 2016-02-16 22:21:23 +01:00
Arseniy Seroka
fac007ae57 Merge pull request #12985 from colemickens/mxt-app 
mxt-app: init at v1.26
 2016-02-16 00:26:18 +03:00
Cole Mickens
d2ed83ac39 mxt-app: init at v1.26 2016-02-15 13:24:32 -08:00
Tuomas Tynkkynen
eb9a85a389 Merge pull request #12742 from dezgeg/pr-uboot-changes 
U-Boot: 2015.10 -> 2016.01, refactor & support some new boards
 2016-02-15 16:10:37 +02:00
Pascal Wittmann
d9837dbd89 slock: fix license 2016-02-14 14:44:14 +01:00
Pascal Wittmann
9ba8e9a9da slock: 1.2 -> 1.3 2016-02-14 14:44:14 +01:00
Pascal Wittmann
ddeb1d8c43 Merge pull request #12971 from philandstuff/fix-fceux 
fix fceux
 2016-02-14 14:24:17 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Philip Potter
8a8d0bd46a fix fceux 
fceux needs lua 5.1; 5.2 seems to have introduced breaking API changes.

I removed the SYSTEM_LUA argument because we do want to build with the
system-provided lua, not the lua bundled in the fceux tarball.
 2016-02-13 15:56:35 +00:00
Robin Gloster
57d63ad537 mupen64plus1_5: removed 
This was the same as mupen64plus, alias added.
 2016-02-12 12:42:00 +00:00
Franz Pletz
96a08ea720 Merge pull request #12849 from a1russell/wine 
wine unstable & staging: 1.9.2 -> 1.9.3
 2016-02-12 07:54:58 +01:00
Eelco Dolstra
aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
Rommel M. Martinez
4b6eafa884 xboxdrv: 0.8.5 -> 0.8.8 2016-02-10 11:45:01 +08:00