Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 347a49ad5d43
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e0b4356c0dc7
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 20, 2019

  1. buildRustCrate: use $NIX_BUILD_CORES for each of the crates

    @andir
    andir committed Mar 20, 2019
    Copy the full SHA
    4c89619 View commit details

Commits on Mar 29, 2019

  1. Merge pull request #57936 from andir/build-rust-crate-nix-build-cores 

    buildRustCrate: use $NIX_BUILD_CORES for each of the crates
    @andir
    andir authored Mar 29, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e0b4356 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pkgs/build-support/rust/build-rust-crate/build-crate.nix
  2. +1 −1 pkgs/build-support/rust/build-rust-crate/configure-crate.nix
2 changes: 1 addition & 1 deletion pkgs/build-support/rust/build-rust-crate/build-crate.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
rustcOpts =
lib.lists.foldl' (opts: opt: opts + " " + opt)
(if release then "-C opt-level=3" else "-C debuginfo=2")
(["-C codegen-units=1"] ++ extraRustcOpts);
(["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts);
rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";

# Some platforms have different names for rustc.
2 changes: 1 addition & 1 deletion pkgs/build-support/rust/build-rust-crate/configure-crate.nix
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ let version_ = lib.splitString "-" crateVersion;
version = lib.splitString "." (lib.head version_);
rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt)
(if release then "-C opt-level=3" else "-C debuginfo=2")
(["-C codegen-units=1"] ++ extraRustcOpts);
(["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts);
buildDeps = makeDeps buildDependencies;
authors = lib.concatStringsSep ":" crateAuthors;
optLevel = if release then 3 else 0;