.github: Update CI runner to macos-latest

.github/workflows/ci.yaml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   check:
-    runs-on: macos-13
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
       - uses: DeterminateSystems/nix-installer-action@main

.gitignore

@@ -3,6 +3,8 @@
 
 result*
 
+/ci/*.json
+
 *.o
 *.out
 

ci/activate-example.sh

@@ -9,9 +9,10 @@ if [[ "$#" != "1" ]]; then
 fi
 example="$1"
 
-nix-instantiate --eval --json -E 'builtins.currentSystem' >"${DIR}/system.json"
-systemProfile=$(nix build "./${DIR}/..#darwinConfigurations.ci.${example}.system" -L --no-link --print-out-paths)
+system="$(nix eval --raw --impure --expr 'builtins.currentSystem')"
+>&2 echo "System: ${system}"
 
+systemProfile="$(nix build "./${DIR}/..#ci.${system}.${example}.system" -L --no-link --print-out-paths)"
 >&2 echo "Built $systemProfile"
 
 sudo rm "/etc/nix/nix.conf"

ci/default.nix

@@ -1,11 +1,9 @@
 # Activates example configurations on CI
 
-{ self, nix-darwin, nixpkgs, ... }:
+{ self, pkgs, nix-darwin, ... }:
 
 let
-  system = builtins.fromJSON (builtins.readFile ./system.json);
-  pkgs = nixpkgs.legacyPackages.${system};
-  inherit (pkgs) lib;
+  inherit (pkgs) lib system;
   makeProfile = example: nix-darwin.lib.darwinSystem {
     inherit system pkgs;
     modules = [

examples/migrate.nix

@@ -4,6 +4,7 @@
 {
   nix-homebrew = {
     enable = true;
+    enableRosetta = true;
     autoMigrate = true;
     user = "yourname";
   };

flake.nix

@@ -29,6 +29,9 @@
 
       BREW_SRC = brew-src;
     };
+    ci = import ./ci (inputs // {
+      inherit pkgs;
+    });
   }) // {
     darwinModules = {
       nix-homebrew = { lib, ... }: {
@@ -41,8 +44,5 @@
         });
       };
     };
-    darwinConfigurations = {
-      ci = import ./ci inputs;
-    };
   };
 }

modules/default.nix

@@ -178,7 +178,7 @@ let
 
     if test -n "${toString cfg.enableRosetta}" && ! pgrep -q oahd; then
       warn "The Intel Homebrew prefix has been set up, but Rosetta isn't installed yet."
-      ohai 'Run ''${tty_bold}softwareupdate --install-rosetta''${tty_reset} to install it.'
+      ohai "Run ''${tty_bold}softwareupdate --install-rosetta''${tty_reset} to install it."
     fi
   '';