Commit Graph

130 Commits

Author SHA1 Message Date
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
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
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
Michael Raskin
1317dd7e62 Wine: 1.7.30 → 1.7.33 2014-12-21 11:14:25 +03:00
Michael Raskin
9c458ad8d4 Update Wine-unstable 2014-11-02 23:51:58 +03:00
Michael Raskin
5199b46964 Update Wine unstable 2014-10-18 19:52:59 +04:00
Michael Raskin
a451c62650 Update Wine unstable 2014-10-06 02:43:58 +04: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
Michael Raskin
3bbf64b6d0 Update unstable Wine 2014-08-31 18:20:06 +04: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
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +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
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
Michael Raskin
bc292a5882 Updating Wine unstable to 1.7.19 2014-05-28 01:33:28 +04: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
Peter Simons
56aa2ce960 Un-maintain wine. 2014-01-13 17:15:53 +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
Michael Raskin
e89aa035b9 Update Wine 2014-01-04 14:55:42 +04: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
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
Vladimír Čunát
1d6c351046 enable osmesa for wine (close #1228) 2013-12-10 16:36:23 +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
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
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
Mathijs Kwik
f918e06988 wine: upgrade to 1.6 + latest gecko/mono extensions 2013-07-30 14:25:10 +02: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
Michael Raskin
0c020c98f9 Updates: Wine, SBCL, XBoard 2013-05-08 10:52:47 +04:00
Vladimír Čunát
bde20f3e88 Merge branch 'master' into x-updates
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Michael Raskin
b98ece6bc2 Auto-update some packages; no early build failures (SBCL and Wine not yet fully built) 2013-04-23 09:15:48 +04:00