Skip to content

Commit e2e516a

Browse files
author
datacore-bolt-ci
committed
ci(stability): merge the develop branch
2 parents 5d8fcf2 + 72ce8a7 commit e2e516a

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

dependencies/control-plane

Submodule control-plane updated 35 files

nix/lib/rust.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ let
44
sources = import ../sources.nix;
55
in
66
rec {
7-
makeRustTarget = platform: pkgs.rust.toRustTargetSpec platform;
7+
makeRustTarget = platform: platform.rust.rustcTargetSpec;
88
rust_default = { override ? { } }: rec {
99
nightly_pkg = pkgs.rust-bin.nightly."2025-06-26";
1010
stable_pkg = pkgs.rust-bin.stable."1.88.0";
@@ -29,8 +29,8 @@ rec {
2929
cargo = channel.stable;
3030
};
3131
os = platform: builtins.replaceStrings [ "${platform.qemuArch}-" ] [ "" ] platform.system;
32-
hostPlatform = "${pkgs.rust.toRustTargetSpec pkgs.pkgsStatic.hostPlatform}";
33-
targetPlatform = "${pkgs.rust.toRustTargetSpec pkgs.pkgsCross."${target}".hostPlatform}";
32+
hostPlatform = "${makeRustTarget pkgs.pkgsStatic.hostPlatform}";
33+
targetPlatform = "${makeRustTarget pkgs.pkgsCross."${target}".hostPlatform}";
3434
pkgsTarget = if hostPlatform == targetPlatform then pkgs else pkgs.pkgsCross."${target}";
3535
pkgsTargetNative = if hostPlatform == targetPlatform then pkgs else if hostOs == targetOs then
3636
import sources.nixpkgs

nix/pkgs/extensions/cargo-project.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ let
3434
rustc = channel.default.stable;
3535
cargo = channel.default.stable;
3636
};
37-
static-target = pkgs.rust.toRustTargetSpec pkgs.pkgsStatic.hostPlatform;
37+
static-target = channel.makeRustTarget pkgs.pkgsStatic.hostPlatform;
3838
static-channel = channel.rust_default {
3939
override = { targets = [ "${static-target}" ]; };
4040
};
@@ -97,7 +97,7 @@ let
9797
static_ssl = (pkgs.pkgsStatic.openssl.override {
9898
static = true;
9999
});
100-
hostTarget = pkgs.rust.toRustTargetSpec pkgs.hostPlatform;
100+
hostTarget = channel.makeRustTarget pkgs.hostPlatform;
101101
buildProps = rec {
102102
name = "extensions-${version}";
103103
inherit version src;

0 commit comments

Comments
 (0)