simon/nixos-config
simon/nixos-config
1
1
Fork 0
Code Issues 8 Pull requests Actions Projects Activity

fuuko/torrent: Use nixpkgs unstable’s aria2

Browse source 
It has a new release of aria2 that includes the patch that was
previously manually applied.
This commit is contained in:
Simon Bruder 2021-08-24 22:05:28 +02:00
parent c0493bd3a5
commit 1aa325b1ec
Signed by: simon
GPG key ID: 8D3C82F9F309F8EC
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
machines/fuuko/services/torrent.nix
View file

@ -47,18 +47,6 @@ let
(k: v: "${k}=${toString' v}") (k: v: "${k}=${toString' v}")
settings)); 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: { mkProxyService = socket: port: {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "wireguard-wg-aria.service" ]; after = [ "wireguard-wg-aria.service" ];
@ -128,7 +116,7 @@ in
NetworkNamespacePath = "/run/netns/aria2"; NetworkNamespacePath = "/run/netns/aria2";
Restart = "always"; 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"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
User = "aria2"; User = "aria2";
Group = "aria2"; Group = "aria2";