From 65a69692469e3efb797e83eae8ae9e2938022347 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Fri, 16 Jun 2023 18:04:49 +0200 Subject: [PATCH 1/6] libtraceevent: 1.6.2 -> 1.7.3 --- pkgs/os-specific/linux/libtraceevent/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix index 427f2eb69c49..9535b4055324 100644 --- a/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/pkgs/os-specific/linux/libtraceevent/default.nix @@ -2,18 +2,19 @@ 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 + patchShebangs --build check-manpages.sh ''; outputs = [ "out" "dev" "devman" ]; From 91785f14b45470636c4f984d49987e5016b1fed7 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sat, 17 Jun 2023 00:06:38 +0200 Subject: [PATCH 2/6] libtraceevent: switch to meson build system Changes/benefits: - Simpler to package - Test are run during package build - HTML documentation added to the doc output --- .../linux/libtraceevent/default.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix index 9535b4055324..5b8aa329b783 100644 --- a/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/pkgs/os-specific/linux/libtraceevent/default.nix @@ -1,4 +1,4 @@ -{ 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"; @@ -10,24 +10,18 @@ stdenv.mkDerivation rec { 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 - patchShebangs --build check-manpages.sh + 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"; From 1fa9d96767375e8331691e0e6f805f5721daf1b8 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Fri, 16 Jun 2023 18:32:01 +0200 Subject: [PATCH 3/6] libtracefs: 1.6.4 -> 1.7.0 --- pkgs/os-specific/linux/libtracefs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index 3cb79ae07780..8c6eb2ad14c6 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -15,17 +15,17 @@ 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 + patchShebangs --build check-manpages.sh ''; outputs = [ "out" "dev" "devman" "doc" ]; From 9e9dac32f7b17997d3a3f53f7a3375ef965c271f Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Fri, 16 Jun 2023 23:39:09 +0200 Subject: [PATCH 4/6] libtracefs: switch to meson build system Changes/benefits: - Simpler to package - sqlhist tool is built - Test are run during package build --- pkgs/os-specific/linux/libtracefs/default.nix | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index 8c6eb2ad14c6..3e9c9115645d 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -8,9 +8,13 @@ , docbook_xml_dtd_45 , docbook_xsl , coreutils -, which , valgrind , sourceHighlight +, meson +, flex +, bison +, ninja +, cunit }: stdenv.mkDerivation rec { @@ -24,22 +28,30 @@ stdenv.mkDerivation rec { }; postPatch = '' - substituteInPlace scripts/utils.mk --replace /bin/pwd ${coreutils}/bin/pwd - patchShebangs --build 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 ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + asciidoc + xmlto + docbook_xml_dtd_45 + docbook_xsl + valgrind + sourceHighlight + flex + bison + ]; buildInputs = [ libtraceevent ]; - makeFlags = [ - "prefix=${placeholder "out"}" - "doc" # build docs - ]; - installFlags = [ - "pkgconfig_dir=${placeholder "out"}/lib/pkgconfig" - "install_doc" - ]; + + ninjaFlags = [ "all" "docs" ]; + + doCheck = true; + checkInputs = [ cunit ]; meta = with lib; { description = "Linux kernel trace file system library"; From fca0859538f28373ec0ab26ccfd52a57447c1680 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sat, 17 Jun 2023 00:34:12 +0200 Subject: [PATCH 5/6] trace-cmd: 3.1.6 -> 3.2 --- pkgs/os-specific/linux/trace-cmd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 6b349e70656f..f561fbba929c 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,12 +1,12 @@ { 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"; From bec93160c9672121f65a30fcaa3c966d86dfe1a3 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sat, 17 Jun 2023 00:35:50 +0200 Subject: [PATCH 6/6] trace-cmd: add myself to maintainers --- pkgs/os-specific/linux/trace-cmd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index f561fbba929c..371f66856de5 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -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 ]; }; }