public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rustfmt' of https://github.com/symphorien/nixpkgs

Browse Source
This commit is contained in:
Eelco Dolstra 2019-01-10 16:35:11 +01:00
commit ab33df13ac
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/rust/bindgen/default.nix
View File

@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
chmod +x $out/bin/bindgen chmod +x $out/bin/bindgen
''; '';
doCheck = false; # half the tests fail because our rustfmt is not nightly enough doCheck = true;
checkInputs = checkInputs =
let fakeRustup = writeScriptBin "rustup" '' let fakeRustup = writeScriptBin "rustup" ''
#!${stdenv.shell} #!${stdenv.shell}
@ -42,6 +42,10 @@ rustPlatform.buildRustPackage rec {
fakeRustup # the test suite insists in calling `rustup run nightly rustfmt` fakeRustup # the test suite insists in calling `rustup run nightly rustfmt`
clang clang
]; ];
preCheck = ''
# for the ci folder, notably
patchShebangs .
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "C and C++ binding generator"; description = "C and C++ binding generator";

22
pkgs/development/tools/rust/rustfmt/default.nix
View File

@ -1,17 +1,29 @@
{ stdenv, fetchFromGitHub, rustPlatform }: { stdenv, fetchFromGitHub, rustPlatform, darwin }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
name = "rustfmt-${version}"; name = "rustfmt-${version}";
version = "0.9.0"; version = "0.99.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rust-lang-nursery"; owner = "rust-lang";
repo = "rustfmt"; repo = "rustfmt";
rev = "${version}"; rev = "${version}";
sha256 = "12l3ff0s0pzhcf5jbs8wqawjk4jghhhz8j6dq1n5201yvny12jlr"; sha256 = "1gx1bsyb0f94r3f88f1j3b4rcm2x6zppcfab1c5vgpsr2dr6ch28";
}; };
cargoSha256 = "0gppki9mgx99xipapg36ydwk1bplygnz6sbyzbg46vhn10iggfwm"; cargoSha256 = "1rs6jjm75ixxhrf8b3zn991xa5kfayxlf0b70zdx6wd4r6by7w2y";
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
# As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler
RUSTC_BOOTSTRAP = 1;
# we run tests in debug mode so tests look for a debug build of
# rustfmt. Anyway this adds nearly no compilation time.
preCheck = ''
cargo build
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A tool for formatting Rust code according to style guidelines"; description = "A tool for formatting Rust code according to style guidelines";