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

138 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
Lluís Batlle i Rossell 031d1ee8c5 Merge branch of 'hatari' 2013-04-23 11:06:17 +04:00
Lluís Batlle i Rossell 7ca16e5115 hatari: fix pthread_cancel+gcc_s thing, and some spacing 2013-04-23 11:05:46 +04: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
Jordi 019472eaa3 Add hatari Atari St emulator. 2013-04-22 22:10:15 +02: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
Lluís Batlle i Rossell 5f677039c7 Adding back the 1.5 expression of mupen64plus 
It has a GUI, for example.
 2013-03-28 18:16:40 +01:00
Lluís Batlle i Rossell 3abc3f4a68 Updating mupen64plus, and adding a GUI for it. 
I can't say the GUI works very well... it doesn't find the core properly,
but I couldn't find why.
 2013-03-28 18:13:18 +01: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
Peter Simons 7d3be6b5f9 dlx: link with gcc instead of g++ -- there is no c++ code here 2012-12-05 16:44:04 +01:00
Peter Simons c4038db19d dlx: install both hp.m and new.m microcode 2012-12-05 16:43:49 +01:00
Peter Simons 50e7ddbdca Add DLX simulator. Upstream provides no version number. 2012-12-04 14:29:48 +01: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
Antono Vasiljev 584ff70a16 Use installPhase instead of builder for BSOD 2012-06-25 18:04:08 +03:00
Antono Vasiljev 182f0dfe5e Added bsod emulator for unix 2012-06-25 17:25:01 +03:00
Yury G. Kudryashov 68fe867e19 Get rid of most references to gtkLibs 
svn path=/nixpkgs/trunk/; revision=33088
 2012-03-14 21:57:32 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
 2012-03-05 10:00:23 +00:00
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
 2012-02-06 23:03:12 +00:00
Yury G. Kudryashov df037ddafd svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31987
 2012-02-02 20:36:11 +00:00
Yury G. Kudryashov 9d67ff2a48 Remove glib-1.x and its reverse dependencies 
Nobody told me that he uses generator or xmms, so I'm removing this old stuff.

svn path=/nixpkgs/trunk/; revision=31907
 2012-01-28 13:06:07 +00:00
Eelco Dolstra f878980c8b * Fix building Dosbox with GCC 4.6. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31796
 2012-01-23 17:21:37 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Yury G. Kudryashov 571365c5bd Merge trunk into branches/libpng15. No conflicts. 
svn path=/nixpkgs/branches/libpng15/; revision=30917
 2011-12-15 20:14:55 +00:00
Michael Raskin 279e5fb324 Update Wine 
svn path=/nixpkgs/trunk/; revision=30366
 2011-11-10 04:31:52 +00:00
Yury G. Kudryashov 8b511df7b9 Fix visualboyadvance compilation with libpng-1.5; patch from gentoo 
svn path=/nixpkgs/branches/libpng15/; revision=29651
 2011-10-05 06:33:10 +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