Merge branch 'master' into staging

pkgs/misc/cups/filters.nix

@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
-  version = "1.15.0";
+  version = "1.16.0";
 
   src = fetchurl {
     url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
-    sha256 = "0g6jmbzgvsq4dq6jaczr6fslpv3692v8yvvmqgw08sb3aly7kgd3";
+    sha256 = "1kcndzpbbcaxafnz1wa6acy3p3r5likfqmf057i5q0q6i176lz5k";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];

pkgs/misc/emulators/citra/default.nix

@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, cmake, SDL2, qtbase, boost, curl, gtest }:
+
+stdenv.mkDerivation rec { 
+  name = "citra-2017-07-26";
+
+  # Submodules
+  src = fetchgit {
+    url = "https://github.com/citra-emu/citra";
+    rev = "a724fb365787718f9e44adedc14e59d0854905a6";
+    sha256 = "0lkrwhxvq85c0smix27xvj8m463bxa67qhy8m8r43g39n0h8d5sf";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ SDL2 qtbase boost curl gtest ];
+  cmakeFlags = [ "-DUSE_SYSTEM_CURL=ON" "-DUSE_SYSTEM_GTEST=ON" ];
+
+  preConfigure = ''
+    # Trick configure system.
+    sed -n 's,^ *path = \(.*\),\1,p' .gitmodules | while read path; do
+      mkdir "$path/.git"
+    done
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = "https://citra-emu.org/";
+    description = "An open-source emulator for the Nintendo 3DS capable of playing many of your favorite games.";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

pkgs/misc/emulators/dosbox/unstable.nix

@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, mesa, autoreconfHook }:
+
+let revision = "4025";
+    revisionDate = "2017-07-02";
+    revisionSha = "0hbghdlvm6qibp0df35qxq35km4nza3sm301x380ghamxq2vgy6a";
+in stdenv.mkDerivation rec {
+  name = "dosbox-unstable-${revisionDate}";
+
+  src = fetchsvn {
+    url = "https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk";
+    rev = revision;
+    sha256 = revisionSha;
+  };
+
+  hardeningDisable = [ "format" ];
+
+  buildInputs = [ SDL SDL_net SDL_sound libpng mesa autoreconfHook ];
+
+  desktopItem = makeDesktopItem {
+    name = "dosbox";
+    exec = "dosbox";
+    comment = "x86 emulator with internal DOS";
+    desktopName = "DOSBox (SVN)";
+    genericName = "DOS emulator";
+    categories = "Application;Emulator;";
+  };
+
+  postInstall = ''
+     mkdir -p $out/share/applications
+     cp ${desktopItem}/share/applications/* $out/share/applications
+  '';
+
+  meta = {
+    homepage = http://www.dosbox.com/;
+    description = "A DOS emulator";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ binarin ];
+  };
+}

pkgs/misc/emulators/wine/sources.nix

@@ -32,15 +32,15 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.12";
+    version = "2.13";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "19qk880fk7xxzx9jcl6sjzilhzssn0csqlqr9vnfd1qlhjpi2v29";
+    sha256 = "1y3yb01lg90pi8a9qjmymg7kikwkmvpkjxi6bbk1q1lvs7fs7g3g";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "00qqpw5fmpwg4589q2dwlv3jrcyj0yzv4mk63w5ydhvmy5gq48wy";
+    sha256 = "1ivjx5pf0xqqmdc1k5skg9saxgqzh3x01vjgypls7czmnpp3aylb";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

pkgs/misc/vim-plugins/default.nix

@@ -1173,6 +1173,20 @@ rec {
 
   };
 
+  vim-yapf = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-yapf-2017-03-21";
+    src = fetchgit {
+      url = "https://github.com/mindriot101/vim-yapf";
+      rev = "324380d77c9cf8e46e22b2e4391702273a53f563";
+      sha256 = "0vsd53k5k8absc60qka8nlj2ij6k4zgff2a65ixc7vqcmawxr3nw";
+    };
+    dependencies = [];
+    buildPhase = ''
+      substituteInPlace ftplugin/python_yapf.vim \
+        --replace '"yapf"' '"${pythonPackages.yapf}/bin/yapf"'
+    '';
+  };
+
   lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "lushtags-2017-04-19";
     src = fetchgit {

pkgs/misc/vim-plugins/vim-plugin-names

@@ -92,6 +92,7 @@
 "github:mhinz/vim-startify"
 "github:michaeljsmith/vim-indent-object"
 "github:mileszs/ack.vim"
+"github:mindriot101/vim-yapf"
 "github:mkasa/lushtags"
 "github:mpickering/hlint-refactor-vim"
 "github:nathanaelkane/vim-indent-guides"

pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf

@@ -0,0 +1,4 @@
+    buildPhase = ''
+      substituteInPlace ftplugin/python_yapf.vim \
+        --replace '"yapf"' '"${pkgs.yapf}/bin/yapf"'
+    '';