diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-10-17 21:01:59 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-10-17 21:04:33 +0200 |
| commit | 12b2664cb75d7db596882b32412424efb032e860 (patch) | |
| tree | 1f6ba29c6ee6c8f71b024cf4250aa7a49bbc300d /pkgs/games/humblebundle/fetch-humble-bundle | |
| parent | 0a50f5fab1abf2e70fd5d7a2dd717c2f2c1b983b (diff) | |
Revert "runCommand -> runCommandCC"
This reverts commit e3f8d28d6be67257d70035d122263f3a35adc438 and my attempts to mitigate this in 0a50f5fab1abf2e70fd5d7a2dd717c2f2c1b983b and 3b91f25b37ea709f5c86e38a50061199bbed5341. Vuizvui is a repository for experimental stuff, but NOT a dumpster. So please refrain from pushing waste into this repository, like markers for a failed merge. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
Diffstat (limited to 'pkgs/games/humblebundle/fetch-humble-bundle')
| -rw-r--r-- | pkgs/games/humblebundle/fetch-humble-bundle/default.nix | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/games/humblebundle/fetch-humble-bundle/default.nix b/pkgs/games/humblebundle/fetch-humble-bundle/default.nix index 301b31ca..a27138d8 100644 --- a/pkgs/games/humblebundle/fetch-humble-bundle/default.nix +++ b/pkgs/games/humblebundle/fetch-humble-bundle/default.nix @@ -1,9 +1,5 @@ { stdenv, curl, cacert, writeText, fetchFromGitHub, fetchpatch -<<<<<<< Updated upstream , python, pythonPackages -======= -, python, buildPythonPackage, pythonPackages, humbleApi ->>>>>>> Stashed changes , email, password }: @@ -11,7 +7,6 @@ { 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"; @@ -25,8 +20,6 @@ propagatedBuildInputs = with pythonPackages; [ requests2 ]; }; -======= ->>>>>>> Stashed changes pyStr = str: "'${stdenv.lib.escape ["'" "\\"] str}'"; @@ -55,12 +48,7 @@ ${pyStr "Unable to find ${downloadName} for ${machineName}!"} print >>sys.stderr, 'Available download types:' for ds in dstruct: - print >>sys.stderr, """ - Name: {} - md5: {} - Url: {} - Size: {} - """.format(ds.name, ds.md5, ds.url, ds.human_size) + print >>sys.stderr, " " + ds.name raise SystemExit(1) hb = humblebundle.HumbleApi() @@ -88,7 +76,7 @@ in stdenv.mkDerivation { outputHashAlgo = "md5"; outputHash = md5; - buildInputs = [ python humbleApi ]; + buildInputs = [ python humbleAPI ]; buildCommand = '' url="$(python "${getDownloadURL}")" |