File tree Expand file tree Collapse file tree 4 files changed +29
-1
lines changed
Expand file tree Collapse file tree 4 files changed +29
-1
lines changed Original file line number Diff line number Diff line change 1515 # --------------------------------------------------------------
1616 # --- Auxiliary Nixpkgs ----------------------------------------
1717 nixpkgs . url = "github:NixOS/nixpkgs" ;
18+ nixpkgs-nix . url = "github:NixOS/nixpkgs" ;
1819 capsules = {
1920 # Until nixago is implemented, as HEAD currently removes fmt hooks
2021 url = "github:input-output-hk/devshell-capsules/8dcf0e917848abbe58c58fc5d49069c32cd2f585" ;
Original file line number Diff line number Diff line change 127127 hostAddress = hostIp ;
128128 localAddress = guestIp ;
129129
130- config = {
130+ config = let
131+ inherit ( self . inputs . nixpkgs-nix . legacyPackages . x86_64-linux . nixVersions ) nix_2_12 ;
132+ in {
131133 imports = [
132134 # Common guest level config (also applied at host level)
133135 ./common.nix
157159 # Ensure we can use same nixpkgs with overlays the host uses
158160 nixpkgs . pkgs = pkgs ;
159161
162+ # Ensure nix package on buildkite matches darwin buildkite at 2.12.0
163+ nix . package = nix_2_12 ;
164+ environment . systemPackages = [ nix_2_12 ] ;
165+
160166 # Don't try to inherit resolved from the equinix host which won't work
161167 environment . etc . "resolv.conf" . text = ''
162168 nameserver 8.8.8.8
Original file line number Diff line number Diff line change 508508 config ,
509509 ...
510510 } : let
511+ inherit ( self . inputs . nixpkgs-nix . legacyPackages . x86_64-linux . nixVersions ) nix_2_12 ;
511512 cfg = config . services . buildkite-containers ;
512513 in {
513514 # Temporarily disable nomad to avoid conflict with buildkite resource consumption.
@@ -544,6 +545,10 @@ in {
544545 in
545546 map ( n : mkContainer n ( toString ( 10 - n ) ) ) ( lib . range 1 count ) ;
546547 } ;
548+
549+ # Ensure nix package on buildkite matches darwin buildkite at 2.12.0
550+ nix . package = nix_2_12 ;
551+ environment . systemPackages = [ nix_2_12 ] ;
547552 } )
548553 ] ;
549554
You can’t perform that action at this time.
0 commit comments