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

Commits on Jan 30, 2020

  1. perf: fix build on 5.5

    @Mic92
    Mic92 committed Jan 30, 2020
    Copy the full SHA
    0fc20ed View commit details

  2. perf: fix build on 5.5 (#78847) 

    perf: fix build on 5.5
    @Mic92
    Mic92 authored Jan 30, 2020
    Copy the full SHA
    5b74cd2 View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 pkgs/os-specific/linux/kernel/perf.nix
6 changes: 5 additions & 1 deletion pkgs/os-specific/linux/kernel/perf.nix
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
# perf refers both to newt and slang
nativeBuildInputs = [
asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
flex bison libiberty audit makeWrapper pkgconfig
flex bison libiberty audit makeWrapper pkgconfig python3
];
buildInputs = [
elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl
@@ -54,6 +54,10 @@ stdenv.mkDerivation {
"-Wno-error=stringop-truncation"
];

postPatch = ''
patchShebangs scripts/bpf_helpers_doc.py
'';

doCheck = false; # requires "sparse"
doInstallCheck = false; # same