diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-31 23:40:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-31 23:40:37 +0200 |
commit | 9785a32a7b16447fc8df88bf2bf59c24a015d002 (patch) | |
tree | c7e1297931e79191edf217a2873343c865736297 | |
parent | 1dd5dd480b1c66d534c64352ba28bea8df592b50 (diff) | |
parent | 9c961f0990af5ff27520e758393a2d2ab11acc34 (diff) |
Merge pull request #299087 from wegank/aria-alias
aria2: deprecate aria alias
-rw-r--r-- | pkgs/applications/video/tartube/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/persepolis/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 180315e5072ff..5b62399a04651 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -10,7 +10,7 @@ , youtube-dl , glib , ffmpeg -, aria +, aria2 }: python3Packages.buildPythonApplication rec { @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { playsound ffmpeg matplotlib - aria + aria2 ]; buildInputs = [ diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index 28d5b113c3363..b3b084c225964 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -2,7 +2,7 @@ , stdenv , buildPythonApplication , fetchFromGitHub -, aria +, aria2 , ffmpeg , libnotify , pulseaudio @@ -67,7 +67,7 @@ buildPythonApplication rec { # feed args to wrapPythonApp makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ aria ffmpeg libnotify ]}" + "--prefix PATH : ${lib.makeBinPath [ aria2 ffmpeg libnotify ]}" "\${qtWrapperArgs[@]}" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1b1819f735927..879d822f931a1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -79,6 +79,7 @@ mapAliases ({ arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 archiveopteryx = throw "archiveopteryx depended on an unsupported version of OpenSSL and was unmaintained"; # Added 2024-01-03 ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13 + aria = aria2; # Added 2024-03-26 aseprite-unfree = aseprite; # Added 2023-08-26 asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 asterisk_16 = throw "asterisk_16: Asterisk 16 is end of life and has been removed"; # Added 2023-04-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7ae2afa745bc..881ce4ea45bae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4194,7 +4194,6 @@ with pkgs; aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; }; - aria = aria2; as-tree = callPackage ../tools/misc/as-tree { }; |