From e75038648d655e586f6bec86c397098e81f3c1d9 Mon Sep 17 00:00:00 2001 From: "Jonathan D.A. Jewell" <6759885+hyperpolymath@users.noreply.github.com> Date: Sat, 19 Sep 2026 09:34:47 +0000 Subject: [PATCH] refactor(root): move root artefacts to their canonical locations Applies the estate root-shape rollout: files that are not root-level by necessity move to where their tooling and the estate canon expect them, and every reference to them is updated in the same change. * .envrc * .machine_readable/contractiles/Justfile * Justfile * QUICKSTART-MAINTAINER.adoc * affinescript/RSR_OUTLINE.adoc * affinescript/docs/standards/RELEASE.adoc * build/guix.scm (from guix.scm) -> build/guix.scm * docs/RSR_OUTLINE.adoc Verified with `git apply --check` against current main before committing; no behaviour change intended, the Justfile entry points keep working. --- .envrc | 4 ++-- .machine_readable/contractiles/Justfile | 8 +++---- Justfile | 8 +++---- QUICKSTART-MAINTAINER.adoc | 2 +- affinescript/RSR_OUTLINE.adoc | 2 +- affinescript/docs/standards/RELEASE.adoc | 2 +- docs/RSR_OUTLINE.adoc | 2 +- guix.scm | 28 ------------------------ 8 files changed, 14 insertions(+), 42 deletions(-) delete mode 100644 guix.scm diff --git a/.envrc b/.envrc index b2128b4..b626a67 100644 --- a/.envrc +++ b/.envrc @@ -7,8 +7,8 @@ if has asdf; then use asdf fi -# Load Guix shell if guix.scm exists -if has guix && [ -f guix.scm ]; then +# Load Guix shell if build/guix.scm exists +if has guix && [ -f build/guix.scm ]; then use guix fi diff --git a/.machine_readable/contractiles/Justfile b/.machine_readable/contractiles/Justfile index 096e877..6509a54 100644 --- a/.machine_readable/contractiles/Justfile +++ b/.machine_readable/contractiles/Justfile @@ -476,8 +476,8 @@ self-assess: echo " → KEEP if others might build with Nix." fi - if [ -f "guix.scm" ] && ! command -v guix >/dev/null 2>&1; then - echo " ○ guix.scm — Guix package. Safe to remove if you don't use Guix." + if [ -f "build/guix.scm" ] && ! command -v guix >/dev/null 2>&1; then + echo " ○ build/guix.scm — Guix package. Safe to remove if you don't use Guix." echo " → KEEP if others might build with Guix." fi @@ -1185,11 +1185,11 @@ state-phase: # Enter Guix development shell (primary) guix-shell: - guix shell -D -f guix.scm + guix shell -D -f build/guix.scm # Build with Guix guix-build: - guix build -f guix.scm + guix build -f build/guix.scm # Enter Nix development shell (fallback) nix-shell: diff --git a/Justfile b/Justfile index 9c3ee35..4b4dfdb 100644 --- a/Justfile +++ b/Justfile @@ -477,8 +477,8 @@ self-assess: echo " → KEEP if others might build with Nix." fi - if [ -f "guix.scm" ] && ! command -v guix >/dev/null 2>&1; then - echo " ○ guix.scm — Guix package. Safe to remove if you don't use Guix." + if [ -f "build/guix.scm" ] && ! command -v guix >/dev/null 2>&1; then + echo " ○ build/guix.scm — Guix package. Safe to remove if you don't use Guix." echo " → KEEP if others might build with Guix." fi @@ -1186,11 +1186,11 @@ state-phase: # Enter Guix development shell (primary) guix-shell: - guix shell -D -f guix.scm + guix shell -D -f build/guix.scm # Build with Guix guix-build: - guix build -f guix.scm + guix build -f build/guix.scm # Enter Nix development shell (fallback) nix-shell: diff --git a/QUICKSTART-MAINTAINER.adoc b/QUICKSTART-MAINTAINER.adoc index cb19d41..5e60a5b 100644 --- a/QUICKSTART-MAINTAINER.adoc +++ b/QUICKSTART-MAINTAINER.adoc @@ -32,7 +32,7 @@ Output: `{{BUILD_OUTPUT_PATH}}` [source,bash] ---- -guix build -f guix.scm +guix build -f build/guix.scm ---- === Nix diff --git a/affinescript/RSR_OUTLINE.adoc b/affinescript/RSR_OUTLINE.adoc index 78bed59..cb8179d 100644 --- a/affinescript/RSR_OUTLINE.adoc +++ b/affinescript/RSR_OUTLINE.adoc @@ -37,7 +37,7 @@ git init sed -i 's/RSR-template-repo/my-project/g' Justfile guix.scm README.adoc # Enter development environment -guix shell -D -f guix.scm +guix shell -D -f build/guix.scm # Validate compliance just validate-rsr diff --git a/affinescript/docs/standards/RELEASE.adoc b/affinescript/docs/standards/RELEASE.adoc index 8e9911b..dcc5ce8 100644 --- a/affinescript/docs/standards/RELEASE.adoc +++ b/affinescript/docs/standards/RELEASE.adoc @@ -62,7 +62,7 @@ dune install [source,bash] ---- -guix shell -f guix.scm +guix shell -f build/guix.scm dune build ---- diff --git a/docs/RSR_OUTLINE.adoc b/docs/RSR_OUTLINE.adoc index b2b1603..5e6c92f 100644 --- a/docs/RSR_OUTLINE.adoc +++ b/docs/RSR_OUTLINE.adoc @@ -37,7 +37,7 @@ git init just init # Enter development environment -guix shell -D -f guix.scm +guix shell -D -f build/guix.scm # Validate compliance just validate-rsr diff --git a/guix.scm b/guix.scm deleted file mode 100644 index f090c03..0000000 --- a/guix.scm +++ /dev/null @@ -1,28 +0,0 @@ -;; SPDX-License-Identifier: MPL-2.0 -;; Guix development environment. -;; Usage: guix shell -D -f guix.scm - -(use-modules (guix packages) - (guix build-system gnu) - (guix licenses) - (gnu packages base) - (gnu packages bash) - (gnu packages base) - (gnu packages java) - (gnu packages rust) - (gnu packages cmake) - (gnu packages zig) - (gnu packages golang) - (gnu packages node) - (gnu packages python)) - -(package - (name "proof-burrower") - (version "0.1.0") - (source #f) - (build-system gnu-build-system) - (inputs (list coreutils bash make openjdk rust cmake zig go node python)) - (synopsis "proof-burrower") - (description "proof-burrower — part of the hyperpolymath ecosystem.") - (home-page "https://github.com/hyperpolymath/proof-burrower") - (license ((@@ (guix licenses) license) "MPL-2.0" "https://github.com/hyperpolymath/palimpsest-license")))