From 244b575a1d88105c6cc34fe3e27e4931c9f26285 Mon Sep 17 00:00:00 2001 From: Chris Hodapp Date: Mon, 24 Apr 2017 17:14:24 -0400 Subject: [PATCH 1/3] ezdxf (Python package): init at 0.8.1 --- .../python-modules/ezdxf/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/ezdxf/default.nix diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix new file mode 100644 index 00000000000..18e8e98315c --- /dev/null +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchurl, isPy3k, pyparsing }: + +buildPythonPackage rec { + version = "0.8.1"; + name = "ezdxf-${version}"; + + src = fetchurl { + url = "mirror://pypi/e/ezdxf/${name}.zip"; + sha256 = "1q4la4h7840wb8l2jf39wy68gq5jwymkghb1a1mg8qblj424130k"; + }; + + # Tests fail on Python 3.x, but module imports and works + doCheck = !(isPy3k); + + propagatedBuildInputs = [ pyparsing ]; + + meta = with stdenv.lib; { + description = "Python package to read and write DXF drawings (interface to the DXF file format)"; + homepage = https://github.com/mozman/ezdxf/; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3222e4f1155..06455ecd599 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6990,6 +6990,8 @@ in { }; }; + ezdxf = callPackage ../development/python-modules/ezdxf {}; + facebook-sdk = buildPythonPackage rec { name = "facebook-sdk-0.4.0"; From 1e3416cc0a3454ade851ad420eca61a971327c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 25 Apr 2017 23:22:53 +0200 Subject: [PATCH 2/3] pythonPackages.ezdxf: fix tests --- .../development/python-modules/ezdxf/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index 18e8e98315c..6b0484f2c36 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -1,17 +1,19 @@ -{ stdenv, buildPythonPackage, fetchurl, isPy3k, pyparsing }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pyparsing, pytest }: buildPythonPackage rec { version = "0.8.1"; name = "ezdxf-${version}"; - src = fetchurl { - url = "mirror://pypi/e/ezdxf/${name}.zip"; - sha256 = "1q4la4h7840wb8l2jf39wy68gq5jwymkghb1a1mg8qblj424130k"; + src = fetchFromGitHub { + owner = "mozman"; + repo = "ezdxf"; + rev = "v${version}"; + sha256 = "1c20j96n3rsgzaakfjl0wnydaj2qr69gbnnjs6mfa1hz2fjqri22"; }; - # Tests fail on Python 3.x, but module imports and works - doCheck = !(isPy3k); - + buildInputs = [ pytest ]; + checkPhase = "python -m unittest discover -s tests"; + propagatedBuildInputs = [ pyparsing ]; meta = with stdenv.lib; { From 489fa7b723524d6c744ca018d448a921cfb1ade2 Mon Sep 17 00:00:00 2001 From: Chris Hodapp Date: Tue, 25 Apr 2017 17:34:45 -0400 Subject: [PATCH 3/3] ezdxf: Add hodapp as maintainer --- lib/maintainers.nix | 1 + pkgs/development/python-modules/ezdxf/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index bb8ca565dfd..304978d38b5 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -215,6 +215,7 @@ heel = "Sergii Paryzhskyi "; henrytill = "Henry Till "; hinton = "Tom Hinton "; + hodapp = "Chris Hodapp "; hrdinka = "Christoph Hrdinka "; iand675 = "Ian Duncan "; ianwookim = "Ian-Woo Kim "; diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index 6b0484f2c36..c6c6137a2d4 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { description = "Python package to read and write DXF drawings (interface to the DXF file format)"; homepage = https://github.com/mozman/ezdxf/; license = licenses.mit; + maintainers = with maintainers; [ hodapp ]; platforms = platforms.unix; }; }