From 359534a582db6740127a3c8586fcca66bc1fe1d2 Mon Sep 17 00:00:00 2001 From: Joshua Potter Date: Fri, 8 Dec 2023 17:57:21 -0700 Subject: [PATCH] Add coach-scraper to begin populating the database. --- flake.lock | 207 ++++++++++++++++++++++++++++++++++++++++++++++- phobos/flake.nix | 7 +- 2 files changed, 212 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index ba70e1b..569602b 100644 --- a/flake.lock +++ b/flake.lock @@ -45,6 +45,28 @@ "type": "github" } }, + "coach-scraper": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_3", + "poetry2nix": "poetry2nix" + }, + "locked": { + "lastModified": 1702083349, + "narHash": "sha256-MJOKOHWPxsohDWbr7Om4AhViqQNtO1tlrMgBWU+HpE8=", + "owner": "boardwise-gg", + "repo": "coach-scraper", + "rev": "811cf997d102973cd039787d55d123be41c5fe19", + "type": "github" + }, + "original": { + "owner": "boardwise-gg", + "ref": "v0.1.3", + "repo": "coach-scraper", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1696426674, @@ -73,6 +95,20 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, + "flake-compat_3": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -109,6 +145,42 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "framework": { "inputs": { "bootstrap": "bootstrap", @@ -150,6 +222,29 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "phobos", + "coach-scraper", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698974481, + "narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "4bb5e752616262457bc7ca5882192a564c0472d2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1701805708, @@ -198,9 +293,26 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1701718080, + "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "phobos": { "inputs": { "boardwise": "boardwise", + "coach-scraper": "coach-scraper", "nixpkgs": [ "nixpkgs" ], @@ -208,7 +320,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-12GAm+zOFk5V1yHAV/LeBvV/kLqE9Cz9WeCSEZbimxQ=", + "narHash": "sha256-vbYxKHCKMZnAJDAki32lH6FZzdM5LLhc8o8sLvFAbS0=", "path": "./phobos", "type": "path" }, @@ -217,6 +329,32 @@ "type": "path" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_4", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "phobos", + "coach-scraper", + "nixpkgs" + ], + "systems": "systems_5", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1702073125, + "narHash": "sha256-vUCREr5o0/BebmjgIBxAo56zGJ6DfB0FvjB35rsu4aY=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "c25a0f550aee8d15879ece3a5c3c8837f3effda7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "root": { "inputs": { "framework": "framework", @@ -275,6 +413,73 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "id": "systems", + "type": "indirect" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "phobos", + "coach-scraper", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1699786194, + "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/phobos/flake.nix b/phobos/flake.nix index 985053f..1a057bf 100644 --- a/phobos/flake.nix +++ b/phobos/flake.nix @@ -4,13 +4,14 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; boardwise.url = "github:boardwise-gg/website/v0.1.0"; + coach-scraper.url = "github:boardwise-gg/coach-scraper/v0.1.3"; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { boardwise, sops-nix, ... }: { + outputs = { boardwise, coach-scraper, sops-nix, ... }: { nixosModules.default = { modulesPath, pkgs, lib, system, ... }: { imports = lib.optional (builtins.pathExists ./do-userdata.nix) ./do-userdata.nix ++ [ (modulesPath + "/virtualisation/digital-ocean-config.nix") @@ -55,6 +56,10 @@ }; }; + environment.systemPackages = [ + coach-scraper.packages.${system}.app + ]; + sops.defaultSopsFile = ./secrets.yaml; sops.secrets.SECRET_KEY_BASE = {};