Matsubaa/FedDIY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add packaging and deployment targets to architecture documentation; update roadmap with container packaging details and review policy

Browse Source
This commit is contained in:
Kyle J. Turpin
2026-05-23 18:15:31 -05:00
parent e20669e42a
commit 94c7cadcd7
4 changed files with 77 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.nix
+61 -26
View File
@@ -36,7 +36,7 @@
templates = {
default = {
path = ./.;
description = "FeDIY Rust development environment and package outputs";
description = "FeDIY Rust development environment and package outputs for Nix and non-Nix contributors";
};
};
@@ -59,24 +59,39 @@
{ pkgs }:
{
default = pkgs.mkShell {
packages = with pkgs; [
# Rust toolchain (managed by fenix overlay)
rustToolchain
rust-analyzer
# Build essentials
git
gnumake
openssl
pkg-config
# Cargo productivity tools
cargo-deny
cargo-edit
cargo-watch
# Code quality
pre-commit
# Packaging
flatpak-builder
];
packages =
with pkgs;
[
# Rust toolchain (managed by fenix overlay)
rustToolchain
rust-analyzer
# Build essentials
git
gnumake
openssl
pkg-config
# Local database tooling
postgresql
# Localization tooling
gettext
# Browser and accessibility testing
chromium
playwright
# Cargo productivity tools
cargo-deny
cargo-edit
cargo-watch
# Code quality
pre-commit
# Packaging
flatpak-builder
]
++ lib.optionals pkgs.stdenv.isLinux [
# OCI/container tooling (Linux host only)
podman
podman-compose
buildah
];
env = {
# Required by rust-analyzer
@@ -91,8 +106,14 @@
fi
echo "[FeDIY] Welcome to the dev shell!"
echo "Tools: cargo, rustc, clippy, rustfmt, rust-analyzer, flatpak-builder"
echo "Run 'cargo build' to build, 'make flatpak-build' for Flatpak, or 'nix run .#dev-helper' for a tool summary."
echo "If you're new to Nix: this shell gives you the exact tools this repo expects."
echo "Start with 'cargo build'. Use 'nix run .#dev-helper' for a quick tool summary."
echo "Tools: cargo, rustc, clippy, rustfmt, rust-analyzer, flatpak-builder, psql, gettext, chromium, playwright"
echo "Packaging note: the shell is intentionally reviewed and trimmed as the roadmap changes."
if command -v podman >/dev/null 2>&1; then
echo "OCI tools: podman, podman-compose, buildah"
fi
echo "Run 'cargo build' to build, 'cargo test' to test, or 'make flatpak-build' for Flatpak."
echo "See README.md for usage."
'';
};
@@ -113,11 +134,25 @@
devHelper = pkgs.writeShellScriptBin "dev-helper" ''
echo "=== FeDIY dev shell tools ==="
command -v cargo >/dev/null 2>&1 && echo "cargo: $(cargo --version)" || echo "cargo: not found"
command -v rustc >/dev/null 2>&1 && echo "rustc: $(rustc --version)" || echo "rustc: not found"
command -v rust-analyzer >/dev/null 2>&1 && echo "rust-analyzer: $(rust-analyzer --version)" || echo "rust-analyzer: not found"
command -v flatpak-builder >/dev/null 2>&1 && echo "flatpak-builder: $(flatpak-builder --version)" || echo "flatpak-builder: not found"
command -v pre-commit >/dev/null 2>&1 && echo "pre-commit: $(pre-commit --version)" || echo "pre-commit: not found"
echo "Build + Rust"
command -v cargo >/dev/null 2>&1 && echo " cargo: $(cargo --version)" || echo " cargo: not found"
command -v rustc >/dev/null 2>&1 && echo " rustc: $(rustc --version)" || echo " rustc: not found"
command -v rust-analyzer >/dev/null 2>&1 && echo " rust-analyzer: $(rust-analyzer --version)" || echo " rust-analyzer: not found"
echo "Testing + quality"
command -v pre-commit >/dev/null 2>&1 && echo " pre-commit: $(pre-commit --version)" || echo " pre-commit: not found"
command -v flatpak-builder >/dev/null 2>&1 && echo " flatpak-builder: $(flatpak-builder --version)" || echo " flatpak-builder: not found"
echo "Data + localization"
command -v psql >/dev/null 2>&1 && echo " psql: $(psql --version)" || echo " psql: not found"
command -v gettext >/dev/null 2>&1 && echo " gettext: $(gettext --version | head -n 1)" || echo " gettext: not found"
echo "Accessibility + browser checks"
command -v chromium >/dev/null 2>&1 && echo " chromium: $(chromium --version)" || echo " chromium: not found"
command -v playwright >/dev/null 2>&1 && echo " playwright: $(playwright --version)" || echo " playwright: not found"
if command -v podman >/dev/null 2>&1; then
echo "Container tooling"
echo " podman: $(podman --version)"
command -v podman-compose >/dev/null 2>&1 && echo " podman-compose: $(podman-compose --version)" || echo " podman-compose: not found"
command -v buildah >/dev/null 2>&1 && echo " buildah: $(buildah --version)" || echo " buildah: not found"
fi
'';
}
);