oparl: turn oparl-scraper into a flake input

This commit is contained in:
Astro 2022-06-27 23:06:38 +02:00
parent 72494557b3
commit ab144440f9
3 changed files with 29 additions and 9 deletions

View File

@ -422,6 +422,23 @@
"type": "github"
}
},
"oparl-scraper": {
"flake": false,
"locked": {
"lastModified": 1656290558,
"narHash": "sha256-f9JRkxMWK4ONeCePB8UcQX8pAksQPF9YcxLbbcCgpFY=",
"owner": "offenesdresden",
"repo": "ratsinfo-scraper",
"rev": "0bc947ef28a6b83943db6fd9abbe2ae21ced7d06",
"type": "github"
},
"original": {
"owner": "offenesdresden",
"ref": "oparl",
"repo": "ratsinfo-scraper",
"type": "github"
}
},
"openwrt": {
"flake": false,
"locked": {
@ -491,6 +508,7 @@
"nixpkgs": "nixpkgs_3",
"nixpkgs-mobilizon": "nixpkgs-mobilizon",
"nixpkgs-openwebrx": "nixpkgs-openwebrx",
"oparl-scraper": "oparl-scraper",
"openwrt": "openwrt",
"openwrt-imagebuilder": "openwrt-imagebuilder",
"riscv64": "riscv64",

View File

@ -28,6 +28,10 @@
url = "github:nix-community/naersk";
inputs.nixpkgs.follows = "nixpkgs";
};
oparl-scraper = {
url = "github:offenesdresden/ratsinfo-scraper/oparl";
flake = false;
};
openwrt = {
url = "git+https://git.openwrt.org/openwrt/openwrt.git?ref=openwrt-21.02";
flake = false;
@ -87,7 +91,7 @@
};
};
outputs = inputs@{ self, nixpkgs, secrets, nixos-hardware, zentralwerk, yammat, scrapers, spacemsg, tigger, ticker, heliwatch, sops-nix, naersk, fenix, microvm, riscv64, ... }:
outputs = inputs@{ self, nixpkgs, secrets, nixos-hardware, zentralwerk, yammat, scrapers, spacemsg, tigger, ticker, heliwatch, sops-nix, naersk, fenix, microvm, riscv64, oparl-scraper, ... }:
let
inherit (nixpkgs) lib;
forAllSystems = lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
@ -642,7 +646,10 @@
modules = [
self.nixosModules.microvm
./hosts/containers/oparl
{ sops.defaultSopsFile = "${secrets}/hosts/oparl/secrets.yaml"; }
{
_module.args = { inherit oparl-scraper; };
sops.defaultSopsFile = "${secrets}/hosts/oparl/secrets.yaml";
}
];
};

View File

@ -1,11 +1,6 @@
{ zentralwerk, config, pkgs, ... }:
{ zentralwerk, oparl-scraper, config, pkgs, ... }:
let
ratsinfo-scraper = import (pkgs.fetchFromGitHub {
owner = "offenesdresden";
repo = "ratsinfo-scraper";
rev = "oparl";
sha256 = "sha256-f9JRkxMWK4ONeCePB8UcQX8pAksQPF9YcxLbbcCgpFY=";
}) { inherit pkgs; };
ratsinfo-scraper = import oparl-scraper { inherit pkgs; };
netConfig = zentralwerk.lib.config.site.net.serv;