From ae1c93404d87fb10403e7b3018b3b49876024950 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sat, 6 Mar 2021 03:11:43 +0100
Subject: [PATCH] scrape: convert scrapers to flake input

---
 flake.lock                          | 17 +++++++++++++++++
 flake.nix                           | 11 ++++++++---
 hosts/containers/scrape/default.nix | 10 +++-------
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0fccc05c..580fbd21 100644
--- a/flake.lock
+++ b/flake.lock
@@ -34,10 +34,27 @@
       "inputs": {
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
+        "scrapers": "scrapers",
         "secrets": "secrets",
         "yammat": "yammat"
       }
     },
+    "scrapers": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1614995337,
+        "narHash": "sha256-0MvWFV+Kvd83hcX75Z/rghrUyTPRObGjch7/hKxvROY=",
+        "ref": "master",
+        "rev": "77c864b4d7e1ef4075ed115b036791c75176bef7",
+        "revCount": 24,
+        "type": "git",
+        "url": "https://gitea.c3d2.de/astro/scrapers.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitea.c3d2.de/astro/scrapers.git"
+      }
+    },
     "secrets": {
       "locked": {
         "lastModified": 1614994700,
diff --git a/flake.nix b/flake.nix
index 1a6ce343..f569f9da 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,9 +6,11 @@
     secrets.url = "git+ssh://git@gitea.c3d2.de:2222/c3d2-admins/secrets.git";
     yammat.url = "git+https://gitea.c3d2.de/astro/yammat.git?ref=nix";
     yammat.flake = false;
+    scrapers.url = "git+https://gitea.c3d2.de/astro/scrapers.git";
+    scrapers.flake = false;
   };
 
-  outputs = { self, nixpkgs, secrets, nixos-hardware, yammat }:
+  outputs = { self, nixpkgs, secrets, nixos-hardware, yammat, scrapers }:
     let
       forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
 
@@ -74,9 +76,11 @@
       nixosConfigurations = let
         nixosSystem' =
           # Our custom NixOS builder
-          { ... }@args:
+          { extraArgs ? {}, ... }@args:
           nixpkgs.lib.nixosSystem (args // {
-            extraArgs = { inherit hostRegistry; };
+            extraArgs = extraArgs // {
+              inherit hostRegistry;
+            };
             extraModules = [
               self.nixosModules.c3d2
               ({ pkgs, ... }: {
@@ -157,6 +161,7 @@
               nixpkgs.overlays = [ secrets.overlays.scrape ];
             })
           ];
+          extraArgs = { inherit scrapers; };
           system = "x86_64-linux";
         };
 
diff --git a/hosts/containers/scrape/default.nix b/hosts/containers/scrape/default.nix
index 1831be6b..e0ee8d4e 100644
--- a/hosts/containers/scrape/default.nix
+++ b/hosts/containers/scrape/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, modulesPath, ... }:
+{ pkgs, scrapers, ... }:
 
 let
   freifunkNodes = {
@@ -23,14 +23,10 @@ in {
   environment.systemPackages = [ pkgs.git ];
 
   systemd.services = let
-    scrapers = import (pkgs.fetchgit {
-      url = "https://gitea.c3d2.de/astro/scrapers.git";
-      rev = "77c864b4d7e1ef4075ed115b036791c75176bef7";
-      sha256 = "1rj4dyn89zqyfaiv2ffi6g4x86l2xfgybyy5hlvxzgcabwaxdjyh";
-    }) { inherit pkgs; };
+    scraperPkgs = import scrapers { inherit pkgs; };
     makeService = { script, host, user ? "", password ? "" }: {
       script =
-        "${scrapers.${script}}/bin/${script} ${host} ${user} ${password}";
+        "${scraperPkgs.${script}}/bin/${script} ${host} ${user} ${password}";
     };
     makeNodeScraper = nodeId: {
       name = "scrape-node${nodeId}";