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: 698ad2dd4db9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 28d2ab7ed37e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 10, 2018

  1. rustracer: remove rustup dependency 

    racer builds fine on Linux and macOS without racer as a dependency.
racer does not actually use rustup, but 'rustc --print sysroot', which
is already available through the rustc dependency.
    @danieldk
    danieldk committed Nov 10, 2018
    Copy the full SHA
    f780a98 View commit details

  2. Merge pull request #50142 from danieldk/racer-no-rustup 

    rustracer: remove rustup dependency
    @timokau
    timokau authored Nov 10, 2018
    Copy the full SHA
    28d2ab7 View commit details
Showing with 2 additions and 3 deletions.
  1. +2 −3 pkgs/development/tools/rust/racer/default.nix
5 changes: 2 additions & 3 deletions pkgs/development/tools/rust/racer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, rustup, substituteAll }:
{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, substituteAll }:

rustPlatform.buildRustPackage rec {
name = "racer-${version}";
@@ -13,8 +13,7 @@ rustPlatform.buildRustPackage rec {

cargoSha256 = "1j3fviimdxn6xa75z0l9wkgdnznp8q20jjs42mql6ql782dga5lk";

# rustup is required for test
buildInputs = [ makeWrapper rustup ];
buildInputs = [ makeWrapper ];

preCheck = ''
export RUST_SRC_PATH="${rustPlatform.rustcSrc}"