diff options
author | volth <volth@volth.com> | 2018-07-20 17:56:59 +0000 |
---|---|---|
committer | volth <volth@volth.com> | 2018-07-20 18:48:37 +0000 |
commit | 87f5930c3fb2c852f5243278b7a9da8e117d95e4 (patch) | |
tree | d76aa79bc394e820305c4eebbd250c89f6992eb9 /pkgs/build-support/rust | |
parent | a7e5927b4739c6e6427fc993f077cd3eb5433db7 (diff) | |
download | nixlib-87f5930c3fb2c852f5243278b7a9da8e117d95e4.tar nixlib-87f5930c3fb2c852f5243278b7a9da8e117d95e4.tar.gz nixlib-87f5930c3fb2c852f5243278b7a9da8e117d95e4.tar.bz2 nixlib-87f5930c3fb2c852f5243278b7a9da8e117d95e4.tar.lz nixlib-87f5930c3fb2c852f5243278b7a9da8e117d95e4.tar.xz nixlib-87f5930c3fb2c852f5243278b7a9da8e117d95e4.tar.zst nixlib-87f5930c3fb2c852f5243278b7a9da8e117d95e4.zip |
[bot]: remove unreferenced code
Diffstat (limited to 'pkgs/build-support/rust')
-rw-r--r-- | pkgs/build-support/rust/build-rust-crate.nix | 11 | ||||
-rw-r--r-- | pkgs/build-support/rust/carnix.nix | 6 | ||||
-rw-r--r-- | pkgs/build-support/rust/default.nix | 2 |
3 files changed, 1 insertions, 18 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index be76c283babc..7f21b66ce129 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -187,20 +187,12 @@ let makeDeps = dependencies: crateType, metadata, crateBin, finalBins, extraRustcOpts, verbose, colors }: - let depsDir = lib.concatStringsSep " " dependencies; - completeDepsDir = lib.concatStringsSep " " completeDeps; - completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps; - deps = makeDeps dependencies; - optLevel = if release then 3 else 0; + let deps = makeDeps dependencies; rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") (["-C codegen-units=1"] ++ extraRustcOpts); rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; - version_ = lib.splitString "-" crateVersion; - versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; - version = lib.splitString "." (lib.head version_); - authors = lib.concatStringsSep ":" crateAuthors; in '' runHook preBuild norm="" @@ -348,7 +340,6 @@ crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, cr preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }: let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_); - release_ = release; dependencies_ = dependencies; buildDependencies_ = buildDependencies; processedAttrs = [ diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix index 5b79d607f9d5..22d3fcd0c1fa 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -2,12 +2,6 @@ { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index d7d03aae33ee..59e8c3e7f7ed 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -20,8 +20,6 @@ in assert cargoVendorDir == null -> cargoSha256 != "unset"; let - lib = stdenv.lib; - cargoDeps = if cargoVendorDir == null then fetchcargo { inherit name src srcs sourceRoot cargoUpdateHook; |