public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging.

Browse Source 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
This commit is contained in:
Peter Simons
2014-08-04 16:51:47 +02:00
parent 9253a95f6b b35770818d
commit 2d326e5032
1261 changed files with 4697 additions and 3318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/VisualBoyAdvance/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
meta = {
description = "A Game Boy/Game Boy Color/Game Boy Advance Emulator";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.sander ];
homepage = http://vba.ngemu.com;
broken = true;
pkgs/misc/emulators/bsod/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
blue screen of death on the console. Errors and drivers causing the
error are selected randomly from a large set of examples.";
homepage = "http://www.vanheusden.com/bsod/";
license = "GPLv2";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.antono ];
};
pkgs/misc/emulators/dlx/default.nix
+1 -1
View File
@@ -23,6 +23,6 @@ stdenv.mkDerivation {
meta = {
homepage = "http://www.davidviner.com/dlx.php";
description = "DLX Simulator";
license = "GPL-2";
license = stdenv.lib.licenses.gpl2;
};
}
pkgs/misc/emulators/fakenes/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://fakenes.sourceforge.net/;
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
description = "Portable Open Source NES Emulator";
};
}
pkgs/misc/emulators/hatari/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://hatari.tuxfamily.org/";
description = "Atari ST/STE/TT/Falcon emulator";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
platforms = with stdenv.lib.platforms; all;
};
}
pkgs/misc/emulators/mupen64plus/1.5.nix
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
meta = {
description = "A Nintendo 64 Emulator";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://code.google.com/p/mupen64plus;
maintainers = [ stdenv.lib.maintainers.sander ];
};
pkgs/misc/emulators/mupen64plus/default.nix
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
meta = {
description = "A Nintendo 64 Emulator";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://code.google.com/p/mupen64plus;
maintainers = [ stdenv.lib.maintainers.sander ];
};
pkgs/misc/emulators/uae/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
meta = {
description = "Ultimate/Unix/Unusuable Amiga Emulator";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://www.amigaemulator.org;
maintainers = [ stdenv.lib.maintainers.sander ];
};
pkgs/misc/emulators/vice/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Commodore 64, 128 and other emulators";
homepage = http://www.viceteam.org;
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.sander ];
};
}
pkgs/misc/emulators/wine/unstable.nix
+8 -8
View File
@@ -7,27 +7,27 @@ assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
let
version = "1.7.20";
version = "1.7.23";
name = "wine-${version}";
src = fetchurl {
url = "mirror://sourceforge/wine/${name}.tar.bz2";
sha256 = "05azpxrl7364ckvkwy7aa2p0vb4qhbc6wcn2l8khqb92jq5inhww";
sha256 = "012ww1yifayakw9n2m23sx83dc3i2xiq3bn5n9iprppdhwxpp76v";
};
gecko = fetchurl {
url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi";
sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh";
url = "mirror://sourceforge/wine/wine_gecko-2.24-x86.msi";
sha256 = "0b10f55q3sldlcywscdlw3kd7vl9izlazw7jx30y4rpahypaqf3f";
};
gecko64 = fetchurl {
url = "mirror://sourceforge/wine/wine_gecko-2.21-x86_64.msi";
sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw";
url = "mirror://sourceforge/wine/wine_gecko-2.24-x86_64.msi";
sha256 = "1j4wdlhzvjrabzr9igcnx0ivm5mcb8kp7bwkpfpfsanbifk7sma7";
};
mono = fetchurl {
url = "mirror://sourceforge/wine/wine-mono-0.0.8.msi";
sha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
url = "mirror://sourceforge/wine/wine-mono-4.5.2.msi";
sha256 = "1bgasysf3qacxgh5rlk7qlw47ar5zgd1k9gb22pihi5s87dlw4nr";
};
in stdenv.mkDerivation rec {
pkgs/misc/emulators/wine/winetricks.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A script to install DLLs needed to work around problems in Wine";
license = "LGPLv2.1";
license = stdenv.lib.licenses.lgpl21;
homepage = http://code.google.com/p/winetricks/;
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
};
pkgs/misc/emulators/wxmupen64plus/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = {
description = "GUI for the Mupen64Plus 2.0 emulator";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home;
};
}
pkgs/misc/emulators/zsnes/default.nix
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
meta = {
description = "A Super Nintendo Entertainment System Emulator";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.sander ];
homepage = http://www.zsnes.com;
};