From d7618af3d8e0d33cfdf7303dfe1d6b32a3d69a28 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 2 Nov 2022 12:55:11 +0000 Subject: [PATCH] perf: remove trace binary --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ pkgs/os-specific/linux/kernel/perf/default.nix | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index e9f4f707f52f..0a7d87057a5c 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -720,6 +720,13 @@ been removed due to lack of upstream maintenance. + + + The trace binary from + perf-linux package has been removed, due to + being a duplicate of the perf binary. + + The aws package has been removed due to diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 9b5257ca8e1e..1d0f1a013c44 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -235,6 +235,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream maintenance. +- The `trace` binary from `perf-linux` package has been removed, due to being a duplicate of the `perf` binary. + - The `aws` package has been removed due to being abandoned by the upstream. It is recommended to use `awscli` or `awscli2` instead. - The [CEmu TI-84 Plus CE emulator](https://ce-programming.github.io/CEmu) package has been renamed to `cemu-ti`. The [Cemu Wii U emulator](https://cemu.info) is now packaged as `cemu`. diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 3693c9868df8..969d1e2bb657 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -73,6 +73,11 @@ stdenv.mkDerivation { separateDebugInfo = true; installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; + postInstall ='' + # Same as perf. Remove. + rm -f $out/bin/trace + ''; + preFixup = '' # Pull in 'objdump' into PATH to make annotations work. # The embeded Python interpreter will search PATH to calculate the Python path configuration(Should be fixed by upstream).