From b083a374aae922d840cade623c435dcccb791bbc Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Wed, 29 Mar 2017 21:58:16 +0000 Subject: [PATCH 1/2] rustRegistry: 2017-03-22 -> 2017-03-29 Update the `rustRegistry` to a more recent version. I have tested this change per nixpkgs manual section 11.1 ("Making patches"). --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 6fcd0fca17a0..6ca18ed46686 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2017-03-22"; - rev = "2458be6157706b6c92e37baa19703c15d89f6b3a"; - sha256 = "19ij0fqy5j4lz73w4p29wv4gsxhs345ajxm4bxpq6gx2h4x6qk06"; + version = "2017-03-29"; + rev = "d9dbb2fc117bf730d1f54b090b3af407e8e5ff20"; + sha256 = "1vrzr4v8qp5jy3xmqrcyk9naik3rngk8hzxif42y687ncppzrsdl"; src = fetchFromGitHub { inherit rev; From eb6a1f1f4103869df6fd948c8c1e7dc46a99a7e1 Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Wed, 29 Mar 2017 22:24:38 +0000 Subject: [PATCH 2/2] rustfmt: 0.8 -> 0.8.1 Update the `rustfmt` package from version 0.8 to version 0.8.1. I have tested this change per nixpkgs manual section 11.1 ("Making patches"). --- pkgs/development/tools/rust/rustfmt/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index e636c72b4208..a7164b14d3f1 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -1,19 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { name = "rustfmt-${version}"; - version = "0.8"; + version = "0.8.1"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rustfmt"; - rev = version; - sha256 = "0a613x1ckwl30yamba9m7xi3xrn8pg92p2w3v7k723whyivmjk1s"; + rev = "v${version}"; + sha256 = "05rjx7i4wn3z3j8bgqsn146a9vbni6xhxaim9nq13c6dm4nrx96b"; }; - depsSha256 = "1vach2xf0cs7nivbakhmrm2aqdif3i5vg1syffrs2ghcix9hd21p"; + depsSha256 = "1rnk33g85r1hkw9l9c52dzr4zka5kghbci9qwni3ph19rfqf0a73"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines";