1
0
Fork 0
forked from emily/nixfiles

florp: add about page

This commit is contained in:
emily 2024-11-09 20:20:55 +01:00
parent 2ca15ddaad
commit d6328117b8
Signed by untrusted user: emily
GPG key ID: F6F4C66207FCF995
4 changed files with 34 additions and 14 deletions

View file

@ -26,13 +26,10 @@
extraStatic."static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json); extraStatic."static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json);
extraStatic."static/terms-of-service.html" = pkgs.writeText "terms-of-service.html" '' extraStatic."static/terms-of-service.html" = inputs.florp-about.packages.${pkgs.system}.default;
<h3>Likes are now florps. The timeline goes sideways.</h3> extraStatic."images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${pkgs.system}.wallpaper;
''; extraStatic."images/florp_banner.avif" = inputs.florp-branding.packages.${pkgs.system}.banner;
extraStatic."favicon.png" = inputs.florp-branding.packages.${pkgs.system}.favicon;
extraStatic."images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.wallpaper;
extraStatic."favicon.png" = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon;
frontends = { frontends = {
primary = { primary = {

View file

@ -430,6 +430,26 @@
"type": "github" "type": "github"
} }
}, },
"florp-about": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1731180923,
"narHash": "sha256-DU0gHg/TgpoYBBvpiRIbRGVwLma5xfqxn6gHdIsAqko=",
"ref": "refs/heads/main",
"rev": "35e71f8654bc7df450f24003353fccf45ceb5678",
"revCount": 2,
"type": "git",
"url": "https://woof.rip/florp/about.git"
},
"original": {
"type": "git",
"url": "https://woof.rip/florp/about.git"
}
},
"florp-branding": { "florp-branding": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -437,11 +457,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730825511, "lastModified": 1731182323,
"narHash": "sha256-Ywc4Y+4VobocyxcVhHlJ5Q5h1fOdsJNlAlWlrkqC8U0=", "narHash": "sha256-Ecw7fOxv3hp1iLWBqlYW9TTNi0LTtiu92gtqfdn5v20=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "81bde12357d59215e7d67c7f55c2eb3d54c47689", "rev": "8aaf8c85b902eaaabfdeadd5502019b2816991b9",
"revCount": 2, "revCount": 3,
"type": "git", "type": "git",
"url": "https://woof.rip/florp/branding.git" "url": "https://woof.rip/florp/branding.git"
}, },
@ -1016,6 +1036,7 @@
"dns": "dns", "dns": "dns",
"fernglas": "fernglas", "fernglas": "fernglas",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"florp-about": "florp-about",
"florp-branding": "florp-branding", "florp-branding": "florp-branding",
"home-manager": "home-manager", "home-manager": "home-manager",
"hydra": "hydra", "hydra": "hydra",

View file

@ -25,6 +25,10 @@
url = "git+https://woof.rip/florp/branding.git"; url = "git+https://woof.rip/florp/branding.git";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
florp-about = {
url = "git+https://woof.rip/florp/about.git";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View file

@ -23,8 +23,6 @@ merge_theirs () {
test_build () { test_build () {
local last_error local last_error
local build_jobs local build_jobs
local start_time
start_time="$(date +%s)"
build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/latest-eval" | jq -r ".builds | .[]")" build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/latest-eval" | jq -r ".builds | .[]")"
for build in ${build_jobs}; do for build in ${build_jobs}; do
@ -45,7 +43,7 @@ test_build () {
done done
last_error="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}" | jq -r ".errortime")" last_error="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}" | jq -r ".errortime")"
[[ $last_error -gt $start_time ]] && [[ $last_error -gt $(date +%s) ]] &&
echo "Evaluation error encountered at $(date +%Y-%m-%d-%H:%M:%S --date="@${last_error}")" && echo "Evaluation error encountered at $(date +%Y-%m-%d-%H:%M:%S --date="@${last_error}")" &&
exit 1 exit 1
} }