From 5b0013e4225fcf203ffce6de5e7b1dc9588440aa Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 15 Oct 2018 12:29:22 -0400
Subject: [PATCH] pythonPackages.box2d: 2.3b0 -> 2.3.2

refactor move to python-modules
---
 .../python-modules/box2d/default.nix          | 37 +++++++++++++++++++
 .../python-modules/box2d/disable-test.patch   | 14 -------
 pkgs/top-level/python-packages.nix            | 26 +------------
 3 files changed, 38 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/development/python-modules/box2d/default.nix
 delete mode 100644 pkgs/development/python-modules/box2d/disable-test.patch

diff --git a/pkgs/development/python-modules/box2d/default.nix b/pkgs/development/python-modules/box2d/default.nix
new file mode 100644
index 00000000000..f1bd8712679
--- /dev/null
+++ b/pkgs/development/python-modules/box2d/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, swig2
+, pkgs-box2d
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "Box2D";
+  version = "2.3.2";
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "d1557dffdf9c1d6c796ec5df53e3d93227bb026c14b8411d22c295edaa2fb225";
+  };
+
+  postPatch = ''
+    sed -i "s/'Box2D.tests' : 'tests'//" setup.py
+  '';
+
+  buildInputs = [ swig2 pkgs-box2d ];
+
+  # tests not included with pypi release
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pybox2d/pybox2d;
+    description = ''
+      A 2D game physics library for Python under
+      the very liberal zlib license
+    '';
+    license = licenses.zlib;
+    maintainers = with maintainers; [ sepi ];
+  };
+}
diff --git a/pkgs/development/python-modules/box2d/disable-test.patch b/pkgs/development/python-modules/box2d/disable-test.patch
deleted file mode 100644
index bc2897a8b10..00000000000
--- a/pkgs/development/python-modules/box2d/disable-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Common subdirectories: Box2D-2.3b0/Box2D and Box2D-2.3b0.new/Box2D
-Common subdirectories: Box2D-2.3b0/examples and Box2D-2.3b0.new/examples
-Common subdirectories: Box2D-2.3b0/library and Box2D-2.3b0.new/library
-diff -u Box2D-2.3b0/setup.py Box2D-2.3b0.new/setup.py
---- Box2D-2.3b0/setup.py	2013-02-02 18:09:34.000000000 +0100
-+++ Box2D-2.3b0.new/setup.py	2014-10-25 13:32:07.136922343 +0200
-@@ -176,7 +176,6 @@
-     package_dir      = {'Box2D': library_path, 
-                         'Box2D.b2': os.path.join(library_path, 'b2'),
-                         'Box2D.tests' : 'tests'},
--    test_suite       = 'tests',
-     options          = { 'build_ext': { 'swig_opts' : swig_arguments },
-                          'egg_info' : { 'egg_base' : library_base },
-                         },
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a65583a413b..144ee205ecc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1225,31 +1225,7 @@ in {
 
   bottle = callPackage ../development/python-modules/bottle { };
 
-  box2d = buildPythonPackage rec {
-    name = "box2d-${version}";
-    version = "2.3b0";
-    disabled = (!isPy27);
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/B/Box2D/Box2D-2.3b0.zip";
-      sha256 = "4519842c650b0153550eb0c9864da46b5a4ec8555c68b70f5cd2952a21c788b0";
-    };
-
-    patches = [ ../development/python-modules/box2d/disable-test.patch ];
-
-    propagatedBuildInputs = [ pkgs.swig2 pkgs.box2d ];
-
-    meta = {
-      homepage = https://code.google.com/p/pybox2d/;
-      description = ''
-        A 2D game physics library for Python under
-        the very liberal zlib license
-      '';
-      license = licenses.zlib;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ sepi ];
-    };
-  };
+  box2d = callPackage ../development/python-modules/box2d { pkgs-box2d = pkgs.box2d; };
 
   branca = callPackage ../development/python-modules/branca { };