diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-04-16 13:05:40 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-04-16 13:05:40 +0300 |
| commit | d56e9b4f05adf713561c12e83c0fd6af467b1b28 (patch) | |
| tree | 4fc3f480f8d24b55842623fc2351ee80596547e4 /pkgs/development/tools | |
| parent | 1e18670132f3e565fa179c01bf3e4c2af68feebd (diff) | |
| parent | 854f81da3492f755aa1169988e805f04d5d5c673 (diff) | |
| download | nixlib-d56e9b4f05adf713561c12e83c0fd6af467b1b28.tar nixlib-d56e9b4f05adf713561c12e83c0fd6af467b1b28.tar.gz nixlib-d56e9b4f05adf713561c12e83c0fd6af467b1b28.tar.bz2 nixlib-d56e9b4f05adf713561c12e83c0fd6af467b1b28.tar.lz nixlib-d56e9b4f05adf713561c12e83c0fd6af467b1b28.tar.xz nixlib-d56e9b4f05adf713561c12e83c0fd6af467b1b28.tar.zst nixlib-d56e9b4f05adf713561c12e83c0fd6af467b1b28.zip | |
Merge pull request #7330 from RumataEstor/rust-beta
Provide rustc-1.0.0-beta as the default rust package
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/cargo/snapshot.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/tools/rust/racer/default.nix | 8 |
2 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix index f20f6d94f6f8..64aeb0736c17 100644 --- a/pkgs/development/tools/build-managers/cargo/snapshot.nix +++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix @@ -2,19 +2,19 @@ /* Cargo binary snapshot */ -let snapshotDate = "2015-02-26"; +let snapshotDate = "2015-04-02"; in with ((import ./common.nix) { inherit stdenv; version = "snapshot-${snapshotDate}"; }); let snapshotHash = if stdenv.system == "i686-linux" - then "2a28b604d09b4a76a54a05d91f7f158692427b3a" + then "ba6c162680d5509d89ba2363d7cae2047f40c034" else if stdenv.system == "x86_64-linux" - then "7367f4aca86d38e209ef7236b00175df036c03e2" + then "94f715c9a52809a639f2ce6f8b1d5215a0c272b5" else if stdenv.system == "i686-darwin" - then "e5cabb0a4a2b4e47f7b1ae9b802e2b5d0b14eac5" + then "cf333f16f89bfd50e8ce461c6f81ca30d33f7f73" else if stdenv.system == "x86_64-darwin" - then "3026c60ddd46d2bcf1cb178fc801095dbfba5286" + then "1f7008a6ec860e2bc7580e71bdf320ac518ddeb8" else throw "no snapshot for platform ${stdenv.system}"; snapshotName = "cargo-nightly-${platform}.tar.gz"; in @@ -35,6 +35,10 @@ stdenv.mkDerivation { installPhase = '' mkdir -p "$out" ./install.sh "--prefix=$out" + rm "$out/lib/rustlib/components" \ + "$out/lib/rustlib/install.log" \ + "$out/lib/rustlib/rust-installer-version" \ + "$out/lib/rustlib/uninstall.sh" '' + (if stdenv.isLinux then '' patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \ diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 75c099877617..341088dc0f2d 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { #TODO add emacs support - name = "racer-git-2015-02-28"; + name = "racer-git-2015-04-12"; src = fetchgit { url = https://github.com/phildawes/racer; - rev = "2e1d718fae21431de4493c238196466e9d4996bc"; - sha256 = "0lvp494kg2hlbbdrwxmmxkyhjw53y9wjdml9z817pwj3fwmrjsx0"; + rev = "5437e2074d87dfaab75a0f1bd2597bed61c0bbf1"; + sha256 = "0a768gvjry86l0xa5q0122iyq7zn2h9adfniglsgrbs4fan49xyn"; }; buildInputs = [ rustc cargo makeWrapper ]; buildPhase = '' - cargo build --release + CARGO_HOME="$NIX_BUILD_TOP/.cargo" cargo build --release ''; installPhase = '' |