From ac938fdea46384d14acb3523c272c7a60ed35233 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 23 Apr 2019 12:36:39 +0200 Subject: [PATCH 1/2] rustfmt: 1.0.1 -> 1.2.1 Fixes the build after the rustc 1.34.0 update in https://github.com/NixOS/nixpkgs/pull/59366. --- pkgs/development/tools/rust/rustfmt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index dac00aa4c96..b37292b6afa 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rustfmt-${version}"; - version = "1.0.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustfmt"; - rev = "${version}"; - sha256 = "1l18ycbq3125sq8v3wgma630wd6kclarlf8f51cmi9blk322jg9p"; + rev = "v${version}"; + sha256 = "153pas7d5fchkmiw6mkbhn75lv3y69k85spzmm5i4lqnq7f0yqap"; }; - cargoSha256 = "1557783icdzlwn02c5zl4362yl85r5zj4nkjv80p6896yli9hk9h"; + cargoSha256 = "08x6vy5v2vgrk3gsw3qcvv52a7hifsgcsnsg1phlk1ikaff21y4z"; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; From c4bc3e1fe2fa8dd091225202459ba4683ba1b860 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 23 Apr 2019 13:22:55 +0200 Subject: [PATCH 2/2] rustfmt: mark as broken on darwin --- pkgs/development/tools/rust/rustfmt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index b37292b6afa..e1afeee3422 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { homepage = https://github.com/rust-lang-nursery/rustfmt; license = with licenses; [ mit asl20 ]; maintainers = [ maintainers.globin ]; + broken = stdenv.isDarwin; platforms = platforms.all; }; }