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: 4a13ebd335fc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: af26f69257ea
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 23, 2019

  1. cargo-flamegraph: fix runtime dep: linux-perf

    @oxalica
    oxalica committed Dec 23, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: CED392DE0C483D00
    Learn about vigilant mode
    Copy the full SHA
    057b94a View commit details

Commits on Dec 26, 2019

  1. cargo-flamegraph: also wrap flamegraph

    @oxalica
    oxalica committed Dec 26, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: CED392DE0C483D00
    Learn about vigilant mode
    Copy the full SHA
    057840d View commit details

Commits on Jan 2, 2020

  1. Merge pull request #76313 from oxalica/cargo-flamegraph-perf 

    cargo-flamegraph: fix runtime dep: linux-perf
    @Ma27
    Ma27 authored Jan 2, 2020

    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
    af26f69 View commit details
Showing with 12 additions and 3 deletions.
  1. +11 −3 pkgs/development/tools/cargo-flamegraph/default.nix
  2. +1 −0 pkgs/top-level/all-packages.nix
14 changes: 11 additions & 3 deletions pkgs/development/tools/cargo-flamegraph/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform
{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, perf
, Security
}:

@@ -15,11 +15,19 @@ rustPlatform.buildRustPackage rec {

cargoSha256 = "0kmw2n4j5bisac0bv3npbwfz2z00ncd6w8ichwaz5hac5mi1a72f";

buildInputs = stdenv.lib.optionals stdenv.isDarwin [
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
buildInputs = lib.optionals stdenv.isDarwin [
Security
];

meta = with stdenv.lib; {
postFixup = lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/cargo-flamegraph \
--suffix PATH ':' ${perf}/bin
wrapProgram $out/bin/flamegraph \
--suffix PATH ':' ${perf}/bin
'';

meta = with lib; {
description = "Easy flamegraphs for Rust projects and everything else, without Perl or pipes <3";
homepage = https://github.com/ferrous-systems/flamegraph;
license = with licenses; [ asl20 /* or */ mit ];
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -8679,6 +8679,7 @@ in

cargo-flamegraph = callPackage ../development/tools/cargo-flamegraph {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (linuxPackages) perf;
};

carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { };