stm32: remove fetchcargo.nix #16

Merged
sb10q merged 2 commits from astro/nix-scripts:stm32-no-fetchcargo into master 2019-06-01 10:03:08 +08:00
3 changed files with 15 additions and 83 deletions

View File

@ -8,43 +8,25 @@ let
rustPlatform = pkgs.recurseIntoAttrs (pkgs.callPackage ./rustPlatform.nix { rustPlatform = pkgs.recurseIntoAttrs (pkgs.callPackage ./rustPlatform.nix {
inherit rustManifest; inherit rustManifest;
}); });
fetchcargo = import ./fetchcargo.nix {
inherit (pkgs) stdenv cacert git cargo-vendor;
inherit (rustPlatform.rust) cargo;
};
buildStm32Firmware = { name, src, cargoSha256 }: buildStm32Firmware = { name, src, cargoSha256 }:
let rustPlatform.buildRustPackage rec {
firmwareDeps = fetchcargo { inherit name src; sha256 = cargoSha256; }; inherit name;
in version = "0.0.0";
rustPlatform.buildRustPackage rec {
inherit name;
version = "0.0.0";
inherit src cargoSha256; inherit src cargoSha256;
buildInputs = [ firmwareDeps ]; buildPhase = ''
patchPhase = '' export CARGO_HOME=$(mktemp -d cargo-home.XXX)
cat >> .cargo/config <<EOF cargo build --release
[source.crates-io] '';
replace-with = "vendored-sources"
[source.vendored-sources] doCheck = false;
directory = "${firmwareDeps}" installPhase = ''
EOF mkdir -p $out $out/nix-support
''; cp target/thumbv7em-none-eabihf/release/${name} $out/${name}.elf
echo file binary-dist ${name}.elf >> $out/nix-support/hydra-build-products
buildPhase = '' '';
export CARGO_HOME=$(mktemp -d cargo-home.XXX) };
cargo build --release
'';
doCheck = false;
installPhase = ''
mkdir -p $out $out/nix-support
cp target/thumbv7em-none-eabihf/release/${name} $out/${name}.elf
echo file binary-dist ${name}.elf >> $out/nix-support/hydra-build-products
'';
};
in in
{ {
stabilizer = buildStm32Firmware { stabilizer = buildStm32Firmware {

View File

@ -1,49 +0,0 @@
{ stdenv, cacert, git, cargo, cargo-vendor }:
{ name, src, sha256 }:
let
# `src` restricted to the two files that define dependencies
cargoOnlySrc = stdenv.mkDerivation {
name = "${name}-cargo";
inherit src;
phases = "installPhase";
installPhase = ''
mkdir $out
cp ${src}/Cargo.{toml,lock} $out/
mkdir $out/src
touch $out/src/main.rs
'';
};
in
stdenv.mkDerivation {
name = "${name}-vendor";
nativeBuildInputs = [ cacert git cargo cargo-vendor ];
src = cargoOnlySrc;
phases = "unpackPhase patchPhase installPhase";
installPhase = ''
if [[ ! -f Cargo.lock ]]; then
echo
echo "ERROR: The Cargo.lock file doesn't exist"
echo
echo "Cargo.lock is needed to make sure that cargoSha256 doesn't change"
echo "when the registry is updated."
echo
exit 1
fi
export CARGO_HOME=$(mktemp -d cargo-home.XXX)
cargo vendor
cp -ar vendor $out
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = sha256;
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
preferLocalBuild = true;
}

View File

@ -1 +0,0 @@
/nix/store/nk713fs4q784pdz7wdr5x8m2zfqhls6v-stabilizer