philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

89 commits

Author SHA1 Message Date
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
Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
 2013-04-04 21:43:40 +02:00
Moritz Ulrich 51229692ca Add sha256 hash to winetricks. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-03-30 20:00:05 +01:00
Michael Raskin e9439d7811 Fix Wine libDRM reference 2013-03-29 09:29:19 +04:00
Michael Raskin c8acc350b9 Wine: update to 1.5.25 2013-03-07 00:28:59 +04:00
Corey O'Connor fde87b3a9b add winetricks, modified by vcunat@gmail.com 
Originally from #89.
 2013-02-10 16:20:24 +01:00
Vladimír Čunát 0fa7bc7379 wine: update to 1.5.23, update gecko 2013-02-02 15:03:02 +01:00
Evgeny Egorochkin 5dcdcf4af3 Remove Wine-Warcraft because WarCraft 3 works just fine in vanilla Wine now. 2013-01-15 07:43:40 +02:00
Michael Raskin 029d4fd1db Wine: Update to 1.5.21 2013-01-07 01:35:58 +04:00
Michael Raskin 17a4e01c69 Wine: update to 1.5.20 2012-12-22 14:54:22 +04:00
Michael Raskin 50f368c0ec Update Wine 2012-12-08 13:28:15 +04:00
Evgeny Egorochkin 21379504a4 Wine: add printing(cups) support 2012-12-03 17:02:01 +02:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Michael Raskin 3061db0bb2 Wine: update, add auto-update helper 2012-11-10 14:43:17 +04:00
Michael Raskin 07f44ad945 Update Wine 2012-10-17 17:22:32 +04:00
Michael Raskin 2a2b52201e Wine: update to 1.5.10 2012-08-09 12:55:30 +04:00
Eelco Dolstra 0435f39008 wine: Update to 1.5.9 2012-07-22 01:18:02 -04:00
Peter Simons f7a95ce194 wine: update to version 1.5.5 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 16:53:51 +02:00
Michael Raskin 279e5fb324 Update Wine 
svn path=/nixpkgs/trunk/; revision=30366
 2011-11-10 04:31:52 +00:00
Eelco Dolstra fc77db6d21 * Wine 1.3.29. 
svn path=/nixpkgs/trunk/; revision=29617
 2011-10-03 20:42:45 +00:00
Michael Raskin ce77d02c9e Update Wine 
svn path=/nixpkgs/trunk/; revision=28844
 2011-08-27 07:22:17 +00:00
Eelco Dolstra ae6fa8071f * Wine updated to 1.3.26. 
svn path=/nixpkgs/trunk/; revision=28209
 2011-08-06 23:26:38 +00:00
Michael Raskin 6e2572440a Update Wine 
svn path=/nixpkgs/trunk/; revision=28126
 2011-08-02 18:58:42 +00:00
Michael Raskin db4fdfec67 Update Wine 
svn path=/nixpkgs/trunk/; revision=27416
 2011-06-11 07:26:37 +00:00
Michael Raskin 9926941bf2 Fixing forgotten hash for Wine update 
svn path=/nixpkgs/trunk/; revision=27065
 2011-04-30 19:42:48 +00:00
Michael Raskin bb809bb2c3 Update Wine 
svn path=/nixpkgs/trunk/; revision=27063
 2011-04-30 16:32:53 +00:00
Peter Simons edfedf6736 pkgs/misc/emulators/wine: enable Hydra builds on x86_64-linux 
Wine is supposed to compile on both 32 and 64-bit Linux. When I try to build
it in a 64 bit environment, however, the build fails while compiling libgmp,
saying that the C compiler in bootstrap-tools doesn't support C++. I'm not
sure why that happens. Hopefully, the builds in Hydra give me some clue
about this phenomenon.

svn path=/nixpkgs/trunk/; revision=25693
 2011-01-26 15:39:40 +00:00
Michael Raskin 961c737634 Update Wine 
svn path=/nixpkgs/trunk/; revision=24892
 2010-11-27 18:41:49 +00:00
Evgeny Egorochkin 6748294477 wine-warcraft: add missing deps 
svn path=/nixpkgs/trunk/; revision=24683
 2010-11-14 08:57:42 +00:00
Evgeny Egorochkin a1b688cbfd Wine-Warcraft: minor cleanup 
svn path=/nixpkgs/trunk/; revision=24307
 2010-10-15 20:06:20 +00:00
Michael Raskin d61a0a42ca Update wine 
svn path=/nixpkgs/trunk/; revision=24166
 2010-10-08 05:33:59 +00:00
Peter Simons 8b37e1a514 pkgs/misc/emulators/wine: enable multi-threaded builds 
svn path=/nixpkgs/trunk/; revision=24051
 2010-10-04 11:51:17 +00:00
Peter Simons 94826ffee2 pkgs/misc/emulators/wine: encode paths to libpng and libjpeg in RPATH to ensure that WINE will find them at run-time 
svn path=/nixpkgs/trunk/; revision=24050
 2010-10-04 11:51:10 +00:00
Peter Simons fb4249da1a pkgs/misc/emulators/wine: add support for gecko HTML rendering engine 
svn path=/nixpkgs/trunk/; revision=24021
 2010-10-01 13:45:19 +00:00
Peter Simons 30eddde3f5 pkgs/misc/emulators/wine: added support for gnutls 
svn path=/nixpkgs/trunk/; revision=24020
 2010-10-01 13:45:12 +00:00
Peter Simons 0a0fe89bf7 pkgs/misc/emulators/wine: strip trailing whitespace 
svn path=/nixpkgs/trunk/; revision=24019
 2010-10-01 13:45:02 +00:00
Evgeny Egorochkin 3cc7d2ed7c Wine-Warcraft: finally it works 
svn path=/nixpkgs/trunk/; revision=23993
 2010-09-30 09:01:04 +00:00
Evgeny Egorochkin e91ff5eabd Wine with patches for Warcraft 3 
svn path=/nixpkgs/trunk/; revision=23933
 2010-09-26 05:05:18 +00:00
Michael Raskin 93e22996b1 Update Wine 
svn path=/nixpkgs/trunk/; revision=23887
 2010-09-21 21:43:32 +00:00
Michael Raskin 21580dc847 Update Wine 
svn path=/nixpkgs/trunk/; revision=22866
 2010-08-02 10:02:23 +00:00
Eelco Dolstra 9fa00f1a76 * Wine 1.2rc7. 
svn path=/nixpkgs/trunk/; revision=22555
 2010-07-12 09:17:27 +00:00
Eelco Dolstra 76143618b6 svn path=/nixpkgs/trunk/; revision=22059 2010-05-30 19:03:26 +00:00