From 0b9a382fc8ae4653b568a7fba388b8674b7da4b2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 4 Jul 2014 21:42:14 +0400 Subject: [PATCH] Apparently nobody ever noticed that aria was already packaged when packaging it once more; merging expressions --- pkgs/tools/networking/aria/default.nix | 21 --------------------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 pkgs/tools/networking/aria/default.nix diff --git a/pkgs/tools/networking/aria/default.nix b/pkgs/tools/networking/aria/default.nix deleted file mode 100644 index c7ccefd045b..00000000000 --- a/pkgs/tools/networking/aria/default.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d43a43a19f6..c0a27fa1ab8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };