Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c8c0bd1fea22
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f053d748d409
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 23, 2019

  1. rustfmt: 1.0.1 -> 1.2.1 

    Fixes the build after the rustc 1.34.0 update in
#59366.
    @timokau
    timokau committed Apr 23, 2019
    Copy the full SHA
    ac938fd View commit details

  2. rustfmt: mark as broken on darwin

    @timokau
    timokau committed Apr 23, 2019
    Copy the full SHA
    c4bc3e1 View commit details

  3. Merge pull request #60085 from timokau/rustfmt-update 

    rustfmt: 1.0.1 -> 1.2.1
    @timokau
    timokau authored Apr 23, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f053d74 View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/development/tools/rust/rustfmt/default.nix
9 changes: 5 additions & 4 deletions pkgs/development/tools/rust/rustfmt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;

@@ -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;
};
}