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: 610a8fd7ad72
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cd27940df06d
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 21, 2020

  1. buildRustCrate: treat rlib crates just like lib crates 

    Both version provide `rlib` files to link against. Previously we would
try to find a matching shared library in the `lib` output.
    @andir
    andir committed Jan 21, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: E432E410B5E48C86
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d6a8b55 View commit details

  2. buildRustCrateTests: fix some formatting issues

    @andir
    andir committed Jan 21, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: E432E410B5E48C86
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    406e0c9 View commit details

  3. buildRustCrateTests: add test case for rlib linking

    @andir
    andir committed Jan 21, 2020
    Copy the full SHA
    78faab1 View commit details

Commits on Jan 28, 2020

  1. Merge pull request #78188 from andir/buildRustCrate-support-rlib 

    buildRustCrate: support `rlib` dependency type
    @andir
    andir authored Jan 28, 2020

    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
    cd27940 View commit details
Showing with 26 additions and 13 deletions.
  1. +1 −1 pkgs/build-support/rust/build-rust-crate/default.nix
  2. +25 −12 pkgs/build-support/rust/build-rust-crate/test/default.nix
2 changes: 1 addition & 1 deletion pkgs/build-support/rust/build-rust-crate/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ let
lib.strings.replaceStrings ["-"] ["_"] crateRenames.${dep.crateName}
else
extern;
in (if lib.any (x: x == "lib") dep.crateType then
in (if lib.any (x: x == "lib" || x == "rlib") dep.crateType then
" --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}.rlib"
else
" --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}")
37 changes: 25 additions & 12 deletions pkgs/build-support/rust/build-rust-crate/test/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ lib, buildRustCrate, runCommand, writeTextFile, symlinkJoin, callPackage, releaseTools }:
let
mkCrate = args: let
p = {
crateName = "nixtestcrate";
version = "0.1.0";
authors = [ "Test <test@example.com>" ];
} // args;
in buildRustCrate p;

mkFile = destination: text: writeTextFile {
name = "src";
destination = "/${destination}";
inherit text;
p = {
crateName = "nixtestcrate";
version = "0.1.0";
authors = [ "Test <test@example.com>" ];
} // args;
in buildRustCrate p;

mkFile = destination: text: writeTextFile {
name = "src";
destination = "/${destination}";
inherit text;
};

mkBin = name: mkFile name ''
@@ -185,7 +185,20 @@ let
"test tests_bar ... ok"
];
};

linkAgainstRlibCrate = {
crateName = "foo";
src = mkFile "src/main.rs" ''
extern crate somerlib;
fn main() {}
'';
dependencies = [
(mkCrate {
crateName = "somerlib";
type = [ "rlib" ];
src = mkLib "src/lib.rs";
})
];
};
};
brotliCrates = (callPackage ./brotli-crates.nix {});
in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // {