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 1278859d310c020c98f9
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
