forked from M-Labs/nix-scripts
mcu: update stabilizer to upstream mqtt version
This commit is contained in:
parent
5cec649d42
commit
bc460e9490
|
@ -14,7 +14,7 @@
|
||||||
"nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.11", "emailresponsible": false },
|
"nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.11", "emailresponsible": false },
|
||||||
"mozillaOverlay": { "type": "git", "value": "https://github.com/mozilla/nixpkgs-mozilla.git", "emailresponsible": false },
|
"mozillaOverlay": { "type": "git", "value": "https://github.com/mozilla/nixpkgs-mozilla.git", "emailresponsible": false },
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
||||||
"stabilizerSrc": { "type": "git", "value": "https://github.com/HarryMakes/stabilizer.git pre-mqtt 1", "emailresponsible": false },
|
"stabilizerSrc": { "type": "git", "value": "https://github.com/quartiq/stabilizer.git", "emailresponsible": false },
|
||||||
"saymaMmcSrc": { "type": "git", "value": "https://github.com/sinara-hw/openMMC.git sayma-devel", "emailresponsible": false }
|
"saymaMmcSrc": { "type": "git", "value": "https://github.com/sinara-hw/openMMC.git sayma-devel", "emailresponsible": false }
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,29 +1,42 @@
|
||||||
{ # Use master branch of the overlay by default
|
{ # Use master branch of the overlay by default
|
||||||
mozillaOverlay ? import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz),
|
mozillaOverlay ? import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz),
|
||||||
rustManifest ? ./channel-rust-nightly.toml
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
pkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
|
pkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
|
||||||
rustPlatform = pkgs.recurseIntoAttrs (pkgs.callPackage ./rustPlatform.nix {
|
targets = [
|
||||||
inherit rustManifest;
|
"thumbv7em-none-eabihf"
|
||||||
|
];
|
||||||
|
rustManifest = pkgs.fetchurl {
|
||||||
|
url = "https://static.rust-lang.org/dist/2022-01-15/channel-rust-nightly.toml";
|
||||||
|
sha256 = "sha256-kGKh+zzI1lFEbuYxGJ1uqm+sP8A/b66f+/zDICvQtuk=";
|
||||||
|
};
|
||||||
|
rustChannelOfTargets = _channel: _date: targets:
|
||||||
|
(pkgs.lib.rustLib.fromManifestFile rustManifest {
|
||||||
|
inherit (pkgs) stdenv lib fetchurl patchelf;
|
||||||
|
}).rust.override {
|
||||||
|
inherit targets;
|
||||||
|
extensions = ["rust-src"];
|
||||||
|
};
|
||||||
|
rust = rustChannelOfTargets "nightly" null targets;
|
||||||
|
rustPlatform = pkgs.recurseIntoAttrs (pkgs.makeRustPlatform {
|
||||||
|
rustc = rust;
|
||||||
|
cargo = rust;
|
||||||
});
|
});
|
||||||
buildStm32Firmware = { name, src, cargoDepsName ? name, patchPhase ? "", extraNativeBuildInputs ? [], checkPhase ? "", doCheck ? true, binaryName ? name, extraCargoBuildArgs ? "" }:
|
|
||||||
let
|
buildStm32Firmware = { name, src, cargoDepsName ? name, patchPhase ? "", extraNativeBuildInputs ? [], checkPhase ? "", doCheck ? true, binaryName ? name, extraCargoBuildArgs ? "", outputHashes ? {} }:
|
||||||
cargoSha256Drv = pkgs.runCommand "${name}-cargosha256" { } ''
|
|
||||||
cp "${src}/cargosha256.nix" $out
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
inherit name cargoDepsName;
|
inherit name cargoDepsName;
|
||||||
version = "0.0.0";
|
version = "0.0.0";
|
||||||
|
|
||||||
inherit src;
|
inherit src;
|
||||||
cargoSha256 = (import cargoSha256Drv);
|
|
||||||
|
cargoLock = {lockFile = "${src}/Cargo.lock"; inherit outputHashes; };
|
||||||
|
|
||||||
inherit patchPhase;
|
inherit patchPhase;
|
||||||
nativeBuildInputs = [ pkgs.llvm ] ++ extraNativeBuildInputs;
|
nativeBuildInputs = [ pkgs.llvm ] ++ extraNativeBuildInputs;
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
rustc --version
|
||||||
export CARGO_HOME=$(mktemp -d cargo-home.XXX)
|
export CARGO_HOME=$(mktemp -d cargo-home.XXX)
|
||||||
cargo build --release --bin ${binaryName} ${extraCargoBuildArgs}
|
cargo build --release --bin ${binaryName} ${extraCargoBuildArgs}
|
||||||
'';
|
'';
|
||||||
|
@ -51,12 +64,13 @@ in
|
||||||
cargoDepsName = "stabilizer";
|
cargoDepsName = "stabilizer";
|
||||||
src = <stabilizerSrc>;
|
src = <stabilizerSrc>;
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
substituteInPlace src/hardware/configuration.rs \
|
substituteInPlace src/net/mod.rs \
|
||||||
--replace "IpAddress::v4(10, 34, 16, 103)" \
|
--replace "[10, 34, 16, 10];" \
|
||||||
"IpAddress::v4(192, 168, 1, 76)" \
|
"[192, 168, 1, 10];" # or other default MQTT broker address
|
||||||
--replace "Ipv4Address::new(10, 34, 16, 1)" \
|
|
||||||
"Ipv4Address::new(192, 168, 1, 1)"
|
|
||||||
'';
|
'';
|
||||||
|
outputHashes = {
|
||||||
|
"heapless-0.7.7" = "sha256-4TfpXSR84aL1u/UZ7dHDLH9lGeuuGxCOcgu1HruUBTY=";
|
||||||
|
};
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
} // value))) {
|
} // value))) {
|
||||||
dual-iir = {};
|
dual-iir = {};
|
||||||
|
@ -64,14 +78,9 @@ in
|
||||||
binaryName = "dual-iir";
|
binaryName = "dual-iir";
|
||||||
extraCargoBuildArgs = "--features pounder_v1_1";
|
extraCargoBuildArgs = "--features pounder_v1_1";
|
||||||
};
|
};
|
||||||
lockin-external = {};
|
lockin = {};
|
||||||
lockin-external-pounder_v1_1 = {
|
lockin-pounder_v1_1 = {
|
||||||
binaryName = "lockin-external";
|
binaryName = "lockin";
|
||||||
extraCargoBuildArgs = "--features pounder_v1_1";
|
|
||||||
};
|
|
||||||
lockin-internal = {};
|
|
||||||
lockin-internal-pounder_v1_1 = {
|
|
||||||
binaryName = "lockin-internal";
|
|
||||||
extraCargoBuildArgs = "--features pounder_v1_1";
|
extraCargoBuildArgs = "--features pounder_v1_1";
|
||||||
};
|
};
|
||||||
} //
|
} //
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
{ recurseIntoAttrs, stdenv, lib,
|
|
||||||
makeRustPlatform,
|
|
||||||
fetchurl, patchelf,
|
|
||||||
rustManifest ? ./channel-rust-nightly.toml
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
targets = [
|
|
||||||
"thumbv7em-none-eabihf"
|
|
||||||
];
|
|
||||||
rustChannel =
|
|
||||||
lib.rustLib.fromManifestFile rustManifest {
|
|
||||||
inherit stdenv lib fetchurl patchelf;
|
|
||||||
};
|
|
||||||
rust =
|
|
||||||
rustChannel.rust.override {
|
|
||||||
inherit targets;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
makeRustPlatform {
|
|
||||||
rustc = rust;
|
|
||||||
cargo = rust;
|
|
||||||
}
|
|
Loading…
Reference in New Issue