Merge branch 'master' into staging

... to get the systemd update (rebuilding ~7k jobs).

5 files changed, 127 insertions, 123 deletions

diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 31e5683abc93..bcd3fcf9df20 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "minecraft-server-${version}";
-  version = "1.9";
+  version = "1.9.4";
 
   src  = fetchurl {
     url    = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar";
-    sha256 = "0z9sgnal55ari1dj4vac975wi9gk5hq30nhkw8155xbi1ksrg9rq";
+    sha256 = "1ba0xb0a8vkzpl4r6dkkh4y7sk667m4y5gbyxlads16q22magzhk";
   };
 
   installPhase = ''
diff --git a/pkgs/games/orbit/default.nix b/pkgs/games/orbit/default.nix
deleted file mode 100644
index de4c84f010cd..000000000000
--- a/pkgs/games/orbit/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, builderDefs, mesa, libXi, libXt, libXext, libX11
-, libXmu, freeglut }:
-
-with builderDefs;
-	let localDefs = builderDefs.passthru.function (rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			sha256 = "1kx69f9jqnfzwjh47cl1df8p8hn3bnp6bznxnb6c4wx32ijn5gri";
-			url = http://ftp.de.debian.org/debian/pool/main/s/space-orbit/space-orbit_1.01.orig.tar.gz;
-		};
-
-		buildInputs = [mesa libXi libXt libXext libX11 libXmu freeglut];
-		configureFlags = [];
-		debianPatch = 
-		fetchurl {
-			url = http://ftp.de.debian.org/debian/pool/main/s/space-orbit/space-orbit_1.01-9.diff.gz;
-			sha256 = "1v3s97day6fhv08l2rn81waiprhi1lfyjjsj55axfh6n6zqfn1w2";
-		};
-		customBuild = fullDepEntry (''
-			gunzip < ${debianPatch} | patch -Np1
-                        cd src
-			sed -e 's@/usr/share/games/orbit/@'$out'/dump/@g' -i *.c
-                        sed -e '/DIR=/d; s/-lesd//; s/-DESD//;' -i Makefile 
-                        make 
-                        mkdir -p $out/bin
-                        cp -r .. $out/dump
-                        cat >$out/bin/space-orbit <<EOF
-#! /bin/sh
-$out/dump/orbit "\$@"
-EOF
-                        chmod a+x $out/bin/space-orbit
-		'') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
-	});
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "space-orbit-1.01";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[ customBuild doForceShare doPropagate]);
-	meta = {
-		description = "Orbit space flight simulator";
-	};
-}
-
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index 42fa98e372d1..b8a8fae633b9 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "scummvm-1.7.0";
+  name = "scummvm-1.8.0";
   
   src = fetchurl {
     url = "mirror://sourceforge/scummvm/${name}.tar.bz2";
-    sha256 = "d9ff0e8cf911afa466d5456d28fef692a17d47ddecfd428bf2fef591237c2e66";
+    sha256 = "0f3zgvz886lk9ps0v333aq74vx6grlx68hg14gfaxcvj55g73v01";
   };
   
   buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ];
diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/games/space-orbit/default.nix
new file mode 100644
index 000000000000..e41ecf16136f
--- /dev/null
+++ b/pkgs/games/space-orbit/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl
+, mesa, libXi, libXt, libXext, libX11, libXmu, freeglut
+}:
+
+stdenv.mkDerivation rec {
+  name = "space-orbit-${version}";
+  version = "1.01";
+  patchversion = "9";
+
+  buildInputs = [ mesa libXi libXt libXext libX11 libXmu freeglut ];
+
+  src = fetchurl {
+    url = "mirror://debian/pool/main/s/space-orbit/space-orbit_${version}.orig.tar.gz";
+    sha256 = "1kx69f9jqnfzwjh47cl1df8p8hn3bnp6bznxnb6c4wx32ijn5gri";
+  };
+
+  patches = [
+    (fetchurl {
+       url = "mirror://debian/pool/main/s/space-orbit/space-orbit_${version}-${patchversion}.diff.gz";
+       sha256 = "1v3s97day6fhv08l2rn81waiprhi1lfyjjsj55axfh6n6zqfn1w2";
+     })
+  ];
+
+  preBuild = ''
+    cd src
+    sed -e 's@/usr/share/games/orbit/@'$out'/dump/@g' -i *.c
+    sed -e '/DIR=/d; s/-lesd//; s/-DESD//;' -i Makefile
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -r .. $out/dump
+    cat >$out/bin/space-orbit <<EOF
+#! ${stdenv.shell}
+exec $out/dump/orbit "\$@"
+EOF
+    chmod a+x $out/bin/space-orbit
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A space combat simulator";
+    license = licenses.gpl2;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 7a4fd611b1b4..ba163ebc3d29 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -8,90 +8,93 @@
 }:
 
 let
-  self = {
-    name = "steam";
+  commonTargetPkgs = pkgs: with pkgs; [
+    steamPackages.steam-fonts
+    # Errors in output without those
+    pciutils
+    python2
+    # Games' dependencies
+    xlibs.xrandr
+    which
+    # Needed by gdialog, including in the steam-runtime
+    perl
+    # Open URLs
+    xdg_utils
+  ];
 
-    targetPkgs = pkgs: with pkgs; [
-      steamPackages.steam
-      steamPackages.steam-fonts
-      # License agreement
-      gnome3.zenity
-      # Errors in output without those
-      pciutils
-      python2
-      # Games' dependencies
-      xlibs.xrandr
-      which
-      # Needed by gdialog, including in the steam-runtime
-      perl
-      # Open URLs
-      xdg_utils
-    ] ++ lib.optional withJava jdk
-      ++ lib.optional withPrimus (primus.override {
-           stdenv = overrideInStdenv stdenv [ useOldCXXAbi ];
-           stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ];
-         });
+in buildFHSUserEnv rec {
+  name = "steam";
 
-    multiPkgs = pkgs: with pkgs; [
-      # These are required by steam with proper errors
-      xlibs.libXcomposite
-      xlibs.libXtst
-      xlibs.libXrandr
-      xlibs.libXext
-      xlibs.libX11
-      xlibs.libXfixes
+  targetPkgs = pkgs: with pkgs; [
+    steamPackages.steam
+    # License agreement
+    gnome3.zenity
+  ] ++ commonTargetPkgs pkgs
+    ++ lib.optional withJava jdk
+    ++ lib.optional withPrimus (primus.override {
+         stdenv = overrideInStdenv stdenv [ useOldCXXAbi ];
+         stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ];
+       });
 
-      # Not formally in runtime but needed by some games
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-ugly
-      libdrm
+  multiPkgs = pkgs: with pkgs; [
+    # These are required by steam with proper errors
+    xlibs.libXcomposite
+    xlibs.libXtst
+    xlibs.libXrandr
+    xlibs.libXext
+    xlibs.libX11
+    xlibs.libXfixes
 
-      (steamPackages.steam-runtime-wrapped.override {
-        inherit nativeOnly runtimeOnly newStdcpp;
-      })
-    ];
+    # Not formally in runtime but needed by some games
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-ugly
+    libdrm
 
-    extraBuildCommands = ''
-      mkdir -p steamrt
-      ln -s ../lib/steam-runtime steamrt/${steam-runtime.arch}
-      ${lib.optionalString (steam-runtime-i686 != null) ''
-        ln -s ../lib32/steam-runtime steamrt/${steam-runtime-i686.arch}
-      ''}
-    '';
+    (steamPackages.steam-runtime-wrapped.override {
+      inherit nativeOnly runtimeOnly newStdcpp;
+    })
+  ];
 
-    extraInstallCommands = ''
-      mkdir -p $out/share/applications
-      ln -s ${steam}/share/icons $out/share
-      ln -s ${steam}/share/pixmaps $out/share
-      sed "s,/usr/bin/steam,$out/bin/steam,g" ${steam}/share/applications/steam.desktop > $out/share/applications/steam.desktop
-    '';
+  extraBuildCommands = ''
+    mkdir -p steamrt
+    ln -s ../lib/steam-runtime steamrt/${steam-runtime.arch}
+    ${lib.optionalString (steam-runtime-i686 != null) ''
+      ln -s ../lib32/steam-runtime steamrt/${steam-runtime-i686.arch}
+    ''}
+  '';
 
-    profile = ''
-      export STEAM_RUNTIME=/steamrt
-    '';
+  extraInstallCommands = ''
+    mkdir -p $out/share/applications
+    ln -s ${steam}/share/icons $out/share
+    ln -s ${steam}/share/pixmaps $out/share
+    sed "s,/usr/bin/steam,$out/bin/steam,g" ${steam}/share/applications/steam.desktop > $out/share/applications/steam.desktop
+  '';
 
-    runScript = "steam";
+  profile = ''
+    export STEAM_RUNTIME=/steamrt
+  '';
 
-    passthru.run = buildFHSUserEnv (self // {
-      name = "steam-run";
+  runScript = "steam";
 
-      runScript =
-        let ldPath = map (x: "/steamrt/${steam-runtime.arch}/" + x) steam-runtime.libs
-                   ++ lib.optionals (steam-runtime-i686 != null) (map (x: "/steamrt/${steam-runtime-i686.arch}/" + x) steam-runtime-i686.libs);
-        in writeScript "steam-run" ''
-          #!${stdenv.shell}
-          run="$1"
-          if [ "$run" = "" ]; then
-            echo "Usage: steam-run command-to-run args..." >&2
-            exit 1
-          fi
-          shift
-          export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH
-          exec "$run" "$@"
-        '';
+  passthru.run = buildFHSUserEnv {
+    name = "steam-run";
 
-      passthru = {};
-    });
-  };
+    targetPkgs = commonTargetPkgs;
+    inherit multiPkgs extraBuildCommands;
 
-in buildFHSUserEnv self
+    runScript =
+      let ldPath = map (x: "/steamrt/${steam-runtime.arch}/" + x) steam-runtime.libs
+                 ++ lib.optionals (steam-runtime-i686 != null) (map (x: "/steamrt/${steam-runtime-i686.arch}/" + x) steam-runtime-i686.libs);
+      in writeScript "steam-run" ''
+        #!${stdenv.shell}
+        run="$1"
+        if [ "$run" = "" ]; then
+          echo "Usage: steam-run command-to-run args..." >&2
+          exit 1
+        fi
+        shift
+        export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH
+        exec "$run" "$@"
+      '';
+  };
+}