Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'

2 files changed, 48 insertions, 2 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/prettytable/1.nix b/nixpkgs/pkgs/development/python-modules/prettytable/1.nix
new file mode 100644
index 000000000000..ccaa02e2f494
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/prettytable/1.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, glibcLocales
+, setuptools_scm
+, wcwidth
+}:
+
+buildPythonPackage rec {
+  pname = "prettytable";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0wcpp1nkicrswb353yn6xd2x535cpif62nw5rgz33c1wj0wzbdvb";
+  };
+
+  nativeBuildInputs = [ setuptools_scm ];
+  buildInputs = [ glibcLocales ];
+
+  propagatedBuildInputs = [ wcwidth ];
+
+  preCheck = ''
+    export LANG="en_US.UTF-8"
+  '';
+
+  # no test no longer available in pypi package
+  doCheck = false;
+  pythonImportsCheck = [ "prettytable" ];
+
+  meta = with stdenv.lib; {
+    description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format";
+    homepage = "http://code.google.com/p/prettytable/";
+    license = licenses.bsd3;
+  };
+
+}
diff --git a/nixpkgs/pkgs/development/python-modules/prettytable/default.nix b/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
index bf1035316a69..bc8bd3f835d6 100644
--- a/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
@@ -2,23 +2,32 @@
 , buildPythonPackage
 , fetchPypi
 , glibcLocales
+, setuptools_scm
+, wcwidth
 }:
 
 buildPythonPackage rec {
   pname = "prettytable";
-  version = "0.7.2";
+  version = "2.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ndckiniasacfqcdafzs04plskrcigk7vxprr2y34jmpkpf60m1d";
+    sha256 = "e37acd91976fe6119172771520e58d1742c8479703489321dc1d9c85e7259922";
   };
 
+  nativeBuildInputs = [ setuptools_scm ];
   buildInputs = [ glibcLocales ];
 
+  propagatedBuildInputs = [ wcwidth ];
+
   preCheck = ''
     export LANG="en_US.UTF-8"
   '';
 
+  # no test no longer available in pypi package
+  doCheck = false;
+  pythonImportsCheck = [ "prettytable" ];
+
   meta = with stdenv.lib; {
     description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format";
     homepage = "http://code.google.com/p/prettytable/";