From 73af35c6dfe5f1276315f6ffb9bac0960ee1b0e9 Mon Sep 17 00:00:00 2001
From: "Javier A. Pollak" <javi.po.123@gmail.com>
Date: Wed, 1 Apr 2026 10:25:12 -0400
Subject: [PATCH 1/2] add axiom-cli drv

---
 axiom-cli.nix | 28 ++++++++++++++++++++++++++++
 flake.lock    | 25 +++++++++++++++++++++----
 flake.nix     | 45 +++++++++++++++++++++++++++++++--------------
 3 files changed, 80 insertions(+), 18 deletions(-)
 create mode 100644 axiom-cli.nix

diff --git a/axiom-cli.nix b/axiom-cli.nix
new file mode 100644
index 0000000..ef7d675
--- /dev/null
+++ b/axiom-cli.nix
@@ -0,0 +1,28 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+  go,
+}:
+(buildGoModule.override { inherit go; }) rec {
+  pname = "axiom-cli";
+  version = "0.16.0";
+
+  src = fetchFromGitHub {
+    owner = "axiomhq";
+    repo = "cli";
+    rev = "v${version}";
+    hash = "sha256-3JK9HEuVyRTe+HqbJZVDHTkFI054ETkeX2H7yYGxlVE=";
+  };
+
+  vendorHash = "sha256-BRvnoyojLcjUVppUaC7zVJasrd50X1gyufCw3hdgEMQ=";
+  subPackages = [ "cmd/axiom" ];
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Axiom command line client";
+    homepage = "https://github.com/axiomhq/cli";
+    license = licenses.mit;
+    mainProgram = "axiom";
+  };
+}
diff --git a/flake.lock b/flake.lock
index 1d49687..788f412 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767325753,
-        "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=",
+        "lastModified": 1775002709,
+        "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "64049ca74d63e971b627b5f3178d95642e61cedd",
+        "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e",
         "type": "github"
       },
       "original": {
@@ -46,10 +46,27 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1774709303,
+        "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 45d0232..b0c9764 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,23 +4,32 @@
   inputs = {
     flake-parts.url = "github:hercules-ci/flake-parts";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
   };
 
   outputs =
-    inputs@{ flake-parts, nixpkgs, ... }:
+    inputs@{ flake-parts, ... }:
     let
-      packagesFor = pkgs: rec {
-        solc-0_8_26 = pkgs.callPackage ./solc-0.8.26.nix { };
-        spl-token = pkgs.callPackage ./spl-token.nix { };
-        agave-platform-tools = pkgs.callPackage ./agave-platform-tools.nix { };
-        agave-cli = pkgs.callPackage ./agave-cli.nix {
-          inherit agave-platform-tools;
+      packagesFor =
+        {
+          pkgs,
+          pkgsUnstable,
+        }:
+        rec {
+          solc-0_8_26 = pkgs.callPackage ./solc-0.8.26.nix { };
+          spl-token = pkgs.callPackage ./spl-token.nix { };
+          agave-platform-tools = pkgs.callPackage ./agave-platform-tools.nix { };
+          agave-cli = pkgs.callPackage ./agave-cli.nix {
+            inherit agave-platform-tools;
+          };
+          axiom-cli = pkgs.callPackage ./axiom-cli.nix {
+            go = pkgsUnstable.go_1_26;
+          };
+          shank = pkgs.callPackage ./shank.nix { };
+          squads-cli = pkgs.callPackage ./squads-cli.nix { };
+          cargo-build-static-release = pkgs.callPackage ./packages/cargo-build-static-release.nix { };
+          bun-enforce = pkgs.callPackage ./packages/bun-enforce.nix { };
         };
-        shank = pkgs.callPackage ./shank.nix { };
-        squads-cli = pkgs.callPackage ./squads-cli.nix { };
-        cargo-build-static-release = pkgs.callPackage ./packages/cargo-build-static-release.nix { };
-        bun-enforce = pkgs.callPackage ./packages/bun-enforce.nix { };
-      };
     in
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
@@ -39,7 +48,10 @@
           ...
         }:
         {
-          packages = packagesFor pkgs;
+          packages = packagesFor {
+            inherit pkgs;
+            pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages.${system};
+          };
           formatter = pkgs.nixfmt-rfc-style;
           devShells.default = pkgs.mkShell {
             # yarn-berry-fetcher used to compute yarn missing-hashes.json
@@ -62,7 +74,12 @@
               '';
         };
       flake = {
-        overlays.default = final: prev: packagesFor prev;
+        overlays.default =
+          final: prev:
+          packagesFor {
+            pkgs = prev;
+            pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages.${prev.stdenv.buildPlatform.system};
+          };
 
         nixConfig = {
           extra-substituters = [ "https://n1.cachix.org" ];

From ebc9af384ac2aa80c0a1e68600458359dab81ebf Mon Sep 17 00:00:00 2001
From: "Javier A. Pollak" <javi.po.123@gmail.com>
Date: Wed, 1 Apr 2026 14:12:04 -0400
Subject: [PATCH 2/2] remove darwin x86 from ci checks

---
 .github/workflows/ci.yaml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 350c4b2..a6ec228 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -49,14 +49,3 @@ jobs:
           name: n1
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
       - run: nix flake check
-
-  build-x86_64-darwin:
-    runs-on: macos-15-intel
-    steps:
-      - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: cachix/cachix-action@v15
-        with:
-          name: n1
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-      - run: nix flake check