chir.rs/api
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

remove the cross compilation because it’s broken

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-02-23 19:34:25 +01:00
parent efb1197d94
commit c73ff55f0f
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
2 changed files with 9 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nix/Cargo.nix
View file

@ -1,4 +1,4 @@
# This file was @generated by cargo2nix 0.10.0.
# This file was @generated by cargo2nix 0.11.0.
# It is not intended to be manually edited.
args@{
@ -33,7 +33,7 @@ in let
let drv = drvs.${profileName}; in if compileMode == null then drv else drv.override { inherit compileMode; };
in
{
cargo2nixVersion = "0.10.0";
cargo2nixVersion = "0.11.0";
workspace = {
auth-chir-rs-api = rustPackages.unknown.auth-chir-rs-api."0.1.0";
};

44
nix/apiDerivations.nix
View file

@ -33,48 +33,18 @@ let
legacyDiscriminatorBehavior = false;
};
};
makeRustPkgs = target: rustChannel: pkgs.rustBuilder.makePackageSet' {
rustPkgs = pkgs.rustBuilder.makePackageSet' {
packageFun = import ./Cargo.nix;
workspaceSrc = self.packages.${system}."${name}-rust-src";
packageOverrides = pkgs: pkgs.rustBuilder.overrides.all;
inherit rustChannel target;
rustChannel = "1.58.1";
};
allRustTargets = [
# Tier1 targets
"x86_64-unknown-linux-gnu"
# Tier2 targets
"aarch64-unknown-linux-musl"
"x86_64-unknown-linux-musl"
"arm-unknown-linux-musleabi"
"arm-unknown-linux-musleabihf"
"armv5te-unknown-linux-musleabi"
"armv7-unknown-linux-musleabi"
"armv7-unknown-linux-musleabihf"
"asmjs-unknown-emscripten"
"i686-unknown-linux-musl"
"mips64-unknown-linux-muslabi64"
"mips64el-unknown-linux-muslabi64"
"wasm32-unknown-emscripten"
"wasm32-unknown-unknown"
"wasm32-wasi"
];
rustVersions = [
"1.58.1"
#"beta" # Beta is currently unsupported
"nightly"
];
rustPkgsForTarget = target: pkgs.lib.lists.foldr (a: b: a // b) { } (builtins.map
(version: {
"${name}-rust-${target}-${fixName version}" = (makeRustPkgs target version).workspace."${name}-api" { };
})
rustVersions
);
rustPkgs = pkgs.lib.lists.foldr (a: b: a // b) { } (builtins.map rustPkgsForTarget allRustTargets);
in
pkgs.lib.lists.foldr (a: b: a // b)
{
"${name}-merged" = merged;
}
{
"${name}-merged" = merged;
"${name}-rust" = rustPkgs.workspace.${code-generators.rust.packageName} { };
}
(pkgs.lib.attrsets.mapAttrsToList
(generatorName: options: {
"${name}-${generatorName}-src" = pkgs.stdenv.mkDerivation
@ -92,4 +62,4 @@ pkgs.lib.lists.foldr (a: b: a // b)
'' else "true";
};
})
code-generators) // (if system == "x86_64-linux" then rustPkgs else { })
code-generators)