From 440fc97f7f4e7a32fab0ad31a4461d4ffa2d3c1f Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sun, 2 May 2021 17:10:36 +0200
Subject: [PATCH] AriaNg: Include as flake

---
 flake.lock                          | 24 ++++++++++++++++++++++++
 flake.nix                           |  7 +++++++
 machines/fuuko/services/torrent.nix |  7 +------
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index dd12fe4..de95dfb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,28 @@
 {
   "nodes": {
+    "AriaNg": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1619967350,
+        "narHash": "sha256-+eIfC+65Tqs/B6EmtHVMeNiFoId/jClVmqnEWGZMzbE=",
+        "ref": "master",
+        "rev": "2dc260f73f9b612b7055cbd1c9ac0a49bdbee56a",
+        "revCount": 603,
+        "type": "git",
+        "url": "https://git.sbruder.de/simon/AriaNg"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.sbruder.de/simon/AriaNg"
+      }
+    },
     "aria2_exporter": {
       "inputs": {
         "flake-utils": [
@@ -196,6 +219,7 @@
     },
     "root": {
       "inputs": {
+        "AriaNg": "AriaNg",
         "aria2_exporter": "aria2_exporter",
         "bang-evaluator": "bang-evaluator",
         "flake-utils": "flake-utils",
diff --git a/flake.nix b/flake.nix
index f2a2d1a..e88852d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,10 +33,15 @@
     aria2_exporter.url = "github:sbruder/aria2_exporter";
     aria2_exporter.inputs.flake-utils.follows = "flake-utils";
     aria2_exporter.inputs.nixpkgs.follows = "nixpkgs";
+
+    AriaNg.url = "git+https://git.sbruder.de/simon/AriaNg";
+    AriaNg.inputs.flake-utils.follows = "flake-utils";
+    AriaNg.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
     { self
+    , AriaNg
     , aria2_exporter
     , bang-evaluator
     , flake-utils
@@ -187,6 +192,8 @@
                     overlays = config.nixpkgs.overlays;
                   };
                 })
+
+                AriaNg.overlay
               ];
             })
 
diff --git a/machines/fuuko/services/torrent.nix b/machines/fuuko/services/torrent.nix
index 5224ee7..1c209dc 100644
--- a/machines/fuuko/services/torrent.nix
+++ b/machines/fuuko/services/torrent.nix
@@ -172,12 +172,7 @@ in
 
     locations = {
       "/" = {
-        root = toString (import
-          (pkgs.fetchzip {
-            url = "https://git.sbruder.de/simon/AriaNg/archive/51c53f298091a6a6b6077febc2bc9370acb47271.tar.gz";
-            sha256 = "0f8j86l3fw71q1m00radlv2bg33l9jad0razyalvspzam3p3bsk1";
-          })
-          { inherit pkgs; });
+        root = pkgs.AriaNg;
       };
       "/jsonrpc" = {
         proxyPass = "http://unix:${homeDir}/rpc.sock";