ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 04:57:56 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #167431 from K900/fix-rustfmt

Browse Source 
rustfmt: stop pretending we're on nightly
This commit is contained in:
Artturi 2022-04-06 03:54:26 +03:00 committed by GitHub
commit 6e2cc949bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/rust/rustfmt.nix
View File

@ -18,8 +18,8 @@ rustPlatform.buildRustPackage rec {
# As of rustc 1.45.0, these env vars are required to build rustfmt (due to
# https://github.com/rust-lang/rust/pull/72001)
CFG_RELEASE = "${rustPlatform.rust.rustc.version}-nightly";
CFG_RELEASE_CHANNEL = "nightly";
CFG_RELEASE = rustPlatform.rust.rustc.version;
CFG_RELEASE_CHANNEL = "stable";
meta = with lib; {
description = "A tool for formatting Rust code according to style guidelines";

9
pkgs/development/tools/database/indradb/default.nix
View File

@ -3,6 +3,7 @@
, lib
, rustPlatform
, rustfmt
, protobuf
}:
let
src = fetchFromGitHub {
@ -30,7 +31,9 @@ in
buildAndTestSubdir = "server";
nativeBuildInputs = [ rustfmt ];
PROTOC = "${protobuf}/bin/protoc";
nativeBuildInputs = [ rustfmt rustPlatform.bindgenHook ];
# test rely on libindradb and it can't be found
# failure at https://github.com/indradb/indradb/blob/master/server/tests/plugins.rs#L63
@ -44,7 +47,9 @@ in
cargoSha256 = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM=";
nativeBuildInputs = [ rustfmt ];
PROTOC = "${protobuf}/bin/protoc";
nativeBuildInputs = [ rustfmt rustPlatform.bindgenHook ];
buildAndTestSubdir = "client";
};