diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed29c88..166b00d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,11 +28,6 @@ jobs: skip: true skip_reason: "No aarch64-darwin runner configured. Pin exists (omp-darwin-arm64). Not a pretend green build." build_bezel_pin: false - - system: x86_64-darwin - os: ubuntu-latest - skip: true - skip_reason: "No x86_64-darwin runner configured. Pin exists (omp-darwin-x64). Not a pretend green build." - build_bezel_pin: false steps: - name: Honesty skip @@ -77,10 +72,10 @@ jobs: fi echo "splash removed" - - name: Evaluate all four systems (no omp pin fetch) + - name: Evaluate all three systems (no omp pin fetch) if: ${{ !matrix.skip }} run: | - for sys in aarch64-darwin x86_64-darwin aarch64-linux x86_64-linux; do + for sys in aarch64-darwin aarch64-linux x86_64-linux; do echo "== eval packages.$sys ==" test "$(nix eval --raw ".#packages.$sys.bezel.pname")" = bezel test "$(nix eval --raw ".#packages.$sys.bezel.meta.mainProgram")" = bezel-omp diff --git a/README.md b/README.md index cfabb04..6f2e40a 100644 --- a/README.md +++ b/README.md @@ -227,14 +227,13 @@ These three scripts are read-only. Facet never requests history bodies, blobs, ` ## Platforms -Declared systems: `aarch64-darwin`, `x86_64-darwin`, `aarch64-linux`, `x86_64-linux`. +Declared systems: `aarch64-darwin`, `aarch64-linux`, `x86_64-linux`. Intel macOS is not supported: nixpkgs 26.11 dropped it. | System | Pinned binary (oh-my-pi v18.2.6) | Availability | | --- | --- | --- | | `aarch64-darwin` | `omp-darwin-arm64` | Pin present. No hosted runner in this workflow. | -| `x86_64-darwin` | `omp-darwin-x64` | Pin present. Evaluated against `nixpkgs-26.05-darwin` (nixpkgs 26.11 dropped Intel macOS). No hosted runner in this workflow. | | `aarch64-linux` | `omp-linux-arm64` | Pin present. No hosted runner in this workflow. | -| `x86_64-linux` | `omp-linux-x64` | Pin present. GitHub Actions evaluates all four systems and builds overlay packages here. | +| `x86_64-linux` | `omp-linux-x64` | Pin present. GitHub Actions evaluates all three systems and builds overlay packages here. | If a later release drops a platform build, `packages/omp-pin.nix` **throws** for that system. A skipped CI row is a skip with a reason, not a pretend build. @@ -242,8 +241,8 @@ If a later release drops a platform build, `packages/omp-pin.nix` **throws** for ## Status -- Overlay packages evaluate on all four declared systems. -- CI on this repo **runs** the `x86_64-linux` job. The other three matrix rows skip (no matching hosted runner). +- Overlay packages evaluate on all three declared systems. +- CI on this repo **runs** the `x86_64-linux` job. The other two matrix rows skip (no matching hosted runner). - `bezel-pinned` is opt-in (180–240 MB download). - Jev defaults to shadow. `jev-router --check` is the shadow diff check. Empty findings are not approval. Loop-stop is shadow-first. Active `stop` and `escalate` do not exec. - The tool catalog is a small always-on index of the existing policy ids. Full schema is `jev-router --schema NAME` and is not an allow. Permission catalogs stay shadow. diff --git a/flake.lock b/flake.lock index 74276fa..8de999b 100644 --- a/flake.lock +++ b/flake.lock @@ -16,26 +16,9 @@ "type": "github" } }, - "nixpkgs-darwin-x64": { - "locked": { - "lastModified": 1789485310, - "narHash": "sha256-VsDMTLSkAAJmbNha6sGNzlF33X7RESWLl3SnjDQu+4U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0c32f40fe3e2a9adfc427fd5abc061a31043ea44", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-26.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "nixpkgs": "nixpkgs", - "nixpkgs-darwin-x64": "nixpkgs-darwin-x64", "skills": "skills" } }, diff --git a/flake.nix b/flake.nix index d84c733..9ba9b3b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - # nixpkgs 26.11 dropped Intel macOS. Keep x86_64-darwin declared (Jupi r1 - # missed this slice) on the last Darwin-x64-supporting pin — not a skip-as-green. - nixpkgs-darwin-x64.url = "github:NixOS/nixpkgs/nixpkgs-26.05-darwin"; # Sole skills input. Lapis, Facet, and Geode live in this tree with the # Bezel stub skills. Do not add a second repo-root skills/ product tree. @@ -19,7 +16,6 @@ { self, nixpkgs, - nixpkgs-darwin-x64, skills, ... }: @@ -28,7 +24,6 @@ systems = [ "aarch64-darwin" - "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; @@ -48,11 +43,9 @@ forAllSystems = f: lib.genAttrs systems (system: f system); - nixpkgsFor = system: if system == "x86_64-darwin" then nixpkgs-darwin-x64 else nixpkgs; - pkgsFor = system: - import (nixpkgsFor system) { + import nixpkgs { inherit system; overlays = [ self.overlays.default ]; }; diff --git a/packages/omp-pin.nix b/packages/omp-pin.nix index de2e839..5571d57 100644 --- a/packages/omp-pin.nix +++ b/packages/omp-pin.nix @@ -20,10 +20,6 @@ let asset = "omp-darwin-arm64"; hash = "sha256-1JjaQNV34f+mgcqGMsLqQKn3IqCLiAQSAR033/7pUTo="; }; - x86_64-darwin = { - asset = "omp-darwin-x64"; - hash = "sha256-1ViAD6Mmq8aK48u7PlNjIuxkO9z93HHmqYiFfb4alKM="; - }; aarch64-linux = { asset = "omp-linux-arm64"; hash = "sha256-ByRcvgUMOZmrXOqbq/6E5+iBnS9NXkm+9HwKrLa5V+Q=";