1
0

Compare commits

..

1 Commits

Author SHA1 Message Date
Flake Update Bot
f54dfc570f Update nixpkgs 2025-11-23-02-03 2025-11-23 03:04:20 +01:00
13 changed files with 5 additions and 163 deletions

View File

@@ -1,3 +0,0 @@
# Options
This page is generated on build time.

View File

@@ -0,0 +1 @@
# Options

View File

@@ -1,3 +0,0 @@
# Packages
This page is generated on build time.

View File

@@ -1,6 +1 @@
---
hide:
- navigation
---
# Home

6
flake.lock generated
View File

@@ -650,11 +650,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1763421233,
"narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=",
"lastModified": 1763678758,
"narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648",
"rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b",
"type": "github"
},
"original": {

View File

@@ -1,8 +0,0 @@
{
pkgs,
}:
pkgs.clerie-build-support.writePythonScript {
name = "nixfiles-docs-generate-options-md";
text = builtins.readFile ./nixfiles-docs-generate-options-md.py;
}

View File

@@ -1,63 +0,0 @@
#!/usr/bin/env python3
import argparse
import json
from pathlib import Path
parser = argparse.ArgumentParser(prog="generate-options-docs.py")
parser.add_argument("options_json_file", type=Path)
args = parser.parse_args()
module_options = json.loads(args.options_json_file.read_text())
print("""---
hide:
- navigation
---
# Options
""")
def format_option_value(option_value):
if not isinstance(option_value, dict):
option_value = {
"_type": "literalExpression",
"text": str(option_value),
}
match option_value["_type"]:
case "literalExpression":
if "\n" in option_value["text"]:
return f"```\n{option_value['text']}\n```"
else:
return f"```\n{option_value['text']}\n```"
case "literalMD":
return option_value["text"]
case other_value_type:
raise Exception(f"Unhandle option value type {other_value_type}")
def print_option(option):
print(f"## `{option['name']}`")
print("")
if "description" in option and option["description"] is not None:
print(option['description'])
print("")
if "type" in option:
print("**Type:**")
print(f"`{option['type']}`")
print("")
if "default" in option:
print(f"**Default:**")
print(format_option_value(option['default']))
print("")
if "example" in option:
print(f"**Example:**")
print(format_option_value(option['example']))
print("")
for option in module_options:
print_option(option)

View File

@@ -1,8 +0,0 @@
{
pkgs,
}:
pkgs.clerie-build-support.writePythonScript {
name = "nixfiles-docs-generate-pkgs-md";
text = builtins.readFile ./nixfiles-docs-generate-pkgs-md.py;
}

View File

@@ -1,30 +0,0 @@
#!/usr/bin/env python3
import argparse
import json
from pathlib import Path
parser = argparse.ArgumentParser(prog="generate-pkgs-docs.py")
parser.add_argument("pkgs_json_file", type=Path)
args = parser.parse_args()
packages = json.loads(args.pkgs_json_file.read_text())
print("""---
hide:
- navigation
---
# Packages
""")
for package in packages:
print(f"## {package['name']}")
print("")
print("* Build status: "
f"[x86_64-linux](https://hydra.clerie.de/job/nixfiles/nixfiles/packages.x86_64-linux.{package['name']}) | "
f"[aarch64-linux](https://hydra.clerie.de/job/nixfiles/nixfiles/packages.aarch64-linux.{package['name']})"
)
print("")

View File

@@ -1,19 +0,0 @@
{
lib,
pkgs,
writeText,
}:
let
pkgNames = builtins.filter (attrName: attrName != "nixfiles-docs-pkgs") (builtins.attrNames (import ../../pkgs/overlay.nix null null));
pkgsDocs = builtins.map (pkgName: {
name = pkgName;
meta = pkgs."${pkgName}".meta;
}) pkgNames;
in
writeText "pkgs.json" (
builtins.toJSON pkgsDocs
)

View File

@@ -1,10 +1,6 @@
{
stdenv,
mkdocs-material,
nixfiles-docs-generate-options-md,
nixfiles-docs-generate-pkgs-md,
nixfiles-docs-options,
nixfiles-docs-pkgs,
mkdocs-material
}:
stdenv.mkDerivation {
@@ -14,13 +10,9 @@ stdenv.mkDerivation {
buildInputs = [
mkdocs-material
nixfiles-docs-generate-options-md
nixfiles-docs-generate-pkgs-md
];
buildPhase = ''
nixfiles-docs-generate-options-md ${nixfiles-docs-options} > pages/Options.md
nixfiles-docs-generate-pkgs-md ${nixfiles-docs-pkgs} > pages/Packages.md
python3 -m mkdocs build
'';

View File

@@ -28,9 +28,6 @@ final: prev: {
nix-remove-result-links = final.callPackage ./nix-remove-result-links {};
nixfiles-auto-install = final.callPackage ./nixfiles/nixfiles-auto-install.nix {};
nixfiles-docs = final.python3.pkgs.callPackage ./nixfiles-docs {};
nixfiles-docs-generate-pkgs-md = final.callPackage ./nixfiles-docs-generate-pkgs-md {};
nixfiles-docs-generate-options-md = final.callPackage ./nixfiles-docs-generate-options-md {};
nixfiles-docs-pkgs = final.callPackage ./nixfiles-docs-pkgs {};
nixfiles-docs-options = final.callPackage ./nixfiles-docs-options {};
nixfiles-generate-config = final.callPackage ./nixfiles/nixfiles-generate-config.nix {};
nixfiles-generate-backup-secrets = final.callPackage ./nixfiles/nixfiles-generate-backup-secrets.nix {};

View File

@@ -28,12 +28,3 @@ codeberg.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTY
codeberg.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8hZi7K1/2E2uBX8gwPRJAHvRAob+3Sn+y2hxiEhN0buv1igjYFTgFO2qQD8vLfU/HT/P/rqvEeTvaDfY1y/vcvQ8+YuUYyTwE2UaVU5aJv89y6PEZBYycaJCPdGIfZlLMmjilh/Sk8IWSEK6dQr+g686lu5cSWrFW60ixWpHpEVB26eRWin3lKYWSQGMwwKv4LwmW3ouqqs4Z4vsqRFqXJ/eCi3yhpT+nOjljXvZKiYTpYajqUC48IHAxTWugrKe1vXWOPxVXXMQEPsaIRc2hpK+v1LmfB7GnEGvF1UAKnEZbUuiD9PBEeD5a1MZQIzcoPWCrTxipEpuXQ5Tni4mN
# SHA256:mIlxA9k46MmM6qdJOdMnAQpzGxF4WIVVL+fj+wZbw0g
codeberg.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIVIC02vnjFyL+I4RHfvIGNtOgJMe769VTF1VR4EB3ZB
# Gnome Gitlab
# From: ssh-keyscan ssh.gitlab.gnome.org
# SHA256:WRRpoWo7szMzwlkYFeLoj0UItmVHfAI+r+hFgzwGARg
ssh.gitlab.gnome.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCmUnZ33O26kvhcmc6k1T8xlL3yJjeNt3gphvW9/5u/CO0z5G8PGr2km4jUhStuPJR9m77LrdCF5Ywm26hsBnoxK+1zMs7YTjriiGt4r0Q5btQS5J5zFAV6aYJEmCbQz/23n8+w9Jx3hPVS8A3VE9Vd52S+5DMeIQY8QR3LPpROyCIpkR425sN0D0VjRUAH0hn61zS8N1+Pw5te2ULbBriBB9cub2n1GBCsZ2ErX1ernwKffOz/fbi5mpGbGLlJabLBm81/AiNk6NLZWTAZiNZjztxRySZFSpSzGF54kttIePxNC1x9AtW4KMaIzjVK2DIrFONyZYiEX47ox5TXlc7VQaBICUoTrR91wpb5xl2HPKP4MvFqUAzubU2V8r91ISXrnJyfwDrSB7L9Jwg6B6pN+acIttC4gOFGTJg9qanmLxtonSpwv/NaLehI1+D4LR9Or+e8jjtKSc6vu8+ghqAni3XHoT9uSmt1UPd89dOhqbpk8Hc3KTubUC3WIjGnotE=
# SHA256:TiA9po6nO6jFso7wQNy4xLlth10lIfjv1dxuDabVIqw
ssh.gitlab.gnome.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBH8NuGQ3ArFGochlv6TKXhMhsgIwG743e93pLkAQTzfgds0g0k6QBimb40zavVjITjytiSaQsf+KncJgUjYd98o=
# SHA256:Y9G4dWiIfi53LR3InJWsIbv4lekUHonq/HrqTTm/rcw
ssh.gitlab.gnome.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHG6b3deoYMPwKEu9Sj+y6MBHYYUKQiAnta/go3aNv7R