Commit Graph

516 Commits

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