Merge branch 'master' into staging

Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh

pkgs/games/tibia/default.nix

@@ -3,11 +3,11 @@
 with stdenv.lib;
 assert stdenv.isi686;
 stdenv.mkDerivation {
-  name = "tibia-10.61";
+  name = "tibia-10.62";
 
   src = fetchurl {
-    url = http://static.tibia.com/download/tibia1061.tgz;
-    sha256 = "0dyhzhklarx9zj281d5pjxvfd1r740wdg79b07dj8ll8zwvxfqcz";
+    url = http://static.tibia.com/download/tibia1062.tgz;
+    sha256 = "0s7kxq3li0z8d23x51bwn2bc4vxj309vr9rzwr2025sm6yxn3x5l";
   };
 
   shell = stdenv.shell;
@@ -53,5 +53,6 @@ stdenv.mkDerivation {
     homepage = "http://tibia.com";
     license = stdenv.lib.licenses.unfree;
     platforms = ["i686-linux"];
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }

pkgs/games/xsnow/default.nix

@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, libXt, libXpm, libXext, imake }:
+
+stdenv.mkDerivation rec {
+
+  version = "1.42";
+  name = "xsnow";
+
+  src = fetchurl {
+    url = "http://dropmix.xs4all.nl/rick/Xsnow/xsnow-${version}.tar.gz";
+    sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh";
+  };
+
+  buildInputs = [
+    libXt libXpm libXext imake
+  ];
+
+  buildPhase = ''
+    xmkmf
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1
+    cp xsnow $out/bin/
+    cp xsnow.1 $out/share/man/man1/
+  '';
+
+  meta = {
+    description = "An X-windows application that will let it snow on the root, in between and on windows";
+    homepage = http://dropmix.xs4all.nl/rick/Xsnow/;
+    license = stdenv.lib.licenses.unfree;
+    maintainers = [ stdenv.lib.maintainers.robberer ];
+  }; 
+}