alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
52645 commits 217 branches 121 tags 4.5 GiB
Commit graph

247 commits

Author SHA1 Message Date
Peter Simons bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-07-28 11:30:49 +02:00
Joachim Schiele d46c61b863 Merge pull request #3321 from qknight/snes9x-gtk 
added snes9x-gtk with pulseaudio support
 2014-07-27 21:38:25 +02:00
Joachim Schiele de1ae606db snes9x-gtk: added changes requested by offlinehacker 2014-07-27 21:37:52 +02:00
Bjørn Forsman f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2' 
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
 2014-07-23 20:22:14 +02:00
Joachim Schiele 743e3df3b8 made changes requested by pSub 2014-07-23 14:03:48 +02:00
Joachim Schiele 9d8a804047 added snes9x-gtk with pulseaudio support 2014-07-20 10:39:42 +02:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46.
 2014-06-30 14:56:10 +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 f2352f7ecf Merge recent master 2014-06-10 20:14:08 +02: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
Sterling Stein a0efad6861 fceux: Add package for a NES emulator. 2014-06-07 15:08:57 -07:00
Mateusz Kowalczyk 6c3cc8bb95 PPSSPP: add platforms 2014-06-07 22:28:56 +02:00
Vladimír Čunát 872860e6de Merge #1187 into p/stdenv 
Tested building firefox, kdelibs, evince on x86_64-linux.
 2014-05-29 22:16:07 +02:00
Mateusz Kowalczyk 59f98d0d8c PPSSPP: 0.9.8 2014-05-28 23:05:01 +02:00
Michael Raskin bc292a5882 Updating Wine unstable to 1.7.19 2014-05-28 01:33:28 +04:00
AndersonTorres 010833c634 mednafen: fix wrong URL (close #2696) 2014-05-20 09:16:30 +02:00
AndersonTorres b1dbafbdbb Mednafen: add version 0.9.34.1 + server 0.5.1 
Mednafen is a portable, CLI-driven, multi-system emulator
 2014-05-17 00:08:04 -03: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
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 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