From 9da4f1242ad782a54b524f6c470cfe82be4a63b4 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 6 Jan 2018 20:49:58 +0100
Subject: pkgs.internetarchive: fix build

---
 krebs/5pkgs/simple/internetarchive/default.nix | 33 +++++++++++++-------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'krebs/5pkgs/simple/internetarchive')

diff --git a/krebs/5pkgs/simple/internetarchive/default.nix b/krebs/5pkgs/simple/internetarchive/default.nix
index f5e1bbff3..2f55e6f42 100644
--- a/krebs/5pkgs/simple/internetarchive/default.nix
+++ b/krebs/5pkgs/simple/internetarchive/default.nix
@@ -1,38 +1,39 @@
-{ pkgs, fetchFromGitHub, ... }:
+{ stdenv, pkgs, fetchPypi, ... }:
 with pkgs.python3Packages;
 buildPythonPackage rec {
   pname = "internetarchive";
   version = "1.7.3";
   name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0x3saklabdx7qrr11h5bjfd75hfbih7pw5gvl2784zvvvrqrz45g";
+  };
+
   propagatedBuildInputs = [
     requests
-      jsonpatch
-      docopt
-      clint
-      six
-      schema
-      backports_csv
+    jsonpatch
+    docopt
+    clint
+    six
+    schema
+    backports_csv
   ];
 
-# check only works when cloned from git repo
+  # check only works when cloned from git repo
   doCheck = false;
+
   checkInputs = [
     pytest
-      responses
+    responses
   ];
 
   prePatch = ''
     sed -i "s/'schema.*'/'schema>=0.4.0'/" setup.py
-    '';
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0x3saklabdx7qrr11h5bjfd75hfbih7pw5gvl2784zvvvrqrz45g";
-  };
+  '';
 
   meta = with stdenv.lib; {
     description = "python library and cli for uploading files to internet archive";
     license = licenses.agpl3;
   };
-
 }
-- 
cgit v1.2.3


From 05c6e0b86c3cc59662d8daf26e81127a18a96a50 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 8 Jan 2018 09:14:48 +0100
Subject: pkgs.internetarchive: remove fetchPypi, coming from python3Packages

---
 krebs/5pkgs/simple/internetarchive/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/5pkgs/simple/internetarchive')

diff --git a/krebs/5pkgs/simple/internetarchive/default.nix b/krebs/5pkgs/simple/internetarchive/default.nix
index 2f55e6f42..3c83093be 100644
--- a/krebs/5pkgs/simple/internetarchive/default.nix
+++ b/krebs/5pkgs/simple/internetarchive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchPypi, ... }:
+{ stdenv, pkgs, ... }:
 with pkgs.python3Packages;
 buildPythonPackage rec {
   pname = "internetarchive";
-- 
cgit v1.2.3