Apparently nobody ever noticed that aria was already packaged when packaging it once more; merging expressions

This commit is contained in:
Michael Raskin 2014-07-04 21:42:14 +04:00
parent db88d93335
commit 0b9a382fc8
2 changed files with 1 additions and 23 deletions

View file

@ -1,21 +0,0 @@
args : with args;
let version="1.18.3"; in
rec {
src = /* Here a fetchurl expression goes */
fetchurl {
url = "mirror://sourceforge/aria2/stable/aria2-${version}.tar.bz2";
sha256 = "0y5wv7llq5sdwrsxqkc67wzk8gpb1kl4l1c0zl6l7kr0bkidna9r";
};
buildInputs = [];
configureFlags = [];
/* doConfigure should be specified separately */
phaseNames = ["doConfigure" "doMakeInstall"];
name = "aria-" + version;
meta = {
description = "Multiprotocol download manager";
};
}

View file

@ -548,9 +548,8 @@ let
inherit (androidenv) androidsdk_4_1;
aria = builderDefsPackage (import ../tools/networking/aria) { };
aria2 = callPackage ../tools/networking/aria2 { };
aria = aria2;
at = callPackage ../tools/system/at { };