mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Code Issues Wiki Activity
48388 commits 249 branches 124 tags 7.1 GiB
Commit graph

211 commits

Author SHA1 Message Date
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 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
Sander van der Burg 14be409d8f Removed hardcoded paths to /bin and /usr/bin 
svn path=/nixpkgs/trunk/; revision=27906
 2011-07-22 20:09:00 +00:00
Sander van der Burg f635aceb5b Updated some meta information for the emulators I've tried recently. They all seem to work fine :-) 
svn path=/nixpkgs/trunk/; revision=27905
 2011-07-22 19:25:31 +00:00
Sander van der Burg 6ac699ba97 Added VisualBoy advance; a gameboy/gameboy color/gameboy advance emulator 
svn path=/nixpkgs/trunk/; revision=27904
 2011-07-22 18:31:42 +00:00
Sander van der Burg cb8409612c Added Mupen64 Plus, a nintendo 64 emulator 
svn path=/nixpkgs/trunk/; revision=27902
 2011-07-22 14:03:23 +00:00
Sander van der Burg b2548922bf Added UAE: Ultimate Amiga Emulator 
svn path=/nixpkgs/trunk/; revision=27541
 2011-06-26 19:49:51 +00:00
Sander van der Burg e4126afa44 Added ZSNES emulator package 
svn path=/nixpkgs/trunk/; revision=27539
 2011-06-25 22:25:50 +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
Lluís Batlle i Rossell a602209a6b Fixing the name of darcnes. 
svn path=/nixpkgs/trunk/; revision=26552
 2011-03-27 20:14:42 +00:00
Lluís Batlle i Rossell ef57b57b92 Adding two NES emulators. 
Because of them, I made allegro build the allegrogl library.
I also added the HawkNL library.


svn path=/nixpkgs/trunk/; revision=26517
 2011-03-25 22:15:48 +00:00
Eelco Dolstra 37a95e0084 * Fix the gens-gs build (http://hydra.nixos.org/build/955354). 
svn path=/nixpkgs/branches/x-updates/; revision=26297
 2011-03-14 10:54:10 +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
Sander van der Burg 239c243b0e Updated vice to version 2.2 
svn path=/nixpkgs/trunk/; revision=24756
 2010-11-18 13:59:25 +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
Eelco Dolstra 8e73500282 * Gens/GS doesn't build on 64-bit systems. 
svn path=/nixpkgs/trunk/; revision=23390
 2010-08-24 09:57:57 +00:00