runCommand -> runCommandCC

1 files changed, 14 insertions, 2 deletions

diff --git a/pkgs/games/humblebundle/fetch-humble-bundle/default.nix b/pkgs/games/humblebundle/fetch-humble-bundle/default.nix
index a27138d8..301b31ca 100644
--- a/pkgs/games/humblebundle/fetch-humble-bundle/default.nix
+++ b/pkgs/games/humblebundle/fetch-humble-bundle/default.nix
@@ -1,5 +1,9 @@
 { stdenv, curl, cacert, writeText, fetchFromGitHub, fetchpatch
+<<<<<<< Updated upstream
 , python, pythonPackages
+=======
+, python, buildPythonPackage, pythonPackages, humbleApi
+>>>>>>> Stashed changes
 
 , email, password
 }:
@@ -7,6 +11,7 @@
 { name ? null, machineName, downloadName ? "Download", suffix ? "humblebundle", md5 }: let
   cafile = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
+<<<<<<< Updated upstream
   humbleAPI = pythonPackages.buildPythonPackage rec {
     name = "humblebundle-${version}";
     version = "0.1.1";
@@ -20,6 +25,8 @@
 
     propagatedBuildInputs = with pythonPackages; [ requests2 ];
   };
+=======
+>>>>>>> Stashed changes
 
   pyStr = str: "'${stdenv.lib.escape ["'" "\\"] str}'";
 
@@ -48,7 +55,12 @@
             ${pyStr "Unable to find ${downloadName} for ${machineName}!"}
           print >>sys.stderr, 'Available download types:'
           for ds in dstruct:
-            print >>sys.stderr, "  " + ds.name
+            print >>sys.stderr, """
+              Name: {}
+              md5:  {}
+              Url:  {}
+              Size: {}
+            """.format(ds.name, ds.md5, ds.url, ds.human_size)
           raise SystemExit(1)
 
     hb = humblebundle.HumbleApi()
@@ -76,7 +88,7 @@ in stdenv.mkDerivation {
   outputHashAlgo = "md5";
   outputHash = md5;
 
-  buildInputs = [ python humbleAPI ];
+  buildInputs = [ python humbleApi ];
 
   buildCommand = ''
     url="$(python "${getDownloadURL}")"