Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix

6 files changed, 46 insertions, 11 deletions

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 1bb23911c86d..a114810fe00f 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -4,11 +4,11 @@
 , pulseaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-20141201";
+  name = "dolphin-emu-20150103";
   src = fetchgit {
     url = git://github.com/dolphin-emu/dolphin.git;
-    rev = "54f1e3a3c148d36e694d8bb08d282225bdcb3440";
-    sha256 = "1i0ps3ayga6m4v0jyflv2x6rr3cjrym0laafjdslggqkk04b2vjp";
+    rev = "03f716e651128a2da01f6afdd26545fafdd49971";
+    sha256 = "01dq5552wpfn7dvfvdxxzfxn1z08abqwpm4gf33c081bhhbsyny6";
     fetchSubmodules = false;
   };
 
diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix
new file mode 100644
index 000000000000..545691fa4d03
--- /dev/null
+++ b/pkgs/misc/emulators/fs-uae/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig
+, gettext, gtk, SDL, zlib, glib, openal, mesa, lua, freetype }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+
+  name = "fs-uae-${version}";
+  version = "2.4.1";
+
+  src = fetchurl {
+    urls = [ "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz" ];
+    sha256 = "05gvnrkl1aclq1a6z57k6rmdnsg2ghyjcscwq0w5dhc5vcalv6f0";
+  };
+
+  buildInputs = [ pkgconfig gettext gtk SDL zlib glib openal mesa lua freetype ];
+
+  phases = "unpackPhase buildPhase installPhase";
+
+  # Strange: the docs recommend SDL2, but it does compile only with SDL1
+  buildPhase = "make sdl=1";
+  installPhase = "make install prefix=$out";
+
+  meta = {
+    description = "An accurate, customizable Amiga Emulator";
+    longDescription = ''
+      FS-UAE integrates the most accurate Amiga emulation code available
+      from WinUAE. FS-UAE emulates A500, A500+, A600, A1200, A1000, A3000
+      and A4000 models, but you can tweak the hardware configuration and
+      create customized Amigas.
+    '';
+    license = licenses.gpl2Plus;
+    homepage = http://fs-uae.net;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
index d26b5281efa5..198226c759a5 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     the GNU General Public License (GPL). Stella was originally
     developed for Linux by Bradford W. Mott, and is currently
     maintained by Stephen Anthony.
-    As of its 3.5 release, Stella is officialy donationware. 
+    As of its 3.5 release, Stella is officially donationware. 
     '';
     homepage = http://stella.sourceforge.net/;
     license = licenses.gpl2;
diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix
index 0fa5a08d2dc8..85fc6df9520f 100644
--- a/pkgs/misc/emulators/uae/default.nix
+++ b/pkgs/misc/emulators/uae/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   buildInputs = [ pkgconfig gtk alsaLib SDL ];
   
   meta = {
-    description = "Ultimate/Unix/Unusuable Amiga Emulator";
+    description = "Ultimate/Unix/Unusable Amiga Emulator";
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = http://www.amigaemulator.org;
     maintainers = [ stdenv.lib.maintainers.sander ];
diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix
index fa421dce6039..edeb2bdb9908 100644
--- a/pkgs/misc/emulators/wine/unstable.nix
+++ b/pkgs/misc/emulators/wine/unstable.nix
@@ -7,12 +7,12 @@ assert stdenv.isLinux;
 assert stdenv.cc.gcc != null;
 
 let
-    version = "1.7.33";
+    version = "1.7.34";
     name = "wine-${version}";
 
     src = fetchurl {
       url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "0xcjsh3635i8wpzixzsl05m3dkq74vq193x3ipjr3fy0l9prslg3";
+      sha256 = "02rk686l0kpbnvplmwl0c7xqy2ymnxcxh38dknm35chg8ljknnjd";
     };
 
     gecko = fetchurl {
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index d6c08e99a51f..a00c0b5365a1 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -1,18 +1,18 @@
-{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala, python, intltool, fuse, ccnet}:
+{stdenv, fetchurl, which, automake, autoconf, pkgconfig, curl, libtool, vala, python, intltool, fuse, ccnet}:
 
 stdenv.mkDerivation rec
 {
-  version = "3.0.4";
+  version = "4.0.6";
   name = "seafile-shared-${version}";
 
   src = fetchurl
   {
     url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz";
-    sha256 = "0a0yj9k2rr3q42swwzn1js3r8bld9wcysw6p9415rw5jabcm1af0";
+    sha256 = "1vs1ckxkh0kg1wjklpwdz87d5z60r80q27xv1s6yl7ir65s6zq0i";
   };
 
   buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ];
-  propagatedBuildInputs = [ ccnet ];
+  propagatedBuildInputs = [ ccnet curl ];
 
   preConfigure = ''
   sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh