From 073369cdaa0bed835c15c645477ee8b1df4230cc Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Mon, 16 Jun 2014 20:08:38 +0000
Subject: [PATCH 1/3] rsync: sha256 for the patch was updated

---
 pkgs/applications/networking/sync/rsync/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 6a5c574f638..00a00530df4 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
   patches = [(fetchurl {
       url = "https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=0dedfbce2c1b851684ba658861fe9d620636c56a";
-      sha256 = "1jpwwdf07naqxc8fv1lspc95jgk50j5j3wvf037bjay2qzpwjmvf";
+      sha256 = "0j1pqmwsqc5mh815x28izi4baki2y2r5q8k7ma1sgs4xsgjc4rk8";
       name = "CVE-2014-2855.patch";
     })]
     ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";

From d105ed081f5e29ca0eab89f591b1d95653773e7f Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Thu, 24 Jul 2014 10:12:47 +0200
Subject: [PATCH 2/3] liquidfun: added google liquidfun (a box2d fork)

---
 .../libraries/liquidfun/default.nix           | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/libraries/liquidfun/default.nix

diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix
new file mode 100644
index 00000000000..02604fb94cf
--- /dev/null
+++ b/pkgs/development/libraries/liquidfun/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, requireFile, cmake, mesa, libX11, libXi, ... }:
+
+let 
+  sourceInfo = rec {
+    version="1.1.0";
+    name="liquidfun-${version}";
+    url="http://github.com/foo/${name}.tar.gz";
+    hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  src = requireFile {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+    name = sourceInfo.name + ".tar.gz";
+  };
+
+  inherit (sourceInfo) name version;
+  buildInputs = [ cmake mesa libX11 libXi ];
+
+  sourceRoot = "liquidfun/Box2D/";
+
+  preConfigurePhases = "preConfigure";
+
+  preConfigure = ''
+    sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@'
+    substituteInPlace Box2D/CMakeLists.txt --replace "Common/b2GrowableStack.h" "Common/b2GrowableStack.h Common/b2GrowableBuffer.h"
+  '';
+      
+  configurePhase = ''
+    mkdir Build
+    cd Build; 
+    cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out ..
+  '';
+
+  meta = {
+    description = "2D physics engine based on Box2D";
+    maintainers = with stdenv.lib.maintainers;
+    [
+      qknight
+    ];
+    platforms = with stdenv.lib.platforms;
+      linux;
+    license = "bsd";
+    homepage = https://google.github.io/liquidfun/;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3ba6a64df2..2128d237387 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5527,6 +5527,8 @@ let
 
   lirc = callPackage ../development/libraries/lirc { };
 
+  liquidfun = callPackage ../development/libraries/liquidfun { };
+
   liquidwar = builderDefsPackage ../games/liquidwar {
     inherit (xlibs) xproto libX11 libXrender;
     inherit gmp mesa libjpeg

From 87cdc61e784a9d96628127e84b972661c83f9fb6 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sun, 27 Jul 2014 22:02:38 +0200
Subject: [PATCH 3/3] liquidfun: updated url and license

---
 pkgs/development/libraries/liquidfun/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix
index 02604fb94cf..994c013c631 100644
--- a/pkgs/development/libraries/liquidfun/default.nix
+++ b/pkgs/development/libraries/liquidfun/default.nix
@@ -1,15 +1,13 @@
-{ stdenv, requireFile, cmake, mesa, libX11, libXi, ... }:
+{ stdenv, requireFile, cmake, mesa, libX11, libXi }:
 
 let 
   sourceInfo = rec {
     version="1.1.0";
     name="liquidfun-${version}";
-    url="http://github.com/foo/${name}.tar.gz";
+    url="https://github.com/google/liquidfun/releases/download/v${version}/${name}";
     hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86";
   };
-
 in
-
 stdenv.mkDerivation rec {
   src = requireFile {
     url = sourceInfo.url;
@@ -43,7 +41,7 @@ stdenv.mkDerivation rec {
     ];
     platforms = with stdenv.lib.platforms;
       linux;
-    license = "bsd";
+    license = stdenv.lib.licenses.bsd2;
     homepage = https://google.github.io/liquidfun/;
   };
 }