From 85b1326f230ded5bccd0a339d2f23345e9d37f70 Mon Sep 17 00:00:00 2001
From: Heinrich Apfelmus <apfelmus@quantentunnel.de>
Date: Tue, 30 Jan 2024 12:18:19 +0100
Subject: [PATCH 1/3] ci: Drop seemingly superfluous `nix build` flags

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 30867e7fb4f..355828dd572 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -186,14 +186,14 @@ steps:
   - label: 'Run unit tests (macOS, x86_64)'
     key: macos-tests-unit
     depends_on: macos-nix
-    command: 'GC_DONT_GC=1 nix build --max-silent-time 0 --max-jobs 1 -L .#ci.x86_64-darwin.tests.run.unit'
+    command: 'nix build -L .#ci.x86_64-darwin.tests.run.unit'
     agents:
       system: ${macos}
 
   - label: 'Build package (macOS, x86_64)'
     key: macos-package
     depends_on: macos-nix
-    command: nix build --max-silent-time 0 --max-jobs 1 -o result/macos-intel .#packages.x86_64-darwin.ci.artifacts.macos-intel.release
+    command: 'nix build -o result/macos-intel .#packages.x86_64-darwin.ci.artifacts.macos-intel.release'
     artifact_paths: [ "./result/macos-intel/**" ]
     agents:
       system: ${macos}

From 766ccf188a50bea58b252d8f0ca805689b6a4bbf Mon Sep 17 00:00:00 2001
From: Heinrich Apfelmus <apfelmus@quantentunnel.de>
Date: Wed, 22 Nov 2023 16:11:24 +0100
Subject: [PATCH 2/3] ci: Run unit tests on `aarch64-darwin`

---
 .buildkite/pipeline.yml   | 7 +++++++
 nix/supported-systems.nix | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 355828dd572..37dbfb0ab9f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -190,6 +190,13 @@ steps:
     agents:
       system: ${macos}
 
+  - label: 'Run unit tests (macOS, arm64)'
+    depends_on: macos-nix
+    key: macos-build-tests-arm64
+    command: 'nix build -L .#ci.aarch64-darwin.tests.run.unit'
+    agents:
+      system: ${macos}
+
   - label: 'Build package (macOS, x86_64)'
     key: macos-package
     depends_on: macos-nix
diff --git a/nix/supported-systems.nix b/nix/supported-systems.nix
index 6e3f0d94e34..a0c0ae17dcc 100644
--- a/nix/supported-systems.nix
+++ b/nix/supported-systems.nix
@@ -2,5 +2,5 @@
   "x86_64-linux"
   "x86_64-darwin"
   # TODO: Enable aarch64-darwin when there are Hydra builders for it
-  # "aarch64-darwin"
+  "aarch64-darwin"
 ]

From d9a82865fd83cb245d0dd471d56af703c8ff252f Mon Sep 17 00:00:00 2001
From: Heinrich Apfelmus <apfelmus@quantentunnel.de>
Date: Tue, 30 Jan 2024 12:16:22 +0100
Subject: [PATCH 3/3] ci: Add `macos-silicon` package

---
 .buildkite/pipeline.yml | 8 ++++++++
 flake.nix               | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 37dbfb0ab9f..40918108f3d 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -205,6 +205,14 @@ steps:
     agents:
       system: ${macos}
 
+  - label: 'Build package (macOS, arm64)'
+    key: macos-package-arm64
+    depends_on: macos-nix
+    command: 'nix build -o result/macos-silicon .#packages.aarch64-darwin.ci.artifacts.macos-silicon.release'
+    artifact_paths: [ "./result/macos-silicon/**" ]
+    agents:
+      system: ${macos}
+
   - block: "Build package (linux)"
     if: |
       build.branch !~ /^gh-readonly-queue\/master/
diff --git a/flake.nix b/flake.nix
index 53b051f4226..1d8ac40e041 100644
--- a/flake.nix
+++ b/flake.nix
@@ -205,6 +205,7 @@
             check;
 
           nodePkgs = cardano-node-runtime.legacyPackages.${system};
+          nodePackages = cardano-node-runtime.packages.${system};
           nodeProject = cardano-node-runtime.project.${system};
 
           walletProject = (import ./nix/haskell.nix
@@ -378,8 +379,8 @@
                     macOsPkgs.cardano-wallet
                     macOsPkgs.bech32
                     macOsPkgs.cardano-address
-                    nodePkgs.hydraJobs.native.cardano-cli
-                    nodePkgs.hydraJobs.native.cardano-node
+                    nodePackages.cardano-cli
+                    nodePackages.cardano-node
                   ];
                   platform = "macos-silicon";
                   format = "tar.gz";