From 8a5a5e9a1c5b54365206c8cc48001ed9b84894af Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sun, 2 May 2021 10:06:31 +0200
Subject: [PATCH] aria2_exporter: Include as flake

---
 flake.lock       | 24 ++++++++++++++++++++++++
 flake.nix        |  6 ++++++
 pkgs/default.nix |  3 ---
 pkgs/modules.nix |  1 -
 pkgs/srcs.nix    |  6 ------
 5 files changed, 30 insertions(+), 10 deletions(-)
 delete mode 100644 pkgs/srcs.nix

diff --git a/flake.lock b/flake.lock
index 773ea41..dd12fe4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,28 @@
 {
   "nodes": {
+    "aria2_exporter": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1619942657,
+        "narHash": "sha256-T6lYBOrRCz/0IKnD5s09IqCtGVY/Y0u5RfnyE+jnTTM=",
+        "owner": "sbruder",
+        "repo": "aria2_exporter",
+        "rev": "11af495d33bfa3d3e3f0dda93f17874bbef4ef97",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sbruder",
+        "repo": "aria2_exporter",
+        "type": "github"
+      }
+    },
     "bang-evaluator": {
       "inputs": {
         "flake-utils": [
@@ -173,6 +196,7 @@
     },
     "root": {
       "inputs": {
+        "aria2_exporter": "aria2_exporter",
         "bang-evaluator": "bang-evaluator",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
diff --git a/flake.nix b/flake.nix
index ced6d8b..f2a2d1a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,10 +29,15 @@
     bang-evaluator.url = "git+https://git.sbruder.de/simon/bangs";
     bang-evaluator.inputs.flake-utils.follows = "flake-utils";
     bang-evaluator.inputs.nixpkgs.follows = "nixpkgs";
+
+    aria2_exporter.url = "github:sbruder/aria2_exporter";
+    aria2_exporter.inputs.flake-utils.follows = "flake-utils";
+    aria2_exporter.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
     { self
+    , aria2_exporter
     , bang-evaluator
     , flake-utils
     , home-manager
@@ -156,6 +161,7 @@
             home-manager.nixosModules.home-manager
             sops-nix.nixosModules.sops
 
+            aria2_exporter.nixosModules.aria2_exporter
             bang-evaluator.nixosModules.bang-evaluator
 
             # NIX_PATH for legacy tooling and flake registry pinning
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 3cbc99a..fc9a39f 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,7 +1,6 @@
 final: prev:
 let
   inherit (prev) callPackage;
-  srcs = import ./srcs.nix;
 in
 {
   bwrap-helper = callPackage ./bwrap-helper { };
@@ -15,8 +14,6 @@ in
     imprint = callPackage ./imprint { };
   };
 
-  aria2_exporter = import srcs.aria2_exporter { pkgs = final; };
-
   # adapted nixpkgs upstream but changed to buildGoModule and updated to
   # version that works in my setup
   prometheus-fritzbox-exporter = callPackage ./prometheus-fritzbox-exporter { };
diff --git a/pkgs/modules.nix b/pkgs/modules.nix
index cb81023..a9bfede 100644
--- a/pkgs/modules.nix
+++ b/pkgs/modules.nix
@@ -5,6 +5,5 @@ in
 {
   imports = [
     ./wordclock-dimmer/module.nix
-    "${srcs.aria2_exporter}/module.nix"
   ];
 }
diff --git a/pkgs/srcs.nix b/pkgs/srcs.nix
deleted file mode 100644
index d0881d2..0000000
--- a/pkgs/srcs.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  aria2_exporter = fetchTarball {
-    url = "https://github.com/sbruder/aria2_exporter/archive/141a9c0bdbfea2cda4e7a620cc74435a9d549c70.tar.gz";
-    sha256 = "1drdhlpfdwsaizi3ys4z6pd0cc19f0rq0ry21b98hphb37cv2cnb";
-  };
-}