public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39003 from P-E-Meunier/carnix-0.7 

Carnix: 0.6 -> 0.7
This commit is contained in:
Matthew Justin Bauer 2018-04-19 12:09:55 -05:00 committed by GitHub
parent 1bb28f26e8 ec40f193ac
commit bb4a8eb6d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 867 additions and 803 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pkgs/build-support/rust/build-rust-crate.nix
View File

@ -47,7 +47,7 @@ let makeDeps = dependencies:
''; '';
configureCrate = configureCrate =
{ crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies }: { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member }:
let version_ = lib.splitString "-" crateVersion; let version_ = lib.splitString "-" crateVersion;
versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
version = lib.splitString "." (lib.head version_); version = lib.splitString "." (lib.head version_);
@ -58,6 +58,7 @@ let makeDeps = dependencies:
completeDepsDir = lib.concatStringsSep " " completeDeps; completeDepsDir = lib.concatStringsSep " " completeDeps;
completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps; completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;
in '' in ''
cd ${workspace_member}
runHook preConfigure runHook preConfigure
${echo_build_heading colors} ${echo_build_heading colors}
${noisily colors verbose} ${noisily colors verbose}
@ -146,10 +147,15 @@ let makeDeps = dependencies:
mkdir -p $OUT_DIR mkdir -p $OUT_DIR
target/build/${crateName}/build_script_build > target/build/${crateName}.opt target/build/${crateName}/build_script_build > target/build/${crateName}.opt
set +e set +e
EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ') EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ')
EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
for env in $(sed -n "s/^cargo:rustc-env=\(.*\)/\1/p" target/build/${crateName}.opt); do
export $env
done
CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/") CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/")
grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \ grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \
| sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env | sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env
@ -171,8 +177,7 @@ let makeDeps = dependencies:
dependencies, completeDeps, completeBuildDeps, dependencies, completeDeps, completeBuildDeps,
crateFeatures, libName, build, release, libPath, crateFeatures, libName, build, release, libPath,
crateType, metadata, crateBin, finalBins, crateType, metadata, crateBin, finalBins,
extraRustcOpts, extraRustcOpts, verbose, colors }:
verbose, colors }:
let depsDir = lib.concatStringsSep " " dependencies; let depsDir = lib.concatStringsSep " " dependencies;
completeDepsDir = lib.concatStringsSep " " completeDeps; completeDepsDir = lib.concatStringsSep " " completeDeps;
@ -182,7 +187,7 @@ let makeDeps = dependencies:
rustcOpts = rustcOpts =
lib.lists.foldl' (opts: opt: opts + " " + opt) lib.lists.foldl' (opts: opt: opts + " " + opt)
(if release then "-C opt-level=3" else "-C debuginfo=2") (if release then "-C opt-level=3" else "-C debuginfo=2")
extraRustcOpts; (["-C codegen-units=1"] ++ extraRustcOpts);
rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";
version_ = lib.splitString "-" crateVersion; version_ = lib.splitString "-" crateVersion;
versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
@ -221,12 +226,12 @@ let makeDeps = dependencies:
build_bin() { build_bin() {
crate_name=$1 crate_name=$1
crate_name_=$(echo $crate_name | sed -e "s/-/_/g") crate_name_=$(echo $crate_name | sed -e "s/-/_/g")
main_file="" main_file=""
if [[ ! -z $2 ]]; then if [[ ! -z $2 ]]; then
main_file=$2 main_file=$2
fi fi
echo_build_heading $@ echo_build_heading $@
noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\ noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\
${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \ ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \
$LINK ${deps}$EXTRA_LIB --cap-lints allow \ $LINK ${deps}$EXTRA_LIB --cap-lints allow \
$BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
@ -374,7 +379,7 @@ stdenv.mkDerivation (rec {
); );
crateFeatures = if crate ? features then crateFeatures = if crate ? features then
lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) #"
else ""; else "";
libName = if crate ? libName then crate.libName else crate.crateName; libName = if crate ? libName then crate.libName else crate.crateName;
@ -407,24 +412,26 @@ stdenv.mkDerivation (rec {
) "" crate.crateBin ) "" crate.crateBin
else ""; else "";
build = if crate ? build then crate.build else ""; build = crate.build or "";
workspace_member = crate.workspace_member or ".";
crateVersion = crate.version; crateVersion = crate.version;
crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else []; crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [];
crateType = crateType =
if lib.attrByPath ["procMacro"] false crate then "proc-macro" else if lib.attrByPath ["procMacro"] false crate then "proc-macro" else
if lib.attrByPath ["plugin"] false crate then "dylib" else if lib.attrByPath ["plugin"] false crate then "dylib" else
if crate ? type then crate.type else "lib"; (crate.type or "lib");
colors = lib.attrByPath [ "colors" ] "always" crate; colors = lib.attrByPath [ "colors" ] "always" crate;
configurePhase = configureCrate { configurePhase = configureCrate {
inherit crateName dependencies buildDependencies completeDeps completeBuildDeps inherit crateName dependencies buildDependencies completeDeps completeBuildDeps
crateFeatures libName build release libPath crateVersion crateFeatures libName build workspace_member release libPath crateVersion
crateAuthors verbose colors; crateAuthors verbose colors;
}; };
extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else []; extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];
buildPhase = buildCrate { buildPhase = buildCrate {
inherit crateName dependencies completeDeps completeBuildDeps inherit crateName dependencies completeDeps completeBuildDeps
crateFeatures libName build release libPath crateType crateVersion crateFeatures libName build release libPath crateType
crateAuthors metadata crateBin finalBins verbose colors extraRustcOpts; crateVersion crateAuthors metadata crateBin finalBins verbose colors
extraRustcOpts;
}; };
installPhase = installCrate crateName metadata; installPhase = installCrate crateName metadata;

1627
pkgs/build-support/rust/carnix.nix
View File

File diff suppressed because it is too large Load Diff