Unverified Commit b3f5bcf0 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #238223 from wentasah/tracing-update 

trace-cmd + libraries: update
parents 5224f298 bec93160

pkgs/os-specific/linux/libtraceevent/default.nix

+12 −17
Original line number Diff line number Diff line 
{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, coreutils }:

{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, meson, ninja, cunit }:



stdenv.mkDerivation rec {

  pname = "libtraceevent";

  version = "1.6.2";

  version = "1.7.3";



  src = fetchgit {

    url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";

    rev = "libtraceevent-${version}";

    sha256 = "sha256-iLy2rEKn0UJguRcY/W8RvUq7uX+snQojb/cXOmMsjwc=";

    sha256 = "sha256-poF+Cqcdj0KIgEJWW7XDAlRLz2/Egi948s1M24ETvBo=";

  };



  # Don't build and install html documentation

  postPatch = ''

    sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' Documentation/Makefile

    substituteInPlace scripts/utils.mk --replace /bin/pwd ${coreutils}/bin/pwd

    chmod +x Documentation/install-docs.sh.in

    patchShebangs --build check-manpages.sh Documentation/install-docs.sh.in

  '';



  outputs = [ "out" "dev" "devman" ];

  enableParallelBuilding = true;

  nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];

  makeFlags = [

    "prefix=${placeholder "out"}"

    "doc"                       # build docs

  ];

  installFlags = [

    "pkgconfig_dir=${placeholder "out"}/lib/pkgconfig"

    "doc-install"

  ];

  outputs = [ "out" "dev" "devman" "doc" ];

  nativeBuildInputs = [ meson ninja pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];



  ninjaFlags = [ "all" "docs" ];



  doCheck = true;

  checkInputs = [ cunit ];



  meta = with lib; {

    description = "Linux kernel trace event library";

pkgs/os-specific/linux/libtracefs/default.nix

+27 −15
Original line number Diff line number Diff line
@@ -8,38 +8,50 @@ 
, docbook_xml_dtd_45

, docbook_xsl

, coreutils

, which

, valgrind

, sourceHighlight

, meson

, flex

, bison

, ninja

, cunit

}:



stdenv.mkDerivation rec {

  pname = "libtracefs";

  version = "1.6.4";

  version = "1.7.0";



  src = fetchgit {

    url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git";

    rev = "libtracefs-${version}";

    sha256 = "sha256-fWop0EMkoVulLBzU7q8x1IhMtdnEJ89wMz0cz964F6s=";

    sha256 = "sha256-64eXFFdnZHHf4C3vbADtPuIMsfJ85VZ6t8A1gIc1CW0=";

  };



  postPatch = ''

    substituteInPlace scripts/utils.mk --replace /bin/pwd ${coreutils}/bin/pwd

    patchShebangs check-manpages.sh

    chmod +x samples/extract-example.sh

    patchShebangs --build check-manpages.sh samples/extract-example.sh Documentation/install-docs.sh.in

  '';



  outputs = [ "out" "dev" "devman" "doc" ];

  enableParallelBuilding = true;

  nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl which valgrind sourceHighlight ];

  buildInputs = [ libtraceevent ];

  makeFlags = [

    "prefix=${placeholder "out"}"

    "doc"                       # build docs

  ];

  installFlags = [

    "pkgconfig_dir=${placeholder "out"}/lib/pkgconfig"

    "install_doc"

  nativeBuildInputs = [

    meson

    ninja

    pkg-config

    asciidoc

    xmlto

    docbook_xml_dtd_45

    docbook_xsl

    valgrind

    sourceHighlight

    flex

    bison

  ];

  buildInputs = [ libtraceevent ];



  ninjaFlags = [ "all" "docs" ];



  doCheck = true;

  checkInputs = [ cunit ];



  meta = with lib; {

    description = "Linux kernel trace file system library";

pkgs/os-specific/linux/trace-cmd/default.nix

+4 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight }:

stdenv.mkDerivation rec {

  pname = "trace-cmd";

  version = "3.1.6";

  version = "3.2";



  src = fetchgit {

    url    = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";

    rev    = "trace-cmd-v${version}";

    sha256 = "sha256-qjfeomeExjsx/6XrUaGm5szbL7XVlekGd4Hsuncv8NY=";

    sha256 = "sha256-KlykIYF4uy1phgWRG5j76FJqgO7XhNnyrTDVTs8YOXY=";

  };



  # Don't build and install html documentation
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec { 


  buildInputs = [ libtraceevent libtracefs zstd ];



  outputs = [ "out" "lib" "dev" "man" ];

  outputs = [ "out" "lib" "dev" "man" "devman" ];



  MANPAGE_DOCBOOK_XSL="${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl";
@@ -59,6 +59,6 @@ stdenv.mkDerivation rec { 
    homepage    = "https://www.trace-cmd.org/";

    license     = with licenses; [ lgpl21Only gpl2Only ];

    platforms   = platforms.linux;

    maintainers = with maintainers; [ thoughtpolice basvandijk ];

    maintainers = with maintainers; [ thoughtpolice basvandijk wentasah ];

  };

}