From fffd2e7235c7fa4771a407ef7326d304d8a4e794 Mon Sep 17 00:00:00 2001 From: Andrew Moore Date: Sun, 9 Aug 2026 18:37:35 -0700 Subject: [PATCH] Merge nucleic/nimble-iris-toad-cpro into dev --- LICENSE | 21 +++++++++++++++++++ README.md | 4 ++-- packages/naros-keyring/control | 2 +- .../etc/apt/sources.list.d/naros.sources | 2 +- packages/naros-keyring/stage.sh | 4 ++-- 5 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..716ec58 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2026 Andrew Blakeslee Moore + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index a05997b..56d327b 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ This directory builds **narOS** (the Nucleic Agent Runtime OS) per [docs/NAROS.md](../docs/NAROS.md): a Debian-trixie-derived rootfs assembled from scratch with `mmdebstrap` against a pinned `snapshot.debian.org` date, plus a Nucleic apt package -layer (nash, naros-init, tier meta-packages, …). CI (`.github/workflows/naros.yml`) -publishes OCI images to GHCR — `naros-base` and `naros-agent`, both shipping today +layer (nash, naros-init, tier meta-packages, …). CI (`.gitea/workflows/naros.yml`) +publishes OCI images to the Gitea registry with a transitional GHCR dual-push — `naros-base` and `naros-agent`, both shipping today (`ProjectSandbox.defaultImage` pins `ghcr.io/abkslm/naros-agent:26.07`, and `containers/nucleic-runner/Dockerfile` builds `FROM` it); `naros-runner` is still planned (NAROS.md §7.2 — it will fold in `containers/nucleic-runner`) — and the diff --git a/packages/naros-keyring/control b/packages/naros-keyring/control index 2e3d6c6..fe09474 100644 --- a/packages/naros-keyring/control +++ b/packages/naros-keyring/control @@ -7,6 +7,6 @@ Priority: optional Description: narOS apt archive keyring and source entry (NAROS.md §3.2) The narOS apt repository's signing public key (/usr/share/keyrings/naros-archive-keyring.gpg) plus the deb822 source entry - for apt.naros.nucleic.blakeslee.xyz pinned to that key. Installing this on + for the version.blakeslee.xyz Debian registry, pinned to its per-owner repository key. Installing this on any Debian-family system enables `apt install naros-tier-agent` conversion (NAROS.md §7.3). diff --git a/packages/naros-keyring/files/etc/apt/sources.list.d/naros.sources b/packages/naros-keyring/files/etc/apt/sources.list.d/naros.sources index 2feb712..9c019fb 100644 --- a/packages/naros-keyring/files/etc/apt/sources.list.d/naros.sources +++ b/packages/naros-keyring/files/etc/apt/sources.list.d/naros.sources @@ -1,5 +1,5 @@ Types: deb -URIs: https://apt.naros.nucleic.blakeslee.xyz +URIs: https://version.blakeslee.xyz/api/packages/blakeslee-research/debian Suites: @CHANNEL@ Components: main Signed-By: /usr/share/keyrings/naros-archive-keyring.gpg diff --git a/packages/naros-keyring/stage.sh b/packages/naros-keyring/stage.sh index 63139a5..33a2099 100644 --- a/packages/naros-keyring/stage.sh +++ b/packages/naros-keyring/stage.sh @@ -1,5 +1,5 @@ -# The public key is materialized by CI from the NAROS_APT_PUBLIC_KEY secret (or by an -# operator into os/repo/keys/). No key in the tree, no keyring package — skip cleanly. +# CI fetches the Gitea Debian registry's repository.key and dearmors it into +# os/repo/keys/. No key in the tree, no keyring package — skip cleanly. stage() { local dest="$1" key="$OS_DIR/repo/keys/naros-archive-keyring.gpg" if [ ! -f "$key" ]; then