internetarchive: 1.7.2 -> 1.8.1

1 files changed, 23 insertions, 28 deletions

diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix
index a8e270bd1c0..dda0680f537 100644
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@@ -1,46 +1,41 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, six, clint, pyyaml, docopt
-, requests, jsonpatch, args, schema, responses, backports_csv }:
+{ buildPythonPackage, fetchFromGitHub, pytest, six, clint, pyyaml, docopt
+, requests, jsonpatch, args, schema, responses, backports_csv, isPy3k
+, lib, glibcLocales }:
 
 buildPythonPackage rec {
-
   pname = "internetarchive";
-  version = "1.7.2";
+  version = "1.8.1";
 
   # Can't use pypi, data files for tests missing
   src = fetchFromGitHub {
     owner = "jjjake";
     repo = "internetarchive";
     rev = "v${version}";
-    sha256 = "1cijagy22qi8ydrvizqmi1whnc3qr94yk0910lwgpxjywcygggir";
+    sha256 = "1fdb0kr9hzgyh0l8d02khcjpsgyd63nbablhc49ncdsav3dhhr3f";
   };
-    # It is hardcoded to specific versions, I don't know why.
-    preConfigure = ''
-        sed "s/schema>=.*/schema>=0.4.0',/" -i setup.py
-        sed "/backports.csv/d" -i setup.py
-    '';
 
-    #phases = [ "unpackPhase" "configurePhase" "installPhase" "fixupPhase" "installCheckPhase" ];
-    buildInputs = [ pytest responses ];
-    propagatedBuildInputs = [
-      six
-      clint
-      pyyaml
-      docopt
-      requests
-      jsonpatch
-      args
-      schema
-      backports_csv
-    ];
+  propagatedBuildInputs = [
+    six
+    clint
+    pyyaml
+    docopt
+    requests
+    jsonpatch
+    args
+    schema
+  ] ++ lib.optional (!isPy3k) backports_csv;
 
-    # Tests disabled because ia binary doesn't exist when tests run
-    doCheck = false;
+  checkInputs = [ pytest responses glibcLocales ];
 
-    checkPhase = "pytest tests";
+  # tests depend on network
+  doCheck = false;
 
+  checkPhase = ''
+    LC_ALL=en_US.utf-8 pytest tests
+  '';
 
-  meta = with stdenv.lib; {
-      description = "A python wrapper for the various Internet Archive APIs";
+  meta = with lib; {
+    description = "A python wrapper for the various Internet Archive APIs";
     homepage = https://github.com/jjjake/internetarchive;
     license = licenses.agpl3;
   };