diff --git a/.envrc b/.envrc index 97f757a..29ad1c2 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 4ceac67..4867300 100644 --- a/.machine_readable/contractiles/Justfile +++ b/.machine_readable/contractiles/Justfile @@ -472,8 +472,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 @@ -1178,11 +1178,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/CONTRIBUTING.adoc b/CONTRIBUTING.adoc deleted file mode 100644 index 5949bf0..0000000 --- a/CONTRIBUTING.adoc +++ /dev/null @@ -1,9 +0,0 @@ -== Contributing - -[arabic] -. Fork the repository -. Create a feature branch -. Ensure SPDX headers on all files -. Submit a pull request - -*Author:* Jonathan D.A. Jewell j.d.a.jewell@open.ac.uk diff --git a/Justfile b/Justfile index e87fe83..af7e765 100644 --- a/Justfile +++ b/Justfile @@ -473,8 +473,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 @@ -1179,11 +1179,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 a232533..47dc762 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/docs/RSR_OUTLINE.adoc b/docs/RSR_OUTLINE.adoc index f6e9a9a..469d47f 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 cebd805..0000000 --- a/guix.scm +++ /dev/null @@ -1,22 +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 zig) - (gnu packages rust)) - -(package - (name "krl") - (version "0.1.0") - (source #f) - (build-system gnu-build-system) - (inputs (list coreutils bash zig rust)) - (synopsis "krl") - (description "krl — part of the hyperpolymath ecosystem.") - (home-page "https://github.com/hyperpolymath/krl") - (license ((@@ (guix licenses) license) "MPL-2.0" "https://github.com/hyperpolymath/palimpsest-license")))