From e9c046c46489518244aa66c1c2114cde88bc75dc Mon Sep 17 00:00:00 2001 From: Joshua Potter Date: Sat, 9 Dec 2023 15:43:09 -0700 Subject: [PATCH] Update coach scraper instance. --- flake.lock | 64 ++++++++++---- flake.nix | 10 +-- phobos/flake.lock | 212 ++++++++++++++++++++++++++++++++++++++++++++-- phobos/flake.nix | 11 ++- 4 files changed, 264 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 569602b..b6455e7 100644 --- a/flake.lock +++ b/flake.lock @@ -4,7 +4,7 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1701963345, @@ -49,21 +49,21 @@ "inputs": { "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1702083349, - "narHash": "sha256-MJOKOHWPxsohDWbr7Om4AhViqQNtO1tlrMgBWU+HpE8=", + "lastModified": 1702166256, + "narHash": "sha256-4/uubLykBYihTxlemkTN0g7ZWbJGBEAVZQSopAdmZhw=", "owner": "boardwise-gg", "repo": "coach-scraper", - "rev": "811cf997d102973cd039787d55d123be41c5fe19", + "rev": "58815d3ae5a69cac12436a01e77019a5ac5d16a7", "type": "github" }, "original": { "owner": "boardwise-gg", - "ref": "v0.1.3", "repo": "coach-scraper", + "rev": "58815d3ae5a69cac12436a01e77019a5ac5d16a7", "type": "github" } }, @@ -185,9 +185,7 @@ "inputs": { "bootstrap": "bootstrap", "home-manager": "home-manager", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1, @@ -247,11 +245,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701805708, - "narHash": "sha256-hh0S14E816Img0tPaNQSEKFvSscSIrvu1ypubtfh6M4=", + "lastModified": 1699596684, + "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0561103cedb11e7554cf34cea81e5f5d578a4753", + "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73", "type": "github" }, "original": { @@ -278,6 +276,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1701805708, + "narHash": "sha256-hh0S14E816Img0tPaNQSEKFvSscSIrvu1ypubtfh6M4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0561103cedb11e7554cf34cea81e5f5d578a4753", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1700794826, "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", @@ -293,7 +307,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1701718080, "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", @@ -309,18 +323,32 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1701805708, + "narHash": "sha256-hh0S14E816Img0tPaNQSEKFvSscSIrvu1ypubtfh6M4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0561103cedb11e7554cf34cea81e5f5d578a4753", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "phobos": { "inputs": { "boardwise": "boardwise", "coach-scraper": "coach-scraper", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_5", "sops-nix": "sops-nix" }, "locked": { "lastModified": 1, - "narHash": "sha256-vbYxKHCKMZnAJDAki32lH6FZzdM5LLhc8o8sLvFAbS0=", + "narHash": "sha256-YM/S6K0dh6jbD0l7sCU3r3MpSZqrQYBgls9WaTXYs88=", "path": "./phobos", "type": "path" }, @@ -358,7 +386,7 @@ "root": { "inputs": { "framework": "framework", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "phobos": "phobos" } }, diff --git a/flake.nix b/flake.nix index f3ecefe..197d6a1 100644 --- a/flake.nix +++ b/flake.nix @@ -3,14 +3,8 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; - framework = { - url = "path:./framework"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - phobos = { - url = "path:./phobos"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + framework.url = "path:./framework"; + phobos.url = "path:./phobos"; }; outputs = { nixpkgs, framework, phobos, ... }: diff --git a/phobos/flake.lock b/phobos/flake.lock index 8a552d9..44b965d 100644 --- a/phobos/flake.lock +++ b/phobos/flake.lock @@ -21,6 +21,28 @@ "type": "github" } }, + "coach-scraper": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2", + "poetry2nix": "poetry2nix" + }, + "locked": { + "lastModified": 1702166256, + "narHash": "sha256-4/uubLykBYihTxlemkTN0g7ZWbJGBEAVZQSopAdmZhw=", + "owner": "boardwise-gg", + "repo": "coach-scraper", + "rev": "58815d3ae5a69cac12436a01e77019a5ac5d16a7", + "type": "github" + }, + "original": { + "owner": "boardwise-gg", + "repo": "coach-scraper", + "rev": "58815d3ae5a69cac12436a01e77019a5ac5d16a7", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1696426674, @@ -35,6 +57,20 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, + "flake-compat_2": { + "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" @@ -53,6 +89,64 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "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_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "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": 1700794826, @@ -87,24 +181,66 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1701805708, - "narHash": "sha256-hh0S14E816Img0tPaNQSEKFvSscSIrvu1ypubtfh6M4=", + "lastModified": 1701718080, + "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0561103cedb11e7554cf34cea81e5f5d578a4753", + "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1701952659, + "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_3", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "coach-scraper", + "nixpkgs" + ], + "systems": "systems_4", + "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": { "boardwise": "boardwise", - "nixpkgs": "nixpkgs_2", + "coach-scraper": "coach-scraper", + "nixpkgs": "nixpkgs_3", "sops-nix": "sops-nix" } }, @@ -143,6 +279,72 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "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": { + "id": "systems", + "type": "indirect" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "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 1a057bf..de5007a 100644 --- a/phobos/flake.nix +++ b/phobos/flake.nix @@ -4,7 +4,7 @@ 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"; + coach-scraper.url = "github:boardwise-gg/coach-scraper/58815d3ae5a69cac12436a01e77019a5ac5d16a7"; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -63,7 +63,14 @@ sops.defaultSopsFile = ./secrets.yaml; sops.secrets.SECRET_KEY_BASE = {}; - system.stateVersion = "23.11"; + swapDevices = [ + { + device = "/var/lib/swapfile"; + size = 16*1024; + } + ]; + + system.stateVersion = "23.05"; }; }; }