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: bc54b96f2a49
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0d61615d8d72
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 24, 2019

  1. cargo-expand: fix darwin build

    @arcnmx
    arcnmx committed Jun 24, 2019
    Copy the full SHA
    8cd878c View commit details

Commits on Jun 25, 2019

  1. Merge pull request #63746 from arcnmx/rust-darwin-expand 

    cargo-expand: fix darwin build
    @worldofpeace
    worldofpeace authored Jun 25, 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
    0d61615 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/development/tools/rust/cargo-expand/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/tools/rust/cargo-expand/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
{ stdenv, rustPlatform, fetchFromGitHub, darwin }:

rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
@@ -12,6 +12,7 @@ rustPlatform.buildRustPackage rec {
};

cargoSha256 = "1wvqxj2w02d6zhyw3z5v0w4bfmbmldh63ygmvfxa3ngfb36gcacz";
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;

meta = with stdenv.lib; {
description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";