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

Merge branch 'master' into closure-size

Browse Source
This commit is contained in:
Vladimír Čunát
2016-02-14 08:33:51 +01:00
parent 34922a3951 6a036d9fca
commit d039c87984
671 changed files with 37363 additions and 16671 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/mednafen/default.nix
+3 -3
View File
@@ -6,12 +6,11 @@
stdenv.mkDerivation rec {
name = "mednafen-${version}";
version = "0.9.38.6";
name = "mednafen-${meta.version}";
src = fetchurl {
url = "http://mednafen.fobby.net/releases/files/${name}.tar.bz2";
sha256 = "0ivy0vqy1cjd5namn4bdm9ambay6rdccjl9x5418mjyqdhydlq4l";
sha256 = "1n6y7b86sv11vd6rv8if3wr4qyihkjai9km1s4smqcisi3pvxcqv";
};
buildInputs = with stdenv.lib;
@@ -26,6 +25,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
version = "0.9.38.7";
description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator";
homepage = http://mednafen.sourceforge.net/;
license = licenses.gpl2;
pkgs/misc/emulators/mednafen/server.nix
+3 -3
View File
@@ -2,11 +2,10 @@
stdenv.mkDerivation rec {
name = "mednafen-server-${version}";
version = "0.5.2";
name = "mednafen-server-${meta.version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/mednafen/Mednafen-Server/${version}/${name}.tar.gz";
url = "http://mednafen.fobby.net/releases/files/${name}.tar.gz";
sha256="06fal6hwrb8gw94yp7plhcz55109128cgp35m7zs5vvjf1zfhcs9";
};
@@ -16,6 +15,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
version = "0.5.2";
description = "Netplay server for Mednafen";
homepage = http://mednafen.sourceforge.net/;
license = licenses.gpl2;
pkgs/misc/emulators/mupen64plus/1.5.nix
-33
View File
@@ -1,33 +0,0 @@
{stdenv, fetchurl, which, pkgconfig, SDL, gtk, mesa, SDL_ttf}:
stdenv.mkDerivation {
name = "mupen64plus-1.5";
src = fetchurl {
url = http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz;
sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq";
};
buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ];
preConfigure = ''
# Some C++ incompatibility fixes
sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Main.cpp
sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Combine.cpp
# Fix some hardcoded paths
sed -i -e "s|/usr/local|$out|g" main/main.c
# Remove PATH environment variable from install script
sed -i -e "s|export PATH=|#export PATH=|" ./install.sh
'';
buildPhase = "make all";
installPhase = "PREFIX=$out make install";
meta = {
description = "A Nintendo 64 Emulator";
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://code.google.com/p/mupen64plus;
maintainers = [ stdenv.lib.maintainers.sander ];
};
}
pkgs/misc/emulators/wine/packages.nix
+12 -39
View File
@@ -1,62 +1,35 @@
{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, fetchurl,
{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage,
pulseaudioSupport,
wineRelease ? "stable"
}:
let sources = with lib.getAttr wineRelease (import ./versions.nix); {
version = wineVersion;
src = fetchurl {
url = "mirror://sourceforge/wine/wine-${wineVersion}.tar.bz2";
sha256 = wineSha256;
};
wineGecko32 = fetchurl {
url = "mirror://sourceforge/wine/wine_gecko-${geckoVersion}-x86.msi";
sha256 = geckoSha256;
};
wineGecko64 = fetchurl {
url = "mirror://sourceforge/wine/wine_gecko-${gecko64Version}-x86_64.msi";
sha256 = gecko64Sha256;
};
wineMono = fetchurl {
url = "mirror://sourceforge/wine/wine-mono-${monoVersion}.msi";
sha256 = monoSha256;
};
};
inherit (sources) version;
in {
let src = lib.getAttr wineRelease (callPackage ./sources.nix {});
in with src; {
wine32 = import ./base.nix {
name = "wine-${version}";
inherit (sources) version src;
inherit src version pulseaudioSupport;
inherit (pkgsi686Linux) lib stdenv;
inherit pulseaudioSupport;
pkgArches = [ pkgsi686Linux ];
geckos = with sources; [ wineGecko32 ];
monos = with sources; [ wineMono ];
geckos = [ gecko32 ];
monos = [ mono ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
wine64 = import ./base.nix {
name = "wine64-${version}";
inherit (sources) version src;
inherit lib stdenv;
inherit pulseaudioSupport;
inherit src version pulseaudioSupport lib stdenv;
pkgArches = [ pkgs ];
geckos = with sources; [ wineGecko64 ];
monos = with sources; [ wineMono ];
geckos = [ gecko64 ];
monos = [ mono ];
configureFlags = "--enable-win64";
platforms = [ "x86_64-linux" ];
};
wineWow = import ./base.nix {
name = "wine-wow-${version}";
inherit (sources) version src;
inherit lib;
inherit src version pulseaudioSupport lib;
stdenv = stdenv_32bit;
inherit pulseaudioSupport;
pkgArches = [ pkgs pkgsi686Linux ];
geckos = with sources; [ wineGecko32 wineGecko64 ];
monos = with sources; [ wineMono ];
geckos = [ gecko32 gecko64 ];
monos = [ mono ];
buildScript = ./builder-wow.sh;
platforms = [ "x86_64-linux" ];
};
pkgs/misc/emulators/wine/sources.nix
+55
View File
@@ -0,0 +1,55 @@
{ pkgs ? import <nixpkgs> {} }:
let fetchurl = args@{url, sha256, ...}:
pkgs.fetchurl { inherit url sha256; } // args;
fetchFromGitHub = args@{owner, repo, rev, sha256, ...}:
pkgs.fetchFromGitHub { inherit owner repo rev sha256; } // args;
in rec {
stable = fetchurl rec {
version = "1.8.1";
url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
sha256 = "15ya496qq24ipqii7ij8x8h5x8n21vgqa4h6binb74w5mzdd76hl";
## see http://wiki.winehq.org/Gecko
gecko32 = fetchurl rec {
version = "2.40";
url = "mirror://sourceforge/wine/wine_gecko-${version}-x86.msi";
sha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s";
};
gecko64 = fetchurl rec {
version = "2.40";
url = "mirror://sourceforge/wine/wine_gecko-${version}-x86_64.msi";
sha256 = "0c4jikfzb4g7fyzp0jcz9fk2rpdl1v8nkif4dxcj28nrwy48kqn3";
};
## see http://wiki.winehq.org/Mono
mono = fetchurl rec {
version = "4.5.6";
url = "mirror://sourceforge/wine/wine-mono-${version}.msi";
sha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
};
};
unstable = fetchurl rec {
version = "1.9.3";
url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
sha256 = "0389xbs943iwdgv3a6pvcy2gxrwqzf20vrsbpd2yrj1lan2m8ps7";
inherit (stable) gecko32 gecko64 mono;
};
staging = fetchFromGitHub rec {
inherit (unstable) version;
sha256 = "0r932caxlkdw36f36f8y4h2r3anpl61fmqr9payb83fj55gsiq4d";
owner = "wine-compholio";
repo = "wine-staging";
rev = "v${version}";
};
winetricks = fetchFromGitHub rec {
version = "20160109";
sha256 = "0pnl5362g5q7py368vj07swbdp1fqbpvpq4jv4l5ddyclps8ajg8";
owner = "Winetricks";
repo = "winetricks";
rev = version;
};
}
pkgs/misc/emulators/wine/staging.nix
+3 -10
View File
@@ -1,18 +1,11 @@
{ stdenv, callPackage, lib, fetchFromGitHub, wineUnstable, libtxc_dxtn_Name }:
{ stdenv, callPackage, lib, wineUnstable, libtxc_dxtn_Name }:
with callPackage ./util.nix {};
let v = (import ./versions.nix).staging;
inherit (v) version;
patch = fetchFromGitHub {
inherit (v) sha256;
owner = "wine-compholio";
repo = "wine-staging";
rev = "v${version}";
};
let patch = (callPackage ./sources.nix {}).staging;
build-inputs = pkgNames: extra:
(mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra;
in assert (builtins.parseDrvName wineUnstable.name).version == version;
in assert (builtins.parseDrvName wineUnstable.name).version == patch.version;
stdenv.lib.overrideDerivation wineUnstable (self: {
nativeBuildInputs = build-inputs [ libtxc_dxtn_Name ] self.nativeBuildInputs;
pkgs/misc/emulators/wine/versions.nix
-30
View File
@@ -1,30 +0,0 @@
rec {
stable = {
wineVersion = "1.8";
wineSha256 = "1x66lzpk7v8qx57clmcq5ag7yh3mqplf1plypwghgchjh70lafzk";
## see http://wiki.winehq.org/Gecko
geckoVersion = "2.40";
geckoSha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s";
gecko64Version = "2.40";
gecko64Sha256 = "0c4jikfzb4g7fyzp0jcz9fk2rpdl1v8nkif4dxcj28nrwy48kqn3";
## see http://wiki.winehq.org/Mono
monoVersion = "4.5.6";
monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
};
unstable = {
wineVersion = "1.9.1";
wineSha256 = "1dhbp2jy9s3rqsbgc43jz967n2rls8dwdfi96qdxybg8kbxnachb";
inherit (stable)
geckoVersion geckoSha256
gecko64Version gecko64Sha256
monoVersion monoSha256;
};
staging = {
version = unstable.wineVersion;
sha256 = "05072wgxy8n6i71bb6649sm0ggh5c4g97clryrr8vkmgsklfkadi";
};
winetricks = {
version = "20160109";
sha256 = "0pnl5362g5q7py368vj07swbdp1fqbpvpq4jv4l5ddyclps8ajg8";
};
}
pkgs/misc/emulators/wine/winetricks.nix
+4 -10
View File
@@ -1,16 +1,10 @@
{ stdenv, fetchFromGitHub, wine, perl, which, coreutils, zenity, curl
{ stdenv, callPackage, wine, perl, which, coreutils, zenity, curl
, cabextract, unzip, p7zip, gnused, gnugrep, bash } :
let v = (import ./versions.nix).winetricks;
in stdenv.mkDerivation rec {
name = "winetricks-${v.version}";
stdenv.mkDerivation rec {
name = "winetricks-${src.version}";
src = fetchFromGitHub {
owner = "Winetricks";
repo = "winetricks";
rev = v.version;
sha256 = v.sha256;
};
src = (callPackage ./sources.nix {}).winetricks;
buildInputs = [ perl which ];