From 1aa325b1ec8683fdac6135c06bcc6cbd4de1a720 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Tue, 24 Aug 2021 22:05:28 +0200
Subject: [PATCH] =?UTF-8?q?fuuko/torrent:=20Use=20nixpkgs=20unstable?=
 =?UTF-8?q?=E2=80=99s=20aria2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It has a new release of aria2 that includes the patch that was
previously manually applied.
---
 machines/fuuko/services/torrent.nix | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/machines/fuuko/services/torrent.nix b/machines/fuuko/services/torrent.nix
index af42c75..03c438f 100644
--- a/machines/fuuko/services/torrent.nix
+++ b/machines/fuuko/services/torrent.nix
@@ -47,18 +47,6 @@ let
       (k: v: "${k}=${toString' v}")
       settings));
 
-  # Without this patch, the download and upload lengths are wrong after pausing
-  # and unpausing. I don’t patch this globally (in the overlay), since aria2 is
-  # in the user environment and would have to be rebuilt on slow machines.
-  aria2 = pkgs.aria2.overrideAttrs (o: o // {
-    patches = [
-      (pkgs.fetchpatch {
-        url = "https://github.com/aria2/aria2/commit/6ebdddb9f159e87923736f25900897b3602305f9.diff";
-        sha256 = "1j5mnafiv92xnzghh03hfdvpn9647vfdcipamnvi8hnzk3ak4mj7";
-      })
-    ];
-  });
-
   mkProxyService = socket: port: {
     wantedBy = [ "multi-user.target" ];
     after = [ "wireguard-wg-aria.service" ];
@@ -128,7 +116,7 @@ in
       NetworkNamespacePath = "/run/netns/aria2";
 
       Restart = "always";
-      ExecStart = "${aria2}/bin/aria2c --conf-path=${configFile}";
+      ExecStart = "${pkgs.unstable.aria2}/bin/aria2c --conf-path=${configFile}";
       ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       User = "aria2";
       Group = "aria2";