Commit Graph

782 Commits

Author SHA1 Message Date
Tuomas Tynkkynen
27bb66bd94 treewide: Make explicit that 'dev' output of gst_all_1.gst-plugins-base is used 2016-08-23 03:52:06 +03:00
Anderson Torres
d559c07bbe Higan: 100 -> 101 (#17903) 2016-08-22 18:12:03 +01:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Frederik Rietdijk
5a501bd828 Remove top-level dbus_python and pythonDBus.
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
2016-08-16 22:52:37 +02:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Alexander V. Nikolaev
b81cf59bd7 wine: 1.9.14 -> 1.9.16
Update wineUnstable and wineStaging
2016-08-14 10:22:05 +03:00
Robin Gloster
a748f315db fakenes: disable format hardening 2016-08-04 07:48:23 +00:00
Robin Gloster
7e81a4294d dlx: disable format hardening 2016-08-04 07:48:23 +00:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
9b5dcffe22 retroarch: Propagate meta info to wrapper 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
102ffa6be7 treewide: Wrap some really long package descriptions 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
59ce911810 treewide: Some EOF-whitespace fixes 2016-08-02 21:17:44 +03:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
AndersonTorres
9b1b3aa2ff higan: 099 -> 100 2016-07-30 19:36:01 -03:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Kranium Gikos Mendoza
615d818964 ppsspp: fix qmake4Hook build
pass PPSSPPQt.pro which was removed in 34625f6
2016-07-17 22:42:46 +08:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Alexander V. Nikolaev
dc5293d80b wine: 1.9.13 -> 1.9.14 (#16862)
* Update wineUnstable: 1.9.13 -> 1.9.14
* Update staging: 1.9.13 -> 1.9.14
* Add myself as co-maintainer, because I am do regular updates.
2016-07-11 17:57:16 +02:00
Eelco Dolstra
05bdc0c89f Remove unnecessary references to gcc5
These cause an unnecessary rebuild of gcc.
2016-07-11 10:46:34 +02:00
William Casarin
7129ebbd5e dolphin-emu: 4.0.2 -> 5.0 2016-07-06 12:22:58 -07:00
Nikolay Amiantov
9159d50baf Merge pull request #16533 from avnik/wine-update
wine: 1.9.11 -> 1.9.13
2016-07-01 16:07:11 +04:00
Alexander V. Nikolaev
962e365444 wineStable: 1.8.2 -> 1.8.3 2016-07-01 14:30:54 +03:00
Vladimír Čunát
3afa246038 Merge branch 'staging'
This includes a security update of expat.
2016-06-29 07:47:04 +02:00
Alexander V. Nikolaev
8f53cfbd59 wine: 1.9.11 -> 1.9.13 2016-06-27 01:09:56 +03:00
AndersonTorres
6c252964fc higan: v098 -> v099 2016-06-25 12:20:32 -03:00
Nikolay Amiantov
8399068b80 winetricks: 20160219 -> 20160622 2016-06-24 00:58:35 +03:00
Nikolay Amiantov
5ee7f081e3 wine: fix gstreamer support 2016-06-24 00:58:35 +03:00
Nikolay Amiantov
9e8592d6b9 wine: set default features in all-packages
I haven't noticed that we actually _do_ set some flags already
in all-packages, just not all the old ones. Use that way instead.
2016-06-23 14:01:09 +03:00
Nikolay Amiantov
5bff6fef55 wine: restore old features 2016-06-23 13:28:55 +03:00
Vladimír Čunát
6b27ceb006 Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e.
2016-06-23 12:09:03 +02:00
Vladimír Čunát
aa9a04883e Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d829598, reversing
changes made to f073df60d6.
2016-06-23 09:25:10 +02:00
Vladimír Čunát
c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Vladimír Čunát
e757404555 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1279790
2016-06-19 12:33:04 +02:00
Vladimír Čunát
97c484a10f treewide: fix #include errors after gcc-5.4
They were mostly missing <cmath> or <math.h>.
2016-06-19 10:18:30 +02:00
Matthew Bauer
e37bb985a3 retroarch: 2015-11-20 -> 1.3.4
also: remove nvidia-cg-toolkit as input for retroarch.
see #15707

darwin is also building but you have to trick it into
thinking it's a desktop app for the GUI to load

platforms is set to "platforms.all".
2016-06-12 22:13:06 -05:00
Nikolay Amiantov
21f5510a54 Merge pull request #15367 from bendlas/update-wine
wine-unstable: 1.9.7 -> 1.9.11; add optional dependencies; opencl-icd: init; refactor flags
2016-06-10 16:47:31 +04:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Ryan Mulligan
b54fa1e351 zsnes: add desktop item
add desktop item so zsnes can be used without the terminal
add icons
2016-06-09 06:22:13 -07:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Herwig Hochleitner
8c0f03ae9d wine: 1.9.10 -> 1.9.11 2016-05-30 04:05:55 +02:00
Herwig Hochleitner
1c215828d5 wine: make features configurable 2016-05-29 10:45:16 +02:00
Herwig Hochleitner
98d720d72c wine: 1.8.1 -> 1.8.2 2016-05-29 10:45:12 +02:00
Herwig Hochleitner
edb5a8c632 wine: 1.9.9 -> 1.9.10 2016-05-29 10:45:08 +02:00
Herwig Hochleitner
0f3ff1401d wine-staging: move libtxc_dxtn to buildInputs
this adds it to RPATH, via LDFLAGS (see base.nix)
2016-05-29 10:44:42 +02:00
Herwig Hochleitner
4416644eb3 wine-unstable: 1.9.7 -> 1.9.9 2016-05-29 10:44:42 +02:00
Herwig Hochleitner
33c6a9d1e7 wine: add optional dependencies 2016-05-29 10:44:42 +02:00
Joachim Fasting
ea5039e448 Merge pull request #15712 from rardiol/pcsxr94b
pcsxr: init at 1.9.94
2016-05-28 23:33:09 +02:00
Ricardo Ardissone
38429f74b2 pcsxr: init at 1.9.94 2016-05-26 15:54:24 -03:00
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
AmatCoder
15dbdc5930 mednaffe: Fix segfault on shutdown 2016-05-25 06:30:40 +00:00
Tuomas Tynkkynen
c857552da8 treewide: Make explicit that 'dev' output of libX11 is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
d1937cf11a treewide: Make explicit that 'dev' output of gtk2 is used 2016-05-19 10:00:38 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Nikolay Amiantov
784a5ed2ef wine: fix pulseaudio in staging 2016-05-01 01:52:06 +03: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
Nikolay Amiantov
34625f646c ppsspp: move to qmake4Hook 2016-04-20 18:55:54 +03:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00: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
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
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
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
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00: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
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00: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
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
Franz Pletz
e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +01:00
Christoph Hrdinka
56705a1fa3 retrofe: fix gstreamer plugin path 2016-03-06 15:04:16 +01:00
Franz Pletz
cb3d27df93 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-05 18:55:30 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +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
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00: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
Christoph Hrdinka
d1c35db920 retrofe: init at 0.6.169 2016-02-27 15:41:21 +01:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Christoph Hrdinka
13f0bb7a53 libretro-mame: init at git-2016-02-10 2016-02-26 14:21:43 +01:00
Christoph Hrdinka
bd5e2d723c pcsx2: init at 1.4.0 2016-02-26 10:21:31 +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
Robin Gloster
5923f792e1 uae: turn off format hardening 2016-02-22 00:22:28 +00:00
Franz Pletz
41698c9efa Merge branch 'master' into hardened-stdenv 2016-02-15 20:05:29 +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
86e8cad2cf nestopia: turn off format hardening 2016-02-12 13:08:56 +00:00
Robin Gloster
64e6f69b70 mupen64plus: turn off format hardening 2016-02-12 12:50:49 +00:00
Robin Gloster
57d63ad537 mupen64plus1_5: removed
This was the same as mupen64plus, alias added.
2016-02-12 12:42:00 +00:00
Robin Gloster
1c156b9b59 dosbox: turn off format hardening 2016-02-10 23:27:49 +00:00
Adam Russell
b63c566d14 wine unstable: 1.9.2 -> 1.9.3 2016-02-09 18:19:28 -06:00
Herwig Hochleitner
6abe531aaf wine stable: 1.8 -> 1.8.1 2016-02-04 14:25:38 +01:00
Herwig Hochleitner
4ce954d02e wine: consolidate source packages
In order to update wine packages more easily, the source derivations are
collected into a single sources.nix, so hashes can be updated like
`nix-prefetch-url pkgs/misc/emulators/wine/sources.nix -A stable`
2016-02-04 14:25:34 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Adam Russell
9468f2c925 wine unstable: 1.9.1 -> 1.9.2 (close #12730) 2016-02-02 05:56:13 +01:00
AndersonTorres
b493be1bd4 Mednafen: 0.9.38.6 -> 0.9.38.7 2016-01-27 07:33:28 -02:00
Nikolay Amiantov
2d64202895 Merge pull request #12529 from bendlas/update-wine
wine[-stable,tricks]: version updates
2016-01-23 06:43:06 +03:00
Herwig Hochleitner
9e2bb09ea0 wine[-stable,tricks]: version updates
wine-unstable, wine-staging: 1.9.0    -> 1.9.1
winetricks:                  20151116 -> 20160109
2016-01-21 23:57:52 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Robin Gloster
53b389327e refactor to use autoreconfHook where possible
Close #12446.
2016-01-18 10:45:31 +01:00
Tobias Geerinckx-Rice
994fd1ec12 VisualBoyAdvance: remove dead package
Last updated in 2011. Broken since 2013. Upstream ‘stopped’, sez $homepage.
2016-01-09 23:15:16 +01:00
Nikolay Amiantov
506b491edd Merge pull request #12140 from bendlas/update-wine
wine unstable/staging: 1.8 -> 1.9.0
2016-01-08 01:46:38 +03:00
Herwig Hochleitner
7d3bac6bcc wine unstable/staging: 1.8 -> 1.9.0 2016-01-04 19:04:12 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Lengyel Balázs
e675b2d92d wineStaging: remove explicit dependency on libpulseaudio
pulseaudio is now configured via `pulseaudioSupport` and available for wineStable too
2015-12-26 00:56:16 +01:00
Lengyel Balázs
0ca96aa43c wine: add initial pulseaudio support 2015-12-25 00:40:26 +01:00
Arseniy Seroka
21ebb23e7c Merge pull request #11894 from AndersonTorres/higan
Higan: 095 -> 096
2015-12-23 23:10:31 +03:00
Nikolay Amiantov
80ee4ec82a Merge pull request #11837 from bendlas/update-wine
wine: stable, unstable; upgrade to 1.8
2015-12-23 16:41:08 +03:00
AndersonTorres
0ed678a414 Higan: 095 -> 096 2015-12-23 00:32:06 -02:00
Herwig Hochleitner
8519b89f76 wine unstable, staging: 1.8-rc4 -> 1.8 2015-12-22 14:51:18 +01:00
Thomas Tuegel
0b303f6edd mgba: Qt 5 infrastructure update 2015-12-20 07:56:42 -06:00
Herwig Hochleitner
7a0dd2c82c wine stable: 1.6.2 -> 1.8
restructure versions file for clarity and brevity
2015-12-19 23:29:13 +01:00
Herwig Hochleitner
3b9619e804 wine: 1.8-rc3 -> 1.8-rc4 2015-12-19 18:09:40 +01:00
AndersonTorres
7070c2d900 Higan: 094 -> 095
In order to increase portability and flexibility, now the build phase
explicitly sets "compiler=c++" as a make parameter.
Further, there is a link "higan" for backwards compatibility; higan was
split in icarus (the game ROMS database manager) and tomoko (the
emulator itself).
2015-12-18 07:45:04 -02:00
AndersonTorres
28dd9e8a6c mgba: 0.3.0 -> 0.3.1 2015-12-15 23:30:42 -02:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Herwig Hochleitner
be80ba2c96 wine unstable: 1.8-rc2 -> 1.8-rc3 2015-12-07 22:22:56 +01:00
Arseniy Seroka
3e2d5e4d4e Merge pull request #11379 from bendlas/update-cdemu
cdemu: package updates
2015-12-02 22:46:42 +03:00
Herwig Hochleitner
ddbd0dfcae wine(tricks): update packages
wine 1.7.55 -> 1.8-rc2
winetricks 20151110 -> 20151116
2015-12-01 11:58:17 +01:00
Herwig Hochleitner
56e1d13842 cdemu: package updates
client:    3.0.0 -> 3.0.1
daemon:    3.0.2 -> 3.0.3
gui:       3.0.0 -> 3.0.1
libmirage: 3.0.3 -> 3.0.4
2015-12-01 11:43:16 +01:00
AndersonTorres
c7d8597976 Yabause: init at 0.9.14 2015-11-29 01:15:12 -02:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Edward Tjörnhammar
831593f709 retroarch: 20141224 -> 2015-11-20
libretro: 20141224 -> 2015-11-20
2015-11-20 15:52:58 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Herwig Hochleitner
ec73ef4c2f wine: 1.7.53 -> 1.7.55 2015-11-18 09:33:57 +01:00
Herwig Hochleitner
2145c99ae3 wine: fix infinite recursion in wine-staging build 2015-11-15 16:03:54 +03:00
Herwig Hochleitner
accc98ca7f wine: 1.7.52 -> 1.7.53 2015-11-15 16:03:54 +03:00
Nikolay Amiantov
fc620ae093 winetricks: 20150706 -> 20151110 2015-11-12 03:41:51 +03:00
Rinaldus
4c626f44d9 wine-{unstable,staging}: update 1.7.48 -> 1.7.52
Close #10238.
2015-10-15 12:01:16 +02:00
Vladimír Čunát
9da12a6713 SDL: split the dev output and fix referrers 2015-10-13 20:18:56 +02:00
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Thomas Tuegel
8df4cbe20f mgba: use Qt 5.4 2015-09-19 10:01:25 -05:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Vladimír Čunát
0c74f18e4c xlibs.xlibs: remove
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
2015-09-15 11:59:33 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
AndersonTorres
65e44c62de Desmume: init at 0.9.11 2015-09-12 23:58:23 -03:00
Rok Garbas
747e0149cc marking junit and dolphinEmu as broken 2015-09-08 14:05:40 +02:00
Cillian de Róiste
75f880b1d1 mednafen: fix src url (sourceforge -> mednafen.fobby.net)
Also bump the minor version 0.9.38.5 -> 0.9.38.6
2015-08-31 13:50:14 +02:00
Eelco Dolstra
60a0bb7f66 Make "nix-env -i wine" work again
Also, make wine32 the default again to prevent a huge closure size
regression. (It recently grew by ~1 GB:
http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.wineStable.x86_64-linux#tabs-charts)

Issue #8990.
2015-08-25 13:07:16 +02:00
Nikolay Amiantov
6d6eb1913a Merge pull request #9025 from abbradar/zsnes
zsnes: use Debian patches, fix segfault on saving state
2015-08-21 23:53:44 +03:00
Cray Elliott
e99167d7f1 new package: mgba 0.3.0
This is a new Gameboy Advance emulator which aims to run on lower
end hardware without sacrificing accuracy or portability.
2015-08-17 18:00:33 -07:00
Herwig Hochleitner
440dde6950 wine: cleanup and comment build script 2015-08-06 00:27:32 +02:00
Herwig Hochleitner
e15a4b0ee2 wine: 1.7.47 -> 1.7.48 2015-08-06 00:21:31 +02:00
Cray Elliott
84dc71ebe4 bump dolphinEmuMaster, remove no longer needed SDL dep
also add libevdev as a dep, read about all the changes at
https://dolphin-emu.org/blog/2015/08/01/dolphin-progress-report-july-2015/
2015-08-02 03:17:03 -07:00
Mateusz Kowalczyk
7930150366 Merge pull request #9045 from AndersonTorres/PPSSPP
PPSSPP: 0.9.9.1 -> 1.1.0
2015-07-31 09:43:49 +01:00
AndersonTorres
752bbdbfbc PPSSPP: 0.9.9.1 -> 1.1.0
Changing SDL to version 2.
2015-07-30 13:18:52 -03:00
Nathaniel Baxter
196fcdf80f wine: unstable and staging update: 1.7.46 -> 1.7.47
Close #8913.
2015-07-30 13:48:58 +02:00
Nathaniel Baxter
148f7e6624 winetricks: update 20150416 -> 20150706 2015-07-30 13:48:58 +02:00
Nikolay Amiantov
30facde98c zsnes: use Debian patches, fix segfault on saving state 2015-07-28 12:53:57 +03:00
Arseniy Seroka
99ac72994c Merge pull request #8984 from AndersonTorres/stella
Stella: 4.6 -> 4.6.1
2015-07-26 20:07:25 +03:00
AndersonTorres
6ccd69872a Stella: 4.6 -> 4.6.1 2015-07-25 10:49:53 -03:00
AndersonTorres
517451df97 FS-UAE: 2.4.1 -> 2.4.3 2015-07-15 09:35:58 -03:00
AndersonTorres
0b9f605a2d Mednafen: Updates
Mednafen: 0.9.36.4 -> 0.9.38.5
Server: 0.5.1 -> 0.5.2
2015-07-15 08:11:23 -03:00
Michael Raskin
2e462069a8 Wine: unstable, staging: update 1.7.43 -> 1.7.46; remove updater scripts because with the new layout they don't work anyway 2015-07-05 00:32:54 +03:00
William A. Kennington III
7297255019 Convert all jack references to libjack2 2015-06-27 00:17:52 -07:00
lassulus
4ed0a4eaf8 add pkg: vbam, closes #8339 2015-06-18 11:35:43 +02:00
Cray Elliott
e7c2a58250 bump dolphinEmuMaster, now needs gcc5 to compile
also removed wxGTK30 as that was unnecessary, and actually causes compilation errors with gcc5 in the mix
2015-06-09 03:24:18 -07:00
William A. Kennington III
be5f4082fd pulseaudio: Remove default derivation 2015-05-29 14:47:33 -07:00
William A. Kennington III
b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
Tobias Geerinckx-Rice
d01927269e uae: use archive.org links
The original homepage is long gone (as is the tarball it hosted).
2015-05-20 16:42:12 +02:00
Luca Bruno
9adde87fea More usage of gnome3.defaultIconTheme 2015-05-19 14:44:27 +02:00
Herwig Hochleitner
2f53355ff6 winetricks: 20150316 -> 20150416 2015-05-18 21:02:23 +02:00
Herwig Hochleitner
b4c2351806 wine: unstable 1.7.42 -> 1.7.43 2015-05-18 21:02:23 +02:00
Herwig Hochleitner
ef9cfd3dda wine: enable 64bit build for wineStaging 2015-05-18 21:01:54 +02:00
Arseniy Seroka
87b4f9286d Merge pull request #7604 from bendlas/wine64
wine: add 64 bit build and module
2015-05-10 19:13:37 +03:00
Arseniy Seroka
f6016b9a7b Merge pull request #7784 from seppeljordan/emulationstation
Update emulationstation 2.0.0.rc1 -> 2.0.1a
2015-05-10 19:07:46 +03:00
Herwig Hochleitner
ae6d2796bc wine: add 64 bit build and nixpkgs configuration
The default release channel (stable/unstable) and the default
build (wine32/wine64/wineWow) can be customized via the "wine" key in config
2015-05-10 15:45:01 +02:00
Michael Raskin
90453cc5ca Update Wine staging to match Wine unstable 2015-05-10 13:36:48 +03:00
Michael Raskin
ede1211cbc Update Wine unstable 2015-05-10 13:36:47 +03:00
Sebastian Jordan
72d3d6fbfc Update emulationstation 2.0.0.rc1 -> 2.0.1a 2015-05-10 01:49:09 +02:00
Joachim Fasting
bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Pascal Wittmann
f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Pascal Wittmann
2f15fcc4c9 Merge pull request #7389 from AndersonTorres/atari++
Atari++: 1.46 -> 1.73
2015-04-26 10:05:14 +02:00
Nikolay Amiantov
f6607ca4a5 wineStaging: add derivation 2015-04-23 21:00:42 +03:00
Cray Elliott
56de3acd5a dolphinEmuMaster: add libusb to depends, bump git version
this allows dolphin-emu to detect and use the Nintendo Wii U Gamecube Adapter
2015-04-21 20:40:32 -07:00
AndersonTorres
28f5eccd8d Atari800: no more ROM install
Now, the expression will not install ROM files anymore. It is easier the
final user install them locally by himself, in a local directory.
Also, it appears that there is a missing ROM in the package provided by
the project's site.
2015-04-17 21:39:25 -03:00
AndersonTorres
10dbc6cf3a Atari++: 1.46 -> 1.73
And a complete reformulation of build expression.
2015-04-14 22:44:57 -03:00
AndersonTorres
eae83dc472 Atari800: 2.2.1 -> 3.1.0 2015-04-13 05:35:43 -03:00
Arseniy Seroka
0d3be79490 Merge pull request #7323 from AndersonTorres/gxemul
Gxemul: 0.4.6 -> 0.6.0.1
2015-04-12 04:22:16 +03:00
AndersonTorres
9ebba5fe0c Gxemul: 0.4.6 -> 0.6.0.1 2015-04-11 16:00:55 -03:00
AndersonTorres
5a91f9a34d Stella: 4.2 -> 4.6 2015-04-06 12:14:29 +02:00
AndersonTorres
5ff233be6b Higan: minor update
Updating source url
2015-04-06 11:51:33 +02:00
Michael Raskin
99b5486db6 Update Wine 2015-04-05 20:27:25 +03:00
Cray Elliott
ae413373ca monthly bump of dolphinEmuMaster
see dolphin's progress report if you want to know what is new!
https://dolphin-emu.org/blog/2015/04/01/dolphin-progress-report-march-2015/
2015-04-04 11:00:47 -07:00
Edward Tjörnhammar
1345a65765 Remove XBMC expressions in favor of the Kodi ones 2015-03-30 21:43:32 +02:00
Nikolay Amiantov
602ff46403 winetricks: update 2015-03-29 13:05:28 +03:00
Michael Raskin
d77a4f17f9 update wine 2015-03-21 21:29:39 +03:00
Nathaniel Baxter
358e9af3d3 wineUnstable: updates (close #6508) 2015-03-08 15:10:44 +01:00
Vladimír Čunát
2069156d5c nestopia: disable failing parallel builds
http://hydra.nixos.org/build/19861758
2015-03-07 14:34:28 +01:00
Cray Elliott
2ee6e81896 Monthly bump of dolphinEmuMaster
Large performance improvements, smaller binary, and higher accuracy!
See for details :
https://dolphin-emu.org/blog/2015/03/01/dolphin-progress-report-february-2015/
2015-03-02 01:48:05 -08:00
Nikolay Amiantov
ca8137d4a8 winetricks: update 2015-02-19 02:12:09 +03:00
Herwig Hochleitner
dea3ac7783 Use XDG_ICON_DIRS in cdemu's XDG_DATA_DIRS 2015-02-10 14:44:29 +01:00
Herwig Hochleitner
7d24bcdbcf Add gdk_pixbuf, gnome_icon_theme and librsvg to cdemu gui programs 2015-02-10 14:25:23 +01:00
Herwig Hochleitner
eb03122cf6 Use gnome3 icon theme in cdemu 2015-02-10 14:09:27 +01:00
Herwig Hochleitner
67f9c8b025 Fix cdemu ui gsettings schema paths 2015-02-10 13:14:25 +01:00
Herwig Hochleitner
b909def3e1 Whitespace cleanup 2015-02-10 11:49:32 +01:00
Herwig Hochleitner
2961b83d08 Add cdemu packages and module 2015-02-10 06:49:47 +01:00
Michael Raskin
7a7572dc31 Update Wine unstable 2015-02-10 00:28:00 +03:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Michael Raskin
3566a73b5e Update wine-unstable 2015-02-01 18:41:33 +03:00
Cray Elliott
221a6f67a5 monthly bump of dolphinEmuMaster
check out what's new at https://dolphin-emu.org/blog/2015/02/01/dolphin-progress-report-january-2015/
2015-02-01 03:59:44 -08:00
Edward Tjörnhammar
3a321906d1 Add Kodi retroarch launchers 2015-01-19 22:14:37 +01:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Michael Raskin
41f0b9e851 Wine unstable: 1.7.33 -> 1.7.34 2015-01-11 16:43:29 +03:00
Sander van der Burg
af9bb71848 Merge pull request #5592 from AndersonTorres/fsuae
FS-UAE (version 2.4.1): New Package
2015-01-06 09:59:56 +00:00
AndersonTorres
291d507d98 FS-UAE (version 2.4.1): New Package
FS-UAE is a new, cycle-accurate, customizable Amiga Emulator.
2015-01-05 17:47:07 -02:00
Cray Elliott
5a92c9f0a1 remove extraneous platform from dolphinEmuMaster 2015-01-03 23:00:29 -08:00
Cray Elliott
c9d963c4e6 time for the monthly dolphinEmuMaster bump 2015-01-03 19:44:34 -08:00
Tobias Geerinckx-Rice
c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Cray Elliott
183f0b9d9a update retroarch and all of the libretro cores 2014-12-25 02:04:08 -08:00
Cray Elliott
d54db47b3c add new emulator, nestopia undead 2014-12-23 02:33:00 -08:00
Michael Raskin
1317dd7e62 Wine: 1.7.30 → 1.7.33 2014-12-21 11:14:25 +03:00
Vladimír Čunát
e815624b67 dolphin-emu-master: disable unsupported i686 platform 2014-12-10 15:43:15 +01:00
Cray Elliott
682ea7c775 monthly bump of dolphinEmuMaster
Tons of accuracy improvements per usual, some somewhat interesting ones:
- Constant Angular Velocity for Disk Reads
- FIFO buffer fix
- Vectorized Vertex loading
and more! read about it at dolphin-emu.org
2014-12-02 01:06:15 -08:00
Cray Elliott
825e99808c add a platform to all of my packages 2014-11-19 03:03:00 -08:00
AndersonTorres
a86ba451bf Stella: update to 4.2 2014-11-18 11:12:47 -02:00
AndersonTorres
f9c2d0a7a3 Stella: update to 4.1.1 2014-11-18 11:12:47 -02:00
Cray Elliott
026d004a36 dolphinEmuMaster bump to bring in new HLE Audio code
Generally we only bump once per month, but due to the new
dolphin-emu.org blog post covering the subject, I couldn't
resist :)

if you'd like to read more about it, read here!
https://dolphin-emu.org/blog/2014/11/12/the-rise-of-hle-audio/#cuthere
2014-11-12 17:54:02 -08:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Cray Elliott
7244de4a4a add myself to libretro maintainers 2014-11-10 02:24:19 -08:00
Cray Elliott
9e3137ddf0 montly bump of retroarch and libretro cores 2014-11-09 23:18:23 -08:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Rickard Nilsson
f1d7aad20b stella-libretro: Bump revision 2014-11-04 18:27:40 +01:00
Michael Raskin
9c458ad8d4 Update Wine-unstable 2014-11-02 23:51:58 +03:00
Cray Elliott
545f8e8c6c monthly bump of dolphinEmuMaster
also dolphinEmu and dolphinEmuMaster had an extraneous stdenv removed
from buildInputs
2014-11-02 00:11:01 -07:00
Cray Elliott
72d7324af5 Add mednafen TurboGrafx-16 libretro core 2014-10-28 02:08:43 -07:00
Michael Raskin
5199b46964 Update Wine unstable 2014-10-18 19:52:59 +04:00
Cray Elliott
e39bf7a704 Replaced retroarchBare with retroarchBareMaster, also added a few new libretro cores
retroarchBare was too old for any practical use at this point, so it was removed in favor
of fetching releases from git. RetroArch often recommends checkout out the latest git master
if you are on a desktop platform, so we are conforming with their recommendation. I plan on
bumping the git of retroarch and each core every month, and I plan on adding more libretro
cores in the future.

The libretro cores that were added are nestopia, quicknes, snes9x, and vba-m

planned next are : bsnes-accuracy, bsnes-balanced, bsnes-performance, a few libretro mame ports

Closes #4448
2014-10-16 12:53:39 +01:00
Longrin Wischnewski
6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Michael Raskin
a451c62650 Update Wine unstable 2014-10-06 02:43:58 +04:00
Cray Elliott
817ebe24ab Update dolphinEmuMaster
The plan at this point is to update dolphinEmuMaster every month in
tanden with the latest development report on the dolphin-emu.org blog.

Closes #4374
2014-10-03 20:30:28 +01:00
Rickard Nilsson
1ccb2f76b5 Merge pull request #4078 from edwtjo/libretro-cores-addendum
XBMC RetroArch integration and some cores
2014-10-02 20:50:49 +02:00
Edward Tjörnhammar
9d93f9bcda XBMC AdvancedLauncher RetroArch launchers.
These are wrappers for retroarch wrappers, they are needed since launching a
process from XBMC(as a display manager and probably otherwise), using
AdvancedLauncher, results in it and it's parent recieving the same gamepad
input.

These wrappers will produce no sound on XBMC and AdvancedLauncher setups not
using a sound daemon, since XBMC gets paused while still holding onto the sound
device.
2014-10-02 20:09:18 +02:00
AndersonTorres
1c0d37a038 Higan: adding config.higan.{guiToolkit,profile} options
Now we can parametrize Higan locally.
By default, guiToolkit = "gtk" and profile = "performance" (the accuracy
profile is seriously slow on my machine :) )

Closes #4340
2014-10-01 02:17:40 +01:00
AndersonTorres
efdc89de60 Mednafen: update to 0.9.36.4
Closes #4304
2014-09-28 22:48:20 +01:00
Edward Tjörnhammar
655ae33816 libretro.ppsspp: Fixes building on i686 2014-09-26 18:35:46 +02:00
Nathaniel Baxter
d5f40ea929 wineUnstable: Fix dynamic loading of ncurses lib. 2014-09-24 12:48:39 +10:00
Nathaniel Baxter
b99773fc00 wineUnstable: Bump version to 1.7.27 2014-09-23 21:47:47 +10:00
Nathaniel Baxter
b94e33d7b8 wineUnstable: Bump version to 1.7.26 2014-09-22 20:18:30 +02:00
Edward Tjörnhammar
383f142858 libretro: added bsnes, fba, gambatte, genesis-plus-gx, prboom 2014-09-22 12:35:07 +02:00
Mateusz Kowalczyk
85eec74433 hatari: update from 1.6.2 to 1.8.0 2014-09-21 18:37:58 +01:00
AndersonTorres
4f85f64153 Higan: adding "profile" and "gui" building options
Also, removing builder.sh and copying everything to Nix expression.

Closes #4048
2014-09-20 23:51:15 +01:00
AndersonTorres
b39e5ce957 Small style fixups
In this commit, I modified some files, conforming them to a
idiosyncratic standard - mainly, a template for meta attribs.
2014-09-10 21:34:50 -03:00
Edward Tjörnhammar
6fcab9baca libretro-cores:
- adding: 4do, desmume, fceumm, mame, mupen64plus, scummvm,
            snes9x, stella, picodrive, ppsspp and vba

retroarch:
  - added retroarch wrapper for configured cores
  - changed attributes, old retroarch is now retroarchBare*
2014-09-04 20:03:13 +02:00
Michael Raskin
3f1ce8d864 Merge pull request #3886 from AndersonTorres/higan
Higan - a quick&dirty workaround
2014-09-03 21:49:05 +04:00
Michael Raskin
4c41c1ffbf Merge pull request #3890 from edwtjo/emulationstation-2.0.0-rc1
emulationstation: 1.0.2 -> 2.0.0-rc1
2014-09-03 21:47:58 +04:00
Michael Raskin
9cf910cd51 Merge pull request #3932 from MP2E/retroarch_git_master
add retroarchMaster package
2014-09-03 18:59:13 +04:00
Peter Simons
b8260f5435 dolphin-emu: drop reference to git from buildInputs since it's no longer an argument to the expression after #3936 2014-09-02 11:57:34 +02:00
Cray Elliott
cc7fa316a4 dolphinEmu doesn't need the git package 2014-09-02 02:07:22 -07:00
Cray Elliott
73439c6053 add dolphinEmu and dolphinEmuMaster
Dolphin is a high quality, open source Gamecube/Wii/Triforce emulator for
Windows, Mac OS X and Linux
2014-09-02 01:20:38 -07:00
Cray Elliott
b56a348af7 add retroarchMaster package 2014-09-02 00:56:47 -07:00
Michael Raskin
82ed86dd76 Remove unneeded definitions 2014-09-02 01:03:39 +04:00
AndersonTorres
44d772d1e0 Stella 4.0: New Package
Stella is an Atari 2600 VCS emulator
2014-08-31 14:31:09 -03:00
Michael Raskin
3bbf64b6d0 Update unstable Wine 2014-08-31 18:20:06 +04:00
AndersonTorres
f5f4bf1a25 Higan: Updating builder.sh script
Now builder.sh will install a higan-config.sh script
to write auxiliary stuff on $HOME/.config/higan directory.
That way, higan searches locally and runs cleanly.

Obviously it's a hack, but the only other way is to do a huge patch on
upstream sources; personally I think it is better to work that type of
thing directly on higan sources.
2014-08-31 09:47:49 -03:00
Edward Tjörnhammar
a5a92fdd53 emulationstation: 1.0.2 -> 2.0.0-rc1 2014-08-31 12:50:35 +02:00
AndersonTorres
0847250505 Higan - a quick&dirty workaround
Higan uses a lot of hardcoded paths when it looks for runtime files
as shaders, icons and mainly BIOS files. So, we made a q&d wrapper
script: it copies all these files to $HOME/.config/higan in the 1st
invocation.
2014-08-30 23:59:49 -03:00
AndersonTorres
4cb061111c Higan - new package (alpha stage!)
Higan is a cycle-accurate Nintendo multi-system emulator
It is a preliminary release for Nix - I need to investigate
some issues about install process and hardcoded paths...
2014-08-29 18:32:07 +01:00
Mateusz Kowalczyk
10e3cf6f5a ppsspp: update to 0.9.9.1 2014-08-25 10:14:44 +02:00
Edward Tjörnhammar
a79241aa15 add: emulationstation 1.0.2 2014-08-23 15:33:22 +02:00
AndersonTorres
a21a987c63 Mednafen: update to 0.9.36.3 2014-08-14 11:20:25 -03:00
Mateusz Kowalczyk
27f8a89dfa ppsspp: update to 0.9.9 2014-08-09 02:49:50 +02:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Eelco Dolstra
8f3d2b740b wine: Update to 1.7.23 2014-08-04 01:09:01 +02:00
Michael Raskin
750a5f4e0c Update Wine-unstable 2014-08-03 22:29:41 +04:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Joachim Schiele
d46c61b863 Merge pull request #3321 from qknight/snes9x-gtk
added snes9x-gtk with pulseaudio support
2014-07-27 21:38:25 +02:00
Joachim Schiele
de1ae606db snes9x-gtk: added changes requested by offlinehacker 2014-07-27 21:37:52 +02:00
Bjørn Forsman
f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Joachim Schiele
743e3df3b8 made changes requested by pSub 2014-07-23 14:03:48 +02:00
Joachim Schiele
9d8a804047 added snes9x-gtk with pulseaudio support 2014-07-20 10:39:42 +02:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Eelco Dolstra
429bdef9bd winetricks: Update to 1199 2014-06-25 00:51:41 +02:00
Vladimír Čunát
9757785295 Merge recent master 2014-06-15 17:55:35 +02:00
Michael Raskin
6bbd163df4 Update Wine unstable version 2014-06-14 00:23:11 +04:00
Vladimír Čunát
f2352f7ecf Merge recent master 2014-06-10 20:14:08 +02:00
Vladimír Čunát
5a98b9f514 Merge recent master into p/stdenv
Merged just before the pypi update, as it seems to cause problems on Hydra.
2014-06-09 19:07:31 +02:00
Sterling Stein
a0efad6861 fceux: Add package for a NES emulator. 2014-06-07 15:08:57 -07:00
Mateusz Kowalczyk
6c3cc8bb95 PPSSPP: add platforms 2014-06-07 22:28:56 +02:00
Vladimír Čunát
872860e6de Merge #1187 into p/stdenv
Tested building firefox, kdelibs, evince on x86_64-linux.
2014-05-29 22:16:07 +02:00
Mateusz Kowalczyk
59f98d0d8c PPSSPP: 0.9.8 2014-05-28 23:05:01 +02:00
Michael Raskin
bc292a5882 Updating Wine unstable to 1.7.19 2014-05-28 01:33:28 +04:00
AndersonTorres
010833c634 mednafen: fix wrong URL (close #2696) 2014-05-20 09:16:30 +02:00
AndersonTorres
b1dbafbdbb Mednafen: add version 0.9.34.1 + server 0.5.1
Mednafen is a portable, CLI-driven, multi-system emulator
2014-05-17 00:08:04 -03:00
Ricardo M. Correia
a0f683686c wine: Add support for grsecurity 2014-05-15 13:25:49 +02:00
Evgeny Egorochkin
531f7f56bc wineUnstable: update from 1.7.12 to 1.7.14 2014-03-08 17:51:45 +02:00
Evgeny Egorochkin
97be6e295c wineUnstable: update from 1.7.11 to 1.7.12 2014-02-14 21:16:22 +02:00
Evgeny Egorochkin
862ac34bdd wineUnstable: update from 1.7.10 to 1.7.11 2014-01-23 21:04:01 +02:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Peter Simons
56aa2ce960 Un-maintain wine. 2014-01-13 17:15:53 +01:00
Vladimír Čunát
a2c316288c Merge master into stdenv-updates
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Vladimír Čunát
a00e382e23 wineStable: maintenance update 1.6.1 -> .2, use lcms2
lcms2 is now supported according to the announcement, so I switched to it.
Tested on a steam game ;-)
2014-01-11 19:58:16 +01:00
Mathijs Kwik
10c15d5861 zsnes: manual header magic is no longer needed with the gcc-4.8 patch 2014-01-05 18:53:52 +01:00
Vladimír Čunát
9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Michael Raskin
e89aa035b9 Update Wine 2014-01-04 14:55:42 +04:00
Lluís Batlle i Rossell
ab7069eec4 zsnes seems to work better, without stripping.
I can't understand why. Without disabling stripping, it segfaults
saving state.
2014-01-03 00:54:59 +01:00
Michael Raskin
9817df5715 Update Winetricks 2014-01-01 14:25:17 +04:00
Michael Raskin
26b3d0ab50 Update unstable Wine to 1.7.9 2013-12-30 02:32:19 +04:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Song Wenwu
88b9e1f191 retroarch: update to 0.9.9.7 2013-12-26 18:55:17 +01:00
Vladimír Čunát
4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Nixpkgs Monitor
6f17df861e wineUnstable: update from 1.7.7 to 1.7.8 2013-12-18 18:18:39 +02:00
Nixpkgs Monitor
de91f24803 atari800: update from 2.0.2 to 2.2.1 2013-12-18 18:18:17 +02:00
Vladimír Čunát
1d6c351046 enable osmesa for wine (close #1228) 2013-12-10 16:36:23 +01:00
Peter Simons
486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Moritz Ulrich
2d6c240913 winetricks: Update to rev 1078
And add some missing dependencies to the PATH of the script.
2013-12-09 00:34:35 +00:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Michael Raskin
435cffee5b Update unstable Wine to 1.7.7 2013-11-25 10:59:38 +04:00
Vladimír Čunát
b5356f7f27 wine: (stable) bugfix update 1.6 -> 1.6.1
Tested on a couple of apps.
2013-11-16 18:22:16 +01:00
Eelco Dolstra
a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Peter Simons
91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Michael Raskin
ae39f6c0cb Make 1.6 the default Wine version and call 1.7.4 wineUnstable 2013-10-21 21:27:18 +04:00
Michael Raskin
6f3e7d17d3 Fix Wine source 2013-10-20 22:02:02 +04:00
Michael Raskin
c4d78d376a Updating Wine to 1.7.4 2013-10-20 21:08:42 +04:00
Peter Simons
6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Mathijs Kwik
ef3cc83d1e zsnes: patches for modern gcc & libpng
builds fine on stdenv-updates now
needs gcc 4.8+, so keep this commit on stdenv-updates until merge
2013-10-11 01:10:41 +02:00
Bjørn Forsman
083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Sander van der Burg
f2e4efcf28 Removed obsolete patchelf instruction that was commented out 2013-09-05 10:43:01 +02:00
Sander van der Burg
1642e3a6d7 libX11 is not in vice's rpath. this fixes it 2013-09-04 22:34:08 +02:00
Mathijs Kwik
f918e06988 wine: upgrade to 1.6 + latest gecko/mono extensions 2013-07-30 14:25:10 +02:00
Song Wenwu
1e7e9c583d add retroarch 0.9.9 2013-06-26 19:25:09 +08:00
Michael Raskin
8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/misc/emulators/wine/default.nix
2013-06-10 10:04:46 +04:00
Evgeny Egorochkin
8a7bd8b200 Wine: a crude fix to issue #542: "libgcc_s.so.1 must be installed for pthread_cancel to work". 2013-06-09 05:37:47 +03:00
Michael Raskin
3fe8b9451a Update Wine 2013-06-07 10:27:19 +04:00
Michael Raskin
8615f6ef35 Update Wine 2013-06-07 10:23:48 +04:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00